Move to gawk-3.1.6.gawk-3.1.6

319 files changed, 39646 insertions, 28132 deletions

diff --git a/ABOUT-NLS b/ABOUT-NLS
index ed3565ae..ec20977e 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -118,8 +118,8 @@ country code serves to distinguish the dialects.
 language and `CC' denoting the country, is the one use on systems based
 on GNU libc.  On other systems, some variations of this scheme are
 used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
-locales supported by your system for your country by running the command
-`locale -a | grep '^LL''.
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
 
    Not all programs have translations for all languages.  By default, an
 English message is shown in place of a nonexistent translation.  If you
@@ -172,782 +172,897 @@ get started, please write to `translation@iro.umontreal.ca' to reach the
 coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
 
 1.5 Available Packages
 ======================
 
 Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of April
-2005.  The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of October
+2006.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
+                        +----------------------------------------------------+
+     GNUnet             |                                  []                |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
+     ap-utils           |                                                    |
+     aspell             |                      [] []    [] []        []      |
+     bash               |                      []          []             [] |
+     batchelor          |                                  []                |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                               []                   |
+     bison              |                               [] []                |
+     bison-runtime      |                                                    |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                                  []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    []          []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     darkstat           |                []             () []                |
+     dialog             |                      [] [] [] [] [] []             |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     error              |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []             |
+     fileutils          |                               [] []                |
+     findutils          |                []    []       []                   |
+     flex               |                      []       [] []                |
+     fslint             |                                  []                |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
+     gbiff              |                                  []                |
+     gcal               |                      []                            |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []          [] |
+     gettext-runtime    |             []       []       [] []             [] |
+     gettext-tools      |                      []          []                |
+     gimp-print         |                         []    [] []        []      |
+     gip                |                []                                  |
+     gliv               |                                  []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                                  () ()     []      |
+     gnucash-glossary   |                               [] ()                |
+     gnuedu             |                                                    |
+     gnulib             | []          [] []    []       [] []                |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                                    |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                                                    |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
+     gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                  ()    ()          |
+     gramadoir          | []                               []                |
+     grep               | []          [] []    []          [] []             |
+     gretl              |                                                    |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins        | []                   [] []    []                   |
+     gst-plugins-base   |                []    []       []                   |
+     gst-plugins-good   | []       []    []    [] []    []           []      |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              |                                  ()                |
+     gtkam              |                         []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                []    []       [] []             [] |
+     id-utils           |                               [] []                |
+     impost             |                                                    |
+     indent             |                      []          []             [] |
+     iso_3166           |                                  []             [] |
+     iso_3166_2         |                                                    |
+     iso_4217           |                                  []                |
+     iso_639            |                                  []             [] |
+     jpilot             |                         []                         |
+     jtag               |                                                    |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                                                    |
+     keytouch-editor    |                                                    |
+     keytouch-keyboa... |                                                    |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] [] []             |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                  []             [] |
+     libidn             |                               []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
+     lingoteach         |                                                    |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      [] ()    [] []                |
+     minicom            |                         []    [] []                |
+     mysecretdiary      |                               [] []                |
+     nano               |                []    []          []                |
+     nano_1_0           |                      [] ()    [] []                |
+     opcodes            |                                  []                |
+     parted             |                                                    |
+     pilot-qof          |                                            []      |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
+     python             |                                                    |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                         []    []                   |
+     screem             |                                                    |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     sh-utils           |                               [] []                |
+     shared-mime-info   |                []       []                 []   [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     silky              |                                                    |
+     skencil            |                               [] ()                |
+     sketch             |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     stardict           |                         []                         |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                []                                  |
+     texinfo            |                               [] []             [] |
+     textutils          |                      []       [] []                |
+     tin                |                                  ()        ()      |
+     tp-robot           |                                  []                |
+     tuxpaint           | []             []             [] []        []      |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] []    [] []                |
+     vorbis-tools       |             []          []    []           []      |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      []          []                |
+     xchat              |             [] []    []          [] []     []      |
+     xkeyboard-config   |                                                    |
+     xpad               |                []             []                   |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                          10  0  1  2  9 22  1 42 41  2 60 95 16  1  17   16
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []             []                    []          |
+     batchelor          |                []  []                            |
+     bfd                | []                                               |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                    []                            |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     darkstat           | []             ()  []                [] []       |
+     dialog             | [] [] []    [] []  []                []       [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     error              | []          [] []  []                []          |
+     fetchmail          | []                                               |
+     fileutils          | [] []          []  []                []       [] |
+     findutils          |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                []                                |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                   |
+     gbiff              |                []                                |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []             []  []                [] []    [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []             []                             [] |
+     gimp-print         | []             []                                |
+     gip                | []    []       []                                |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnucash-glossary   | []                                            [] |
+     gnuedu             | []                                               |
+     gnulib             | [] [] []    [] []  [] []             []          |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       |                                                  |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []             []  []                   []       |
+     gpsdrive           | ()             ()                    []       () |
+     gramadoir          |                []  []                            |
+     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
+     gretl              | []             []                             [] |
+     gsasl              |                    []                   []       |
+     gss                |                []                                |
+     gst-plugins        |                []                    []       [] |
+     gst-plugins-base   |                                      []       [] |
+     gst-plugins-good   |       []                             []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |                    []                            |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                         [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     id-utils           |                []  []                [] []    [] |
+     impost             |                []  []                            |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_3166           |             [] []                    []          |
+     iso_3166_2         |                []                                |
+     iso_4217           |    []       []        []             []          |
+     iso_639            |          [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                    []                            |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                            |
+     latrine            |                []  []                         [] |
+     ld                 | []             []                                |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                                                  |
+     libgphoto2         | []             []                             [] |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |    []              []                            |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           |                []                                |
+     lingoteach         |                []                       []    [] |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             | ()                                               |
+     minicom            | []          [] []                    []          |
+     mysecretdiary      | []             []                       []       |
+     nano               | []    []       []  []                []       [] |
+     nano_1_0           | []             []     []                []    [] |
+     opcodes            | []          [] []  []                            |
+     parted             | []             []                       []    [] |
+     pilot-qof          |                                                  |
+     psmisc             |       []                             []       [] |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     qof                |                                         []       |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     sh-utils           | [] []       [] []  []                []       [] |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                                                  |
+     silky              |                []                                |
+     skencil            | []             []                                |
+     sketch             | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     stardict           |                                      []          |
+     system-tools-ba... | []    []    [] []                 [] [] []    [] |
+     tar                | [] []       [] []  []                []       [] |
+     texinfo            |                []           []                   |
+     textutils          | []             []  [] []             []          |
+     tin                |    []          ()                                |
+     tp-robot           |             [] []  []                []          |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     vorbis-tools       | []             []                                |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []    []    [] []        []    []    []       [] |
+     xkeyboard-config   |             [] []                    []       [] |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          88 22 14  2 40 115 61 14  1  8  1  6 59 31  0 52
+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
                         +-------------------------------------------------+
      GNUnet             |                                                 |
-     a2ps               |             []                [] [] []     []   |
-     aegis              |                                  ()             |
-     ant-phone          |                                  ()             |
-     anubis             |                                  []             |
-     ap-utils           |                                                 |
-     aspell             |                         []    [] []        []   |
-     bash               |                      []          []             |
-     batchelor          |                                  []             |
+     a2ps               |    ()                      []          []    () |
+     aegis              |                                        ()       |
+     ant-phone          |                                        []       |
+     anubis             |                            []    []    []       |
+     ap-utils           |                            []                   |
+     aspell             |                         []             []       |
+     bash               |                                        []       |
+     batchelor          |                            []          []       |
      bfd                |                                                 |
-     bibshelf           |                                  []             |
-     binutils           |                               []                |
-     bison              |                               [] []             |
-     bluez-pin          | []                      []       [] []          |
-     clisp              |                                  []    []       |
-     console-tools      |                         []       []             |
-     coreutils          |                []    []       [] []             |
+     bibshelf           |                            []                   |
+     binutils           |                                                 |
+     bison              |                            []    []    []       |
+     bison-runtime      |                            []    []    []       |
+     bluez-pin          |       []                   []          []       |
+     cflow              |                                                 |
+     clisp              |                                        []       |
+     console-tools      |                                                 |
+     coreutils          |                                        []       |
      cpio               |                                                 |
-     cpplib             |                      []       [] []             |
-     darkstat           |                []             () []             |
-     dialog             |                      [] [] [] [] [] []          |
-     diffutils          |                      [] []    [] [] []          |
-     doodle             |                                  []             |
-     e2fsprogs          |                         []       []             |
-     enscript           |                      []       [] []        []   |
-     error              |                      []       [] []        []   |
-     fetchmail          |                      [] ()    [] [] []          |
-     fileutils          |                               [] []             |
-     findutils          |                      []       []    []          |
-     flex               |                      []       [] []             |
-     fslint             |                                  []             |
+     cpplib             |                                        []       |
+     cryptonit          |                                        []       |
+     darkstat           |                            []          []       |
+     dialog             |                            []          []       |
+     diffutils          | []                         []          []       |
+     doodle             |                                                 |
+     e2fsprogs          |                                        []       |
+     enscript           |                                        []       |
+     error              |                                        []       |
+     fetchmail          | []                                     []       |
+     fileutils          | []          []                                  |
+     findutils          |                                        []       |
+     flex               |    []                                  []       |
+     fslint             |                            []          []       |
      gas                |                                                 |
-     gawk               |                      []       [] []             |
-     gbiff              |                                  []             |
-     gcal               |                      []                         |
-     gcc                |                                  []             |
-     gettext-examples   | []                   []          [] []          |
-     gettext-runtime    |             []       []       [] []             |
-     gettext-tools      |                      []          []             |
-     gimp-print         |                         []    [] []        []   |
-     gip                |                                                 |
-     gliv               |                                  []             |
-     glunarclock        |                                                 |
-     gmult              | []                               []             |
-     gnubiff            |                                  ()             |
-     gnucash            |                         []       () ()     []   |
-     gnucash-glossary   |                               [] ()             |
-     gpe-aerial         |                         []       []             |
-     gpe-beam           |                         []       []             |
-     gpe-calendar       |                         []       []             |
-     gpe-clock          |                         []       []             |
-     gpe-conf           |                         []       []             |
-     gpe-contacts       |                                                 |
-     gpe-edit           |                         []                      |
-     gpe-go             |                         []                      |
-     gpe-login          |                         []       []             |
-     gpe-ownerinfo      |                         []       []             |
-     gpe-sketchbook     |                         []       []             |
-     gpe-su             |                         []       []             |
-     gpe-taskmanager    |                         []       []             |
-     gpe-timesheet      |                         []                      |
-     gpe-today          |                         []       []             |
-     gpe-todo           |                         []       []             |
-     gphoto2            |                         []    [] []        []   |
-     gprof              |                               [] []             |
-     gpsdrive           |                                  ()    ()       |
-     gramadoir          | []                               []             |
-     grep               | []          [] []    []          [] []          |
+     gawk               | []                                     []       |
+     gbiff              |                                        []       |
+     gcal               |                                                 |
+     gcc                |                                                 |
+     gettext-examples   | []                                     []       |
+     gettext-runtime    | [] []                                  []       |
+     gettext-tools      | [] []                                           |
+     gimp-print         | []                                     []       |
+     gip                |                            []          []       |
+     gliv               |                                        []       |
+     glunarclock        |                            []          []       |
+     gmult              | []                         []                   |
+     gnubiff            |                                                 |
+     gnucash            | ()                               ()             |
+     gnucash-glossary   |                                        []       |
+     gnuedu             |                                                 |
+     gnulib             | [] []                      []          []       |
+     gnunet-gtk         |                                                 |
+     gnutls             |                                                 |
+     gpe-aerial         |                                        []       |
+     gpe-beam           |                                        []       |
+     gpe-calendar       | []                                              |
+     gpe-clock          | [] []                                  []       |
+     gpe-conf           |    []                                  []       |
+     gpe-contacts       |    []                                           |
+     gpe-edit           | [] []                                  []       |
+     gpe-filemanager    | [] []                                           |
+     gpe-go             | [] []                                  []       |
+     gpe-login          | [] []                                  []       |
+     gpe-ownerinfo      | []                                     []       |
+     gpe-package        | [] []                                           |
+     gpe-sketchbook     |    []                                  []       |
+     gpe-su             | [] []                                  []       |
+     gpe-taskmanager    | [] [] []                               []       |
+     gpe-timesheet      |                                        []       |
+     gpe-today          | []                                     []       |
+     gpe-todo           | []                                              |
+     gphoto2            | []                                     []       |
+     gprof              |                                                 |
+     gpsdrive           | ()                                     ()    () |
+     gramadoir          |                                        ()       |
+     grep               | []       []                      []    []       |
      gretl              |                                                 |
-     gsasl              |                                  []             |
+     gsasl              |                                        []       |
      gss                |                                                 |
-     gst-plugins        | []       []          [] []       []        []   |
-     gstreamer          | []                   [] []       []        []   |
-     gtick              | []                               ()             |
-     gtkspell           |             []                   [] []          |
-     hello              |                      []       [] [] []          |
-     id-utils           |                               [] []             |
+     gst-plugins        |                                        []       |
+     gst-plugins-base   |                                                 |
+     gst-plugins-good   |                                        []       |
+     gstreamer          |                                        []       |
+     gtick              |                                                 |
+     gtkam              | []                                              |
+     gtkorphan          |                                        []       |
+     gtkspell           |                         []             []       |
+     gutenprint         |                                                 |
+     hello              | [] []                      []    []    [] []    |
+     id-utils           |                                        []       |
      impost             |                                                 |
-     indent             |                      []          []             |
-     iso_3166           |                                                 |
-     iso_3166_1         |                      [] []    [] [] []          |
-     iso_3166_2         |                                                 |
-     iso_3166_3         |                                  []             |
-     iso_4217           |                                                 |
-     iso_639            |                                                 |
-     jpilot             |                         []                      |
+     indent             | []                                     []       |
+     iso_3166           |                                        []       |
+     iso_3166_2         |                                        []       |
+     iso_4217           | []                      []             []       |
+     iso_639            | []                                     []       |
+     jpilot             | ()                                     ()    () |
      jtag               |                                                 |
-     jwhois             |                                                 |
-     kbd                |                         []    [] [] []          |
-     latrine            |                                  ()             |
-     ld                 |                               []                |
-     libc               |                      [] []    [] [] []          |
+     jwhois             |                                        []       |
+     kbd                |                                        []       |
+     keytouch           |                                        []       |
+     keytouch-editor    |                                                 |
+     keytouch-keyboa... |                                                 |
+     latrine            |                                        []       |
+     ld                 |                                                 |
+     leafpad            | []             []                               |
+     libc               | [] []                            []    []    [] |
+     libexif            |                                                 |
      libextractor       |                                                 |
-     libgpewidget       |                         []    [] []             |
-     libgsasl           |                                                 |
-     libiconv           | []                   []       [] [] []          |
-     libidn             |                                                 |
-     lifelines          |                               [] ()             |
-     lilypond           |                                  []             |
-     lingoteach         |                                                 |
-     lynx               |                      [] []    [] []             |
-     m4                 |                         []    [] [] []          |
-     mailutils          |                      []                         |
-     make               |                               [] []             |
-     man-db             |                      [] ()    [] []             |
-     minicom            |                         []       []             |
-     mysecretdiary      |                               [] []             |
-     nano               |                      [] ()       []             |
-     nano_1_0           |                      [] ()    [] []             |
-     opcodes            |                                  []             |
-     parted             |                      [] []    [] []             |
-     psmisc             |                                                 |
-     ptx                |                      []       [] []             |
+     libgpewidget       |                                        []       |
+     libgpg-error       |                                                 |
+     libgphoto2         | []                                              |
+     libgphoto2_port    | []                                              |
+     libgsasl           |                                        []       |
+     libiconv           |                                                 |
+     libidn             | []                                     []       |
+     lifelines          |                                        []       |
+     lilypond           |                                                 |
+     lingoteach         |                                        []       |
+     lynx               | []                                     []       |
+     m4                 | []                                     []       |
+     mailutils          |                                                 |
+     make               | [] []                                  []       |
+     man-db             | ()                                              |
+     minicom            | []                                              |
+     mysecretdiary      |                                        []       |
+     nano               |                            []    []    []       |
+     nano_1_0           |                            []    []       []    |
+     opcodes            |                                        []       |
+     parted             | []                                     []       |
+     pilot-qof          |                                                 |
+     psmisc             | []                               []    []       |
      pwdutils           |                                                 |
      python             |                                                 |
-     radius             |                      []                         |
-     recode             |             []       []       [] [] []          |
-     rpm                |                         []    []                |
-     screem             |                                                 |
-     scrollkeeper       |          [] []       [] [] [] [] []        []   |
-     sed                |                      []          []             |
-     sh-utils           |                               [] []             |
-     shared-mime-info   |                         [] []                   |
-     sharutils          |                      [] []    [] [] []          |
-     silky              |                                                 |
-     skencil            |                               [] ()             |
-     sketch             |                               [] ()             |
-     solfege            |                                  []             |
-     soundtracker       |                               [] []             |
-     sp                 |                                  []             |
-     stardict           |                         []                      |
-     tar                |                                                 |
-     texinfo            |                               [] []             |
-     textutils          |                      []       [] []             |
-     tin                |                                  ()        ()   |
-     tp-robot           |                                  []             |
-     tuxpaint           | []                   [] []    [] [] []     []   |
-     unicode-han-tra... |                                                 |
-     unicode-transla... |                                                 |
-     util-linux         |                      [] []    [] []             |
-     vorbis-tools       |             []          []    []           []   |
-     wastesedge         |                                  ()             |
-     wdiff              |                      []       [] []        []   |
-     wget               |                []    []       [] [] []     []   |
-     xchat              |                      []          [] []     []   |
-     xkeyboard-config   |                                                 |
-     xpad               |                                                 |
-                        +-------------------------------------------------+
-                          af am ar az be bg bs ca cs cy da de el en en_GB
-                          10  0  0  2  7  4  0 41 43  3 52 90 20  1  15
-
-                          eo es et eu fa fi fr  ga gl he hr hu id is it
-                        +-----------------------------------------------+
-     GNUnet             |                                               |
-     a2ps               |       []       [] []                       () |
-     aegis              |                                               |
-     ant-phone          |                   []                          |
-     anubis             |                   []                          |
-     ap-utils           |                   []                          |
-     aspell             |                   []  []                      |
-     bash               | [] []             []              []          |
-     batchelor          |                   []  []                      |
-     bfd                |    []                                         |
-     bibshelf           |    []                 []                   [] |
-     binutils           |    []             []                          |
-     bison              |    [] []          []  []             []    [] |
-     bluez-pin          | []             [] []  []          [] []       |
-     clisp              |    []             []                          |
-     console-tools      |                                               |
-     coreutils          |    [] []       [] []  []                      |
-     cpio               |    []             []                          |
-     cpplib             |    []             []                          |
-     darkstat           |    []             ()  []          [] []       |
-     dialog             |    [] [] []    [] []  []          []       [] |
-     diffutils          | [] []          [] []  [] [] []    [] []    [] |
-     doodle             |                       []                   [] |
-     e2fsprogs          |    []             []                       [] |
-     enscript           |                   []           []             |
-     error              |    []          [] []  []          []          |
-     fetchmail          |    []                                         |
-     fileutils          |    [] []          []  []          []       [] |
-     findutils          |    [] []          []  []                   [] |
-     flex               |    []             []  []                      |
-     fslint             |                   []                          |
-     gas                |    []             []                          |
-     gawk               |    []             []  []    []                |
-     gbiff              |                   []                          |
-     gcal               |    []             []                          |
-     gcc                |    []                                         |
-     gettext-examples   |    []             []  []                   [] |
-     gettext-runtime    |    []          [] []  []             []    [] |
-     gettext-tools      |    []             []                       [] |
-     gimp-print         |    []             []                          |
-     gip                |    []    []       []                          |
-     gliv               |                   ()                          |
-     glunarclock        |                []     []          []          |
-     gmult              |          []       []                       [] |
-     gnubiff            |                   ()                       () |
-     gnucash            |    []                             ()       [] |
-     gnucash-glossary   |    []                                      [] |
-     gpe-aerial         |    []             []                          |
-     gpe-beam           |    []             []                          |
-     gpe-calendar       |    []             []              [] []       |
-     gpe-clock          |    []          [] []                          |
-     gpe-conf           |                   []                          |
-     gpe-contacts       |                   []                          |
-     gpe-edit           |                   []                 []       |
-     gpe-go             |    []             []                          |
-     gpe-login          |    []             []              []          |
-     gpe-ownerinfo      |    []          [] []              [] []       |
-     gpe-sketchbook     |    []             []                          |
-     gpe-su             |    []          [] []                          |
-     gpe-taskmanager    |    []          [] []                          |
-     gpe-timesheet      |    []             []  []             []       |
-     gpe-today          |    []          [] []  []                      |
-     gpe-todo           |    []             []                 []       |
-     gphoto2            |    []          [] []              []       [] |
-     gprof              |    []             []                 []       |
-     gpsdrive           |    ()             ()              []       () |
-     gramadoir          |                   []  []                      |
-     grep               |    [] [] []    [] []  [] [] [] [] [] []    [] |
-     gretl              |    []             []                       [] |
-     gsasl              |          []       []  []                      |
-     gss                |                   []                          |
-     gst-plugins        |                   []              []       [] |
-     gstreamer          |                                            [] |
-     gtick              |          []    [] []  []                   [] |
-     gtkspell           | [] []    []       []  []                   [] |
-     hello              | [] [] [] [] [] [] []  [] [] [] [] [] []    [] |
-     id-utils           |                   []              [] []    [] |
-     impost             |                   []  []                      |
-     indent             | [] [] [] []    [] []  [] []       [] []    [] |
-     iso_3166           | []             [] []                          |
-     iso_3166_1         |    []    []    [] []  []          [] []       |
-     iso_3166_2         |                   []                          |
-     iso_3166_3         |                   []                          |
-     iso_4217           |       []       []        []                   |
-     iso_639            | []          [] [] []                          |
-     jpilot             |    []             []                          |
-     jtag               |                   []                          |
-     jwhois             |    []             []              [] []    [] |
-     kbd                |    []             []                          |
-     latrine            |                   []  []                   [] |
-     ld                 |    []             []                          |
-     libc               |    []          [] []     []       []          |
-     libextractor       |                                               |
-     libgpewidget       |    []             []  []          [] []       |
-     libgsasl           |                   []  []                      |
-     libiconv           | [] [] []       [] []  [] []    [] [] []    [] |
-     libidn             |                   []                       [] |
-     lifelines          |                   ()                          |
-     lilypond           |                   []                          |
-     lingoteach         |                   []                 []    [] |
-     lynx               |       []                          []       [] |
-     m4                 |                   []  [] []          []       |
-     mailutils          |    []             []                          |
-     make               |    []          [] []  [] [] [] []             |
-     man-db             |    ()                                         |
-     minicom            |    []          [] []              []          |
-     mysecretdiary      |    []             []                 []       |
-     nano               |    []    []    () []                       [] |
-     nano_1_0           |    []             []     []          []    [] |
-     opcodes            |    []             []                          |
-     parted             |    []             []     []                [] |
-     psmisc             |          []                                [] |
-     ptx                | [] [] []       [] []  [] []       [] []       |
-     pwdutils           |                                               |
-     python             |                                               |
-     radius             |    []             []                          |
-     recode             | [] []             []     [] []    [] []    [] |
-     rpm                |                   []                          |
-     screem             |                                               |
-     scrollkeeper       |    []          []                 []          |
-     sed                |    [] []          []  []          []          |
-     sh-utils           |    [] []       [] []  []          []       [] |
-     shared-mime-info   | [] []    []    [] []              []          |
-     sharutils          |    [] []       [] []     []       []       [] |
-     silky              |                   []                          |
-     skencil            |    []             []                          |
-     sketch             |    []             []                          |
-     solfege            |                                            [] |
-     soundtracker       |    []             []                       [] |
-     sp                 |                   []                          |
-     stardict           |                                   []          |
-     tar                |    [] []          []  []                   [] |
-     texinfo            | []                []        []                |
-     textutils          |    []             []  [] []       []          |
-     tin                |       []          ()                          |
-     tp-robot           |                   []              []          |
-     tuxpaint           |    []          [] []  []    []    [] [] [] [] |
-     unicode-han-tra... |                                               |
-     unicode-transla... |                   []  []                      |
-     util-linux         |    [] []       [] []              []       [] |
-     vorbis-tools       |    []             []                          |
-     wastesedge         |                   ()                          |
-     wdiff              |    [] []          []  [] []       [] []    [] |
-     wget               |    [] [] []    [] []  [] []    [] []       [] |
-     xchat              |    []    []    [] []                       [] |
-     xkeyboard-config   |                                               |
-     xpad               |    []                 []          []          |
-                        +-----------------------------------------------+
-                          eo es et eu fa fi fr  ga gl he hr hu id is it
-                          13 85 21 15  2 35 115 45 17  8  6 40 27  1 45
-
-                          ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
-                        +-----------------------------------------------+
-     GNUnet             |                                               |
-     a2ps               |    ()                   []       []    ()     |
-     aegis              |                                  ()           |
-     ant-phone          |                                  []           |
-     anubis             |                         []    [] []           |
-     ap-utils           |                                               |
-     aspell             |                      []          []           |
-     bash               |                                  []           |
-     batchelor          |                                  []           |
-     bfd                |                                               |
-     bibshelf           |                                               |
-     binutils           |                                               |
-     bison              |                         []    [] []           |
-     bluez-pin          |                                  []           |
-     clisp              |                                  []           |
-     console-tools      |                                               |
-     coreutils          | []                               []           |
-     cpio               |                                               |
-     cpplib             |                                               |
-     darkstat           |                         []       []           |
-     dialog             |                                  []           |
-     diffutils          | []                      []       []           |
-     doodle             |                                               |
-     e2fsprogs          |                                               |
-     enscript           |                                  []           |
-     error              |                                  []           |
-     fetchmail          | []                               []           |
-     fileutils          | []       []                                   |
-     findutils          |                                  []           |
-     flex               |    []                            []           |
-     fslint             |                                  []           |
-     gas                |                                               |
-     gawk               | []                               []           |
-     gbiff              |                                  []           |
-     gcal               |                                               |
-     gcc                |                                               |
-     gettext-examples   | []                               []           |
-     gettext-runtime    | [] []                            []           |
-     gettext-tools      | [] []                                         |
-     gimp-print         | []                               []           |
-     gip                |                                  []           |
-     gliv               |                                  []           |
-     glunarclock        |                         []       []           |
-     gmult              | []                                            |
-     gnubiff            |                                               |
-     gnucash            | ()                            () []           |
-     gnucash-glossary   |                                  []           |
-     gpe-aerial         |                                  []           |
-     gpe-beam           |                                  []           |
-     gpe-calendar       |                                  []           |
-     gpe-clock          |                                  []           |
-     gpe-conf           |                                  []           |
-     gpe-contacts       |                                               |
-     gpe-edit           |                                  []           |
-     gpe-go             |                                  []           |
-     gpe-login          |                                  []           |
-     gpe-ownerinfo      |                                  []           |
-     gpe-sketchbook     |                                  []           |
-     gpe-su             |                                  []           |
-     gpe-taskmanager    |       []                         []           |
-     gpe-timesheet      |                                  []           |
-     gpe-today          |                                  []           |
-     gpe-todo           |                                  []           |
-     gphoto2            | []                               []           |
-     gprof              |                                               |
-     gpsdrive           | ()                               ()    ()     |
-     gramadoir          |                                  ()           |
-     grep               | []                            [] []           |
-     gretl              |                                               |
-     gsasl              |                                  []           |
-     gss                |                                               |
-     gst-plugins        |                                  []           |
-     gstreamer          |                                  []           |
-     gtick              |                                  []           |
-     gtkspell           |                      []          []           |
-     hello              | [] []          []       []    [] [] [] []     |
-     id-utils           |                                  []           |
-     impost             |                                               |
-     indent             | []                               []           |
-     iso_3166           |                                  []           |
-     iso_3166_1         |                                  []    []     |
-     iso_3166_2         |                                  []           |
-     iso_3166_3         |                                  []           |
-     iso_4217           | []                   []          []           |
-     iso_639            | []                               [] []        |
-     jpilot             | ()                               ()    ()     |
-     jtag               |                                               |
-     jwhois             |                                  []           |
-     kbd                |                                  []           |
-     latrine            |                                  []           |
-     ld                 |                                               |
-     libc               | [] []                         [] []    []     |
-     libextractor       |                                               |
-     libgpewidget       |                                  []           |
-     libgsasl           |                                  []           |
-     libiconv           |                                  []           |
-     libidn             |                                               |
-     lifelines          |                                  []           |
-     lilypond           |                                  []           |
-     lingoteach         |                                  []           |
-     lynx               | []                               []           |
-     m4                 | []                               []           |
-     mailutils          |                                               |
-     make               | [] []                            []           |
-     man-db             | ()                                            |
-     minicom            | []                                            |
-     mysecretdiary      |                                  []           |
-     nano               |                         []    []              |
-     nano_1_0           |                         []    []    []        |
-     opcodes            |                                  []           |
-     parted             | []                                  []        |
-     psmisc             |                               [] []           |
-     ptx                |                               [] []    []     |
-     pwdutils           |                                               |
-     python             |                                               |
-     radius             |                                               |
-     recode             |                                  []           |
-     rpm                | [] []                                         |
-     screem             | []                                            |
-     scrollkeeper       |                               [] [] []        |
-     sed                | []                               []           |
-     sh-utils           | []                            []              |
-     shared-mime-info   |    []                         [] [] []        |
-     sharutils          | []                               []           |
-     silky              |                                  []           |
-     skencil            |                                               |
-     sketch             |                                               |
-     solfege            |                                  []    []     |
-     soundtracker       |                                               |
-     sp                 | ()                                            |
-     stardict           |                   []             []           |
-     tar                | []                               []           |
-     texinfo            | []                            [] []           |
-     textutils          | [] []                         []              |
-     tin                |                                               |
-     tp-robot           |                                  []           |
-     tuxpaint           | [] []       []          []       [] []        |
-     unicode-han-tra... |                                               |
-     unicode-transla... |                                               |
-     util-linux         | []                               []           |
-     vorbis-tools       |                                  []           |
-     wastesedge         |                                  []           |
-     wdiff              |                         []    []              |
-     wget               | []                               []           |
-     xchat              |    []          [] []             []           |
-     xkeyboard-config   |                                  []           |
-     xpad               |                                  []           |
-                        +-----------------------------------------------+
-                          ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
-                          33 11  1  1  1  2  2  3 11  0 15 96  7  5  0
-
-                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
-                        +-------------------------------------------------+
-     GNUnet             |                                                 |
-     a2ps               |       ()     []      [] []       []    [] []    |
-     aegis              |                      () ()                      |
-     ant-phone          |                      []                         |
-     anubis             |       []             [] []                      |
-     ap-utils           |       ()                                        |
-     aspell             |                      [] []                      |
-     bash               |              []      [] []                      |
-     batchelor          |                      []                         |
-     bfd                |                                                 |
-     bibshelf           |                                                 |
-     binutils           |                         []                []    |
-     bison              |       []     []      [] []                []    |
-     bluez-pin          |       []     []   [] [] []    []       [] []    |
-     clisp              |                         []                      |
-     console-tools      |                         []                      |
-     coreutils          |       []                []       []       []    |
-     cpio               |       []                                  []    |
-     cpplib             |                                                 |
-     darkstat           |       []     []      []       []       [] []    |
-     dialog             |       [] []  []   [] [] [] []                   |
-     diffutils          |       []     []      [] []             [] []    |
-     doodle             |                                     []          |
-     e2fsprogs          |       []                                  []    |
-     enscript           |              []      [] []                []    |
-     error              |              []      []       []                |
-     fetchmail          |       []     ()         []    []    []          |
-     fileutils          |       []             [] []       []       []    |
-     findutils          |       [] []          []       []       [] []    |
-     flex               |       []     []      [] []                []    |
-     fslint             |              []      []                []       |
-     gas                |                                                 |
-     gawk               |       []     []      []                   []    |
-     gbiff              |                      []                         |
-     gcal               |                                           []    |
-     gcc                |                                                 |
-     gettext-examples   |       []             [] []    []       [] []    |
-     gettext-runtime    |       []             [] []    [] []    [] []    |
-     gettext-tools      |       []             [] []    [] []    [] []    |
-     gimp-print         |                               []          []    |
-     gip                |                   []          []       []       |
-     gliv               |              []      []       []                |
-     glunarclock        |              []      [] []    []       [] []    |
-     gmult              |              []   [] []                []       |
-     gnubiff            |                      ()                   []    |
-     gnucash            |       () []             []    []          []    |
-     gnucash-glossary   |          []                   []          []    |
-     gpe-aerial         |          []  []      [] []             [] []    |
-     gpe-beam           |          []  []      [] []             [] []    |
-     gpe-calendar       |          []  []      [] []    []       [] []    |
-     gpe-clock          |          []  []      [] []    []       [] []    |
-     gpe-conf           |          []  []      [] []    []          []    |
-     gpe-contacts       |                      [] []                []    |
-     gpe-edit           |          []  []      [] []    []       [] []    |
-     gpe-go             |              []      [] []             [] []    |
-     gpe-login          |          []  []      [] []    []       [] []    |
-     gpe-ownerinfo      |          []  []      [] []    []       [] []    |
-     gpe-sketchbook     |          []  []      [] []    []       [] []    |
-     gpe-su             |          []  []      [] []    []       [] []    |
-     gpe-taskmanager    |          []  []      [] []    []       [] []    |
-     gpe-timesheet      |          []  []      [] []    []       [] []    |
-     gpe-today          |          []  []      [] []    []       [] []    |
-     gpe-todo           |          []  []      [] []    []       [] []    |
-     gphoto2            |                      []       []       [] []    |
-     gprof              |              []      []                   []    |
-     gpsdrive           |                      []                         |
-     gramadoir          |                               []                |
-     grep               |       [] []  []      [] []       []    []       |
-     gretl              |       []                                        |
-     gsasl              |       []             []             [] [] []    |
-     gss                |       []             []                   []    |
-     gst-plugins        | []                                  [] [] []    |
-     gstreamer          |                         []          [] [] []    |
-     gtick              |                      [] []                []    |
-     gtkspell           |              []   [] [] []    []       []       |
-     hello              |       []     []      [] []    []       [] []    |
-     id-utils           |              []      [] []                []    |
-     impost             |                                                 |
-     indent             |              []      [] []    []       [] []    |
-     iso_3166           |          []                []       [] [] []    |
-     iso_3166_1         |                               [] [] [] []       |
-     iso_3166_2         |                                                 |
-     iso_3166_3         |                      []    []          []       |
-     iso_4217           |                            []          []       |
-     iso_639            |                            []          [] []    |
-     jpilot             |                                                 |
-     jtag               |                               []                |
-     jwhois             |       []     []      [] ()                ()    |
-     kbd                |       []             []                   []    |
-     latrine            |                      []                   []    |
-     ld                 |                                           []    |
-     libc               |       []     []         []    []          []    |
-     libextractor       |                      []                         |
-     libgpewidget       |          []  []      []       []       [] []    |
-     libgsasl           |       []             []                []       |
-     libiconv           |       []     []   [] [] []    [] [] [] [] []    |
-     libidn             |       []                                  ()    |
-     lifelines          |       []                                  []    |
-     lilypond           |                                           []    |
-     lingoteach         |              []                                 |
-     lynx               |              []         []                []    |
-     m4                 |       []     []      [] []                []    |
-     mailutils          |       []             [] []                      |
-     make               |       []     []         []                []    |
-     man-db             |                      []                   []    |
-     minicom            |       []     []      [] []                      |
-     mysecretdiary      |              []      [] []                []    |
-     nano               |              []      []                   []    |
-     nano_1_0           |       []             [] []                []    |
-     opcodes            |                      []                   []    |
-     parted             |       [] []  []                           []    |
-     psmisc             |       []             []                         |
-     ptx                |       [] []  []      [] []                []    |
-     pwdutils           |       []                                        |
-     python             |                                                 |
-     radius             |       []                []                      |
-     recode             |       []     []      [] []       []       []    |
-     rpm                |       [] []             []                []    |
-     screem             |                                                 |
-     scrollkeeper       |       []             [] []    []    [] [] []    |
-     sed                |       [] []  []      [] []    []       [] []    |
-     sh-utils           |                         []       []    []       |
-     shared-mime-info   |          []  []                     [] [] []    |
-     sharutils          |                         []             [] []    |
-     silky              |                               []                |
-     skencil            |          []  []                           []    |
-     sketch             |          []  []                           []    |
+     qof                |                                                 |
+     radius             |                                                 |
+     recode             |                                        []       |
+     rpm                | [] []                                           |
+     screem             | []                                              |
+     scrollkeeper       |                                  [] [] [] []    |
+     sed                | []                                     []       |
+     sh-utils           | []                               []             |
+     shared-mime-info   |    []          []                []    [] []    |
+     sharutils          | []                                     []       |
+     shishi             |                                                 |
+     silky              |                                        []       |
+     skencil            |                                                 |
+     sketch             |                                                 |
      solfege            |                                                 |
-     soundtracker       |                               []          []    |
-     sp                 |                                                 |
-     stardict           |                         []    []                |
-     tar                |       []             [] []                []    |
-     texinfo            |       []             [] []                []    |
-     textutils          |                         []       []       []    |
+     soundtracker       |                                                 |
+     sp                 | ()                                              |
+     stardict           |                      []                []       |
+     system-tools-ba... | [] []          []                      []       |
+     tar                | []       []                            []       |
+     texinfo            | []                               []    []       |
+     textutils          | [] []                            []             |
      tin                |                                                 |
-     tp-robot           |                         []                      |
-     tuxpaint           |       [] []  []      []       []    [] [] []    |
+     tp-robot           |                                        []       |
+     tuxpaint           |                                           []    |
      unicode-han-tra... |                                                 |
      unicode-transla... |                                                 |
-     util-linux         |              []         []                []    |
-     vorbis-tools       |                      [] []                      |
-     wastesedge         |                                                 |
-     wdiff              |       []     []      [] []    []          []    |
-     wget               |       [] []  []      [] []    [] []    [] []    |
-     xchat              |                         []    [] [] [] [] []    |
-     xkeyboard-config   |                                                 |
-     xpad               |                                                 |
+     util-linux         | []                                     []       |
+     vorbis-tools       |                                        []       |
+     wastesedge         |                                        []       |
+     wdiff              |                            []    []             |
+     wget               | []                                     []       |
+     xchat              | [] []                []                []       |
+     xkeyboard-config   |                                        []       |
+     xpad               |    []                      []          []       |
                         +-------------------------------------------------+
-                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
-                           1  0 48 30  58    6 79 71  5 45 13 12 50 86  0
-
-                          tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
-                        +--------------------------------------------+
-     GNUnet             |                                            |  0
-     a2ps               |          [] []     []                      | 19
-     aegis              |                                            |  0
-     ant-phone          |          []                                |  4
-     anubis             |          []                                |  9
-     ap-utils           |             ()                             |  1
-     aspell             |             []     [] []                   | 13
-     bash               |                                            | 10
-     batchelor          |          []        []                      |  7
-     bfd                |                                            |  1
-     bibshelf           |                    []                      |  5
-     binutils           |          []                                |  6
-     bison              |          []                                | 17
-     bluez-pin          |          [] []     [] []     []            | 24
-     clisp              |                                            |  7
-     console-tools      |          []                                |  4
-     coreutils          |          []                                | 16
-     cpio               |          []        []                      |  6
-     cpplib             |          []        []                      |  7
-     darkstat           |                    []        ()    ()      | 15
-     dialog             |          [] []     []                      | 25
-     diffutils          |          []        []        []    []      | 28
-     doodle             |                    []                      |  5
-     e2fsprogs          |          []                                |  8
-     enscript           |          []                                | 12
-     error              |          []        []              []      | 16
-     fetchmail          |          []                                | 12
-     fileutils          |          []                  []    []      | 18
-     findutils          |          []        []                      | 17
-     flex               |          []        []                      | 15
-     fslint             |                    []                      |  7
-     gas                |          []                                |  3
-     gawk               |          []                                | 14
-     gbiff              |                                            |  4
-     gcal               |          []                                |  5
-     gcc                |          []                                |  3
-     gettext-examples   |          [] []     []        []            | 20
-     gettext-runtime    |          [] []     []        []    []      | 25
-     gettext-tools      |          [] []               []            | 17
-     gimp-print         |             []                             | 11
-     gip                |                    []                      |  8
-     gliv               |          []                                |  6
-     glunarclock        |                    [] []                   | 13
-     gmult              |          []        []        []            | 13
-     gnubiff            |                    []                      |  3
-     gnucash            |          ()                        []      | 10
-     gnucash-glossary   |                                    []      |  8
-     gpe-aerial         |                    []        []            | 13
-     gpe-beam           |                    []        []            | 13
-     gpe-calendar       |                    [] []     []    []      | 18
-     gpe-clock          |          []        [] []     []            | 17
-     gpe-conf           |                    []        []            | 12
-     gpe-contacts       |                    []        []            |  6
-     gpe-edit           |          []        [] []           []      | 15
-     gpe-go             |          []        []                      | 11
-     gpe-login          |          []        [] []     []    []      | 18
-     gpe-ownerinfo      |          []        []        []    []      | 19
-     gpe-sketchbook     |          []        []                      | 14
-     gpe-su             |          []        []        []            | 16
-     gpe-taskmanager    |          []        []        []            | 17
-     gpe-timesheet      |          []        []        []    []      | 17
-     gpe-today          |          []        [] []     []    []      | 19
-     gpe-todo           |                    [] []           []      | 16
-     gphoto2            |             []               []            | 17
-     gprof              |          []        []                      | 10
-     gpsdrive           |                                            |  2
-     gramadoir          |                    []                      |  6
-     grep               |          [] []     []              []      | 32
-     gretl              |                                            |  4
-     gsasl              |                    []        []            | 12
-     gss                |                    []                      |  5
-     gst-plugins        |             []     []                      | 16
-     gstreamer          |          [] []     []                      | 14
-     gtick              |                    []                      | 11
-     gtkspell           |                    [] []     []            | 20
-     hello              |          [] []     []        []            | 37
-     id-utils           |          []        []                      | 13
-     impost             |                    []                      |  3
-     indent             |          []        []        []            | 24
-     iso_3166           |       [] []        []                      | 12
-     iso_3166_1         |          []           []                   | 20
-     iso_3166_2         |                                            |  2
-     iso_3166_3         |                       []     []            |  8
-     iso_4217           |          []        []                      | 10
-     iso_639            |                    [] []                   | 12
-     jpilot             |          [] []               []            |  6
-     jtag               |                                            |  2
-     jwhois             |          []        []              []      | 12
-     kbd                |          []        []                      | 12
-     latrine            |          []        []                      |  8
-     ld                 |          []                                |  5
-     libc               |          []                  []            | 22
-     libextractor       |                                            |  1
-     libgpewidget       |                    [] []                   | 17
-     libgsasl           |                    []                      |  7
-     libiconv           |          [] []     [] []     []            | 32
-     libidn             |                    []        []            |  5
-     lifelines          |                                            |  4
-     lilypond           |          []                                |  5
-     lingoteach         |                                            |  5
-     lynx               |          [] []                             | 14
-     m4                 |                    []        []            | 17
-     mailutils          |             []                             |  7
-     make               |          []                  []            | 18
-     man-db             |                                            |  5
-     minicom            |                                            | 11
-     mysecretdiary      |          []        []                      | 12
-     nano               |                                            | 11
-     nano_1_0           |          [] []                             | 17
-     opcodes            |          []                                |  7
-     parted             |          [] []               []            | 17
-     psmisc             |                    []                      |  7
-     ptx                |          []                  []            | 23
-     pwdutils           |                                            |  1
-     python             |                                            |  0
-     radius             |             []                             |  6
-     recode             |          []        []                      | 22
-     rpm                |          [] []                             | 11
-     screem             |                                            |  1
-     scrollkeeper       |          [] []                             | 23
-     sed                |          []        []                      | 19
-     sh-utils           |          []                                | 15
-     shared-mime-info   |             []               []            | 19
-     sharutils          |          []        []              []      | 20
-     silky              |                                            |  3
-     skencil            |                                            |  6
-     sketch             |                                            |  6
-     solfege            |                                            |  4
-     soundtracker       |          []                                |  8
-     sp                 |          []                                |  3
-     stardict           |             []     []        []    []      | 10
-     tar                |          [] []                             | 13
-     texinfo            |          []                  []            | 14
-     textutils          |          []                  []    []      | 17
-     tin                |                                            |  1
-     tp-robot           |                              []    []      |  7
-     tuxpaint           |          []        [] []     []            | 34
-     unicode-han-tra... |                                            |  0
-     unicode-transla... |                                            |  2
-     util-linux         |          [] []                             | 17
-     vorbis-tools       |             []                             | 10
-     wastesedge         |                                            |  1
-     wdiff              |          []        []                      | 22
-     wget               |          [] []               []    []      | 31
-     xchat              |             []     []        []            | 22
-     xkeyboard-config   |                                            |  1
-     xpad               |                    []                      |  5
-                        +--------------------------------------------+
-       72 teams           tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
-      147 domains          0  0  1 78 29  0  71 16  0  41    20    0  1711
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+                          52 24  2  2  1  3  0  2  3 21  0 15  1 97  5  1
+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +------------------------------------------------------+
+     GNUnet             |                                                      |
+     a2ps               |           ()     []      [] []       []    [] []     |
+     aegis              |                          () ()                       |
+     ant-phone          |                          []                   []     |
+     anubis             |           []             [] []                       |
+     ap-utils           |           ()                                         |
+     aspell             |                          [] []                       |
+     bash               |                  []      [] []                       |
+     batchelor          |                          []                   []     |
+     bfd                |                                                      |
+     bibshelf           |                                               []     |
+     binutils           |                             []                []     |
+     bison              |           []     []      [] []                []     |
+     bison-runtime      |           []             []          []       []     |
+     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
+     cflow              |           []                                         |
+     clisp              |                             []                       |
+     console-tools      |                             []                       |
+     coreutils          |           []                []       []       []     |
+     cpio               |           []                []                []     |
+     cpplib             |                                               []     |
+     cryptonit          |                  []                           []     |
+     darkstat           |           []     []      []       []       [] []     |
+     dialog             |           [] []  []   [] [] [] []          [] []     |
+     diffutils          |           []     []      [] []             [] []     |
+     doodle             |                                         []    []     |
+     e2fsprogs          |           []                                  []     |
+     enscript           |                  []      [] []       []       []     |
+     error              |                  []      []       []          []     |
+     fetchmail          |           []                []          []           |
+     fileutils          |           []             [] []       []       []     |
+     findutils          |           [] []          []       [] []       []     |
+     flex               |           []     []      [] []                []     |
+     fslint             |                  []      []                [] []     |
+     gas                |                                                      |
+     gawk               |           []     []      []                   []     |
+     gbiff              |                          []                          |
+     gcal               |                                               []     |
+     gcc                |                                               []     |
+     gettext-examples   |           [] []          [] []    [] []    [] []     |
+     gettext-runtime    |           [] []          [] []    [] []    [] []     |
+     gettext-tools      |           []             [] []    [] []    [] []     |
+     gimp-print         |                                   []          []     |
+     gip                |                       []          []       [] []     |
+     gliv               |                  []      []       []          []     |
+     glunarclock        |                  []      [] []    []       [] []     |
+     gmult              |                       [] []                [] []     |
+     gnubiff            |                          ()                          |
+     gnucash            |           ()                                  []     |
+     gnucash-glossary   |              []                   []          []     |
+     gnuedu             |                                                      |
+     gnulib             |           []             [] []       []       []     |
+     gnunet-gtk         |                                               []     |
+     gnutls             |           []                                  []     |
+     gpe-aerial         |              []  []      [] []       []    [] []     |
+     gpe-beam           |              []  []      [] []       []    [] []     |
+     gpe-calendar       |                             []                       |
+     gpe-clock          |              []  []      [] []    [] []    [] []     |
+     gpe-conf           |              []  []      [] []    [] []       []     |
+     gpe-contacts       |                          [] []       []    [] []     |
+     gpe-edit           |              []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                      []       []     |
+     gpe-go             |                  []      [] []       []    [] []     |
+     gpe-login          |              []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
+     gpe-package        |                                      []       []     |
+     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
+     gpe-su             |              []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
+     gpe-today          |              []  []      [] []    [] []    [] []     |
+     gpe-todo           |                             []       []    [] []     |
+     gphoto2            |           []             []       []       [] []     |
+     gprof              |                  []      []                   []     |
+     gpsdrive           |        []                []                   []     |
+     gramadoir          |                                   []          []     |
+     grep               |           [] []  []      [] []       []    [] []     |
+     gretl              |           []                                         |
+     gsasl              |           []                               [] []     |
+     gss                |           []             []                   []     |
+     gst-plugins        |     []                                  [] [] []     |
+     gst-plugins-base   |                                               []     |
+     gst-plugins-good   |     []                                  [] [] []     |
+     gstreamer          |                                         [] [] []     |
+     gtick              |                             []                       |
+     gtkam              |           []     []         []                []     |
+     gtkorphan          |                                               []     |
+     gtkspell           |                  []   [] [] []    [] []    [] []     |
+     gutenprint         |                                               []     |
+     hello              |           []     []      [] []    [] []    [] []     |
+     id-utils           |                  []      [] []                []     |
+     impost             |                                               []     |
+     indent             |                  []      [] []    []       [] []     |
+     iso_3166           |              []                []    [] [] [] []     |
+     iso_3166_2         |                                                      |
+     iso_4217           |                                []    []    [] []     |
+     iso_639            |                                []    []    [] []     |
+     jpilot             |                                                      |
+     jtag               |                                   []                 |
+     jwhois             |           []     []      []                   []     |
+     kbd                |           []             []                   []     |
+     keytouch           |                                               []     |
+     keytouch-editor    |                                               []     |
+     keytouch-keyboa... |                                               []     |
+     latrine            |                          []                   []     |
+     ld                 |                                               []     |
+     leafpad            |           [] []             []    []          []  [] |
+     libc               |           []     []         []    []          []     |
+     libexif            |           []                                         |
+     libextractor       |                          []                   []     |
+     libgpewidget       |              []  []      []       [] []    [] []     |
+     libgpg-error       |           []             []                          |
+     libgphoto2         |           []                                         |
+     libgphoto2_port    |           []                []                []     |
+     libgsasl           |           []             []                [] []     |
+     libiconv           |                                      []    []        |
+     libidn             |           []                               [] ()     |
+     lifelines          |           []                                  []     |
+     lilypond           |                                                      |
+     lingoteach         |                  []                                  |
+     lynx               |                  []         []                []     |
+     m4                 |           []     []      [] []                []     |
+     mailutils          |           []             [] []                []     |
+     make               |           []     []         []                []     |
+     man-db             |                          []                   []     |
+     minicom            |           []     []      [] []                []     |
+     mysecretdiary      |                  []      [] []                []     |
+     nano               |                  []      []                   []     |
+     nano_1_0           |           []             [] []                []     |
+     opcodes            |                          []                   []     |
+     parted             |           []                                         |
+     pilot-qof          |                                               []     |
+     psmisc             |           []                                  []     |
+     pwdutils           |           []                                  []     |
+     python             |                                                      |
+     qof                |                  []                           []     |
+     radius             |           []                []                       |
+     recode             |           [] []  []      [] []       []       []     |
+     rpm                |           [] []             []                []     |
+     screem             |                                                      |
+     scrollkeeper       |           []             [] []    []    [] [] []     |
+     sed                |           [] []  []      [] []    [] []    [] []     |
+     sh-utils           |                             []       []    []        |
+     shared-mime-info   |              []  []                     [] [] []     |
+     sharutils          |           []                []             [] []     |
+     shishi             |           []                                         |
+     silky              |                                   []                 |
+     skencil            |              []  []                           []     |
+     sketch             |              []  []                           []     |
+     solfege            |                                               []     |
+     soundtracker       |                                   []          []     |
+     sp                 |                                                      |
+     stardict           |                             []    []          []     |
+     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
+     tar                |           []             [] []       []       []     |
+     texinfo            |           []             [] []                []     |
+     textutils          |                             []       []       []     |
+     tin                |                             ()                       |
+     tp-robot           |                             []                       |
+     tuxpaint           |              []                      [] [] [] []     |
+     unicode-han-tra... |                                                      |
+     unicode-transla... |                                                      |
+     util-linux         |                  []         []       []       []     |
+     vorbis-tools       |                          [] []                       |
+     wastesedge         |                                                      |
+     wdiff              |           []     []      [] []    []          []     |
+     wget               |              []             []    []          []     |
+     xchat              |        []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                                      []       []     |
+     xpad               |                                   [] []       []     |
+                        +------------------------------------------------------+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0   2  3 58 30  54    5 73 72  4 40 46 11 50 128  2
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     GNUnet             |                    []                             |  2
+     a2ps               |          [] []     []                             | 19
+     aegis              |                                                   |  0
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 15
+     bash               |                    []                             | 11
+     batchelor          |          []        []                             |  9
+     bfd                |                                                   |  1
+     bibshelf           |                    []                             |  7
+     binutils           |          []        []                     []      |  9
+     bison              |          []        []                     []      | 19
+     bison-runtime      |                    []         []          []      | 15
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  5
+     clisp              |                                                   |  6
+     console-tools      |          []        []                             |  5
+     coreutils          |          []        []                             | 16
+     cpio               |          [] []     []                             |  9
+     cpplib             |          []        []         []          []      | 11
+     cryptonit          |                                                   |  5
+     darkstat           |                    []         ()          ()      | 15
+     dialog             |          [] []     []         []          []      | 30
+     diffutils          |          []        []         []          []      | 28
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     error              |          []        []         []          []      | 18
+     fetchmail          |          []        []                             | 12
+     fileutils          |          []                   []          []      | 18
+     findutils          |          []        []                     []      | 17
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  9
+     gas                |          []                                       |  3
+     gawk               |          []        []                             | 15
+     gbiff              |                    []                             |  5
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  6
+     gettext-examples   |          [] []     []         []    []    []      | 27
+     gettext-runtime    |          [] []     []         []    []    []      | 28
+     gettext-tools      |          [] []     []         []          []      | 19
+     gimp-print         |             []     []                             | 12
+     gip                |                    []                     []      | 12
+     gliv               |          []        []                             |  8
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 15
+     gnubiff            |                    []                             |  1
+     gnucash            |          ()                                       |  2
+     gnucash-glossary   |                    []                     []      |  9
+     gnuedu             |                    []                             |  2
+     gnulib             |          [] []     []         []          []      | 28
+     gnunet-gtk         |                                                   |  1
+     gnutls             |                                                   |  2
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []                             |  3
+     gpe-clock          |          []        []  []     []                  | 21
+     gpe-conf           |                    []         []                  | 14
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []                 []      | 20
+     gpe-filemanager    |                    []                             |  6
+     gpe-go             |          []        []                             | 15
+     gpe-login          |          []        []  []     []          []      | 21
+     gpe-ownerinfo      |          []        []         []          []      | 21
+     gpe-package        |                    []                             |  6
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []         []                  | 20
+     gpe-taskmanager    |          []        []         []                  | 20
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 21
+     gpe-todo           |                    []                             |  7
+     gphoto2            |             []     []         []          []      | 20
+     gprof              |          []        []                             | 11
+     gpsdrive           |                                                   |  4
+     gramadoir          |                    []                             |  7
+     grep               |          [] []     []                     []      | 34
+     gretl              |                                                   |  4
+     gsasl              |                    []         []                  |  8
+     gss                |                    []                             |  5
+     gst-plugins        |             []     []                     []      | 15
+     gst-plugins-base   |             []     []         []                  |  9
+     gst-plugins-good   |             []     []         []    []    []      | 20
+     gstreamer          |          [] []     []                             | 17
+     gtick              |                    []                             |  3
+     gtkam              |                    []                             | 13
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 26
+     gutenprint         |                                                   |  3
+     hello              |          [] []     []         []          []      | 37
+     id-utils           |          []        []                             | 14
+     impost             |                    []                             |  4
+     indent             |          []        []         []          []      | 25
+     iso_3166           |       [] []        []               []            | 16
+     iso_3166_2         |                                                   |  2
+     iso_4217           |          []        []                             | 14
+     iso_639            |                    []                             | 14
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          []        []                             | 12
+     keytouch           |                    []                             |  4
+     keytouch-editor    |                                                   |  2
+     keytouch-keyboa... |                    []                             |  3
+     latrine            |          []        []                             |  8
+     ld                 |          []        []         []          []      |  8
+     leafpad            |          []        []         []          []      | 23
+     libc               |          []                   []          []      | 23
+     libexif            |                    []                             |  4
+     libextractor       |                    []                             |  5
+     libgpewidget       |                    []  []     []                  | 19
+     libgpg-error       |                    []                             |  4
+     libgphoto2         |             []                                    |  8
+     libgphoto2_port    |             []     []                     []      | 11
+     libgsasl           |                    []                             |  8
+     libiconv           |                    []                             |  7
+     libidn             |                    []         []                  | 10
+     lifelines          |                                                   |  4
+     lilypond           |                                                   |  2
+     lingoteach         |                    []                             |  6
+     lynx               |          [] []     []                             | 15
+     m4                 |                    []         []          []      | 18
+     mailutils          |             []                                    |  8
+     make               |          []        []         []                  | 20
+     man-db             |                    []                             |  6
+     minicom            |                    []                             | 14
+     mysecretdiary      |          []        []                             | 12
+     nano               |                    []                     []      | 17
+     nano_1_0           |          [] []     []                             | 18
+     opcodes            |          []        []                             | 10
+     parted             |          [] []                            []      | 10
+     pilot-qof          |                    []                             |  3
+     psmisc             |                    []                             | 10
+     pwdutils           |                    []                             |  3
+     python             |                                                   |  0
+     qof                |                    []                             |  4
+     radius             |             []                                    |  6
+     recode             |          []        []         []                  | 25
+     rpm                |          [] []     []                     []      | 14
+     screem             |                    []                             |  2
+     scrollkeeper       |          [] []     []                     []      | 26
+     sed                |          []        []                     []      | 22
+     sh-utils           |          []                                       | 15
+     shared-mime-info   |             []     []         []          []      | 24
+     sharutils          |          []        []                     []      | 23
+     shishi             |                                                   |  1
+     silky              |                    []                             |  4
+     skencil            |                    []                             |  7
+     sketch             |                                                   |  6
+     solfege            |                                                   |  2
+     soundtracker       |          []        []                             |  9
+     sp                 |          []                                       |  3
+     stardict           |             []     []         []          []      | 11
+     system-tools-ba... |    []    [] []     []     []  []          []      | 37
+     tar                |          [] []     []                     []      | 20
+     texinfo            |          []        []         []                  | 15
+     textutils          |          []                   []          []      | 17
+     tin                |                                                   |  1
+     tp-robot           |                    []         []          []      | 10
+     tuxpaint           |                    []  []                 []      | 16
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux         |          [] []     []                             | 20
+     vorbis-tools       |             []     []                             | 11
+     wastesedge         |                                                   |  1
+     wdiff              |          []        []                             | 22
+     wget               |          []        []                     []      | 19
+     xchat              |             []     []         []          []      | 29
+     xkeyboard-config   |          [] []     []                     []      | 11
+     xpad               |                    []         []          []      | 14
+                        +---------------------------------------------------+
+       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+      170 domains          0  1  1 77 39  0  136 10  1  48     5    54    0  2028
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -960,7 +1075,7 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If April 2005 seems to be old, you may fetch a more recent copy of
+   If October 2006 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
diff --git a/AUTHORS b/AUTHORS
index c6e25079..fa9e7fe1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,8 @@
-Wed Feb 16 10:06:17 IST 2000
+  Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+  
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
 
 Gawk was written by Paul Rubin, and finished by Paul Finlason and
 Richard Stallman.
diff --git a/COPYING b/COPYING
index 623b6258..94a9ed02 100644..100755
--- a/COPYING
+++ b/COPYING
@@ -1,285 +1,626 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/ChangeLog b/ChangeLog
index b29963d7..a9701918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,768 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Sun Oct 14 23:19:12 2007  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am: Avoid GNU make-specific `make -C'.
+
+Sun Oct 14 19:37:01 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* configure.ac: Add check for `atexit', needed by replacement
+	version of `snprintf'.
+
+Sun Sep 30 21:50:59 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Rationalize locale's influence on %'g, strtonum, and input.
+
+	* awk.h (use_lc_numeric): Add declaration.
+	* builtin.c (format_tree): Add check for quote_flag and set
+	LC_NUMERIC so that The Right Thing gets done, then reset it.
+	(do_strtonum): Pass use_lc_numeric as second arg to isnondecimal.
+	* main.c (main): Have do_posix set use_lc_numeric also.
+
+Thu Sep 27 21:36:23 2007  Stepan Kasal       <skasal@redhat.com>
+
+	* configure.ac: Do not instantiate version.c; remove the hack
+	to keep version.c from being removed upon `make distclean'.
+	* Makefile.am (version.c): New rule.
+	(.c.i, SUFFIXES): Remove, `.i' is unused.
+	(MAINTAINERCLEANFILES): Remove awkgram.c; Automake takes care of that.
+
+Wed Sep 26 14:40:13 2007  Eli Zaretskii      <eliz@gnu.org>
+
+	* builtin.c (format_tree): Handle non-standard snprintf that
+	returns a negative value when the buffer is too small.
+
+Tue Sep 25 23:27:41 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* ChangeLog: Removed all leading spaces. Fixed up formatting of
+	entries to have capital letter after the colon. Fixed a number of
+	entries to have the '*' in the right place. ASCII instead of ascii.
+	Capitalize Linux. (Is this anal-retentive or what? Sheesh.)
+
+Tue Sep 25 08:24:11 2007  KIMURA Koichi      <kimura.koichi@canon.co.jp>
+
+	* awk.h: Add include of <io.h> for Visual Studio.
+	* regex_internal.h: Do the right thing for replacing alloca.
+
+Sat Sep 22 23:26:27 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* field.c (set_FIELDWIDTHS): Restore behavior of 3.1.4 that allowed
+	FIELDWIDTHS to be "" without crashing, and such a value has NF = 0.
+	Yet Another Dark Corner. Thanks to Glenn Zazulia <gnu@t1.zazu.com>
+	for pointing out the problem.
+
+	Unrelated:
+
+	* builtin.c (format_free): Make `quote_flag' not sticky. Thanks to
+	Ulrich Drepper for pointing this out.
+	* main.c (main): Adjust calls to `setlocale' and `localeconv' so that
+	the %'d flag will work even if not using the locale's decimal point.
+
+Thu Sep 20 21:02:41 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* array.c (hash, awk_hash, gst_hash_string): Add fourth argument
+	pointer to retrieve code. Only assign a value if not NULL.
+	Fix most places to pass NULL for fourth argument.
+	(assoc_lookup): Save the code in the node for use in growing the
+	array later.
+	(grow_table): Use the saved code instead of recomputing each time.
+	* awk.h (NODE hash): Add `code' member and `ahcode' macro.
+	(hash): Revise declaration.
+	* awkgram.y: Revise calls to `hash'.
+
+Tue Aug 21 17:47:07 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* main.c (copyleft): Cite version 3 of the license.
+	* dfa.c: Minor edits to sync with grep 2.5.3.
+
+Sat Aug 11 22:48:11 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* COPYING: Replaced with GPL 3.
+	* All other relevent files: Upgraded to GPL 3.
+
+Fri Aug  3 15:01:38 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* builtin.c (format_tree): Free `obuf' before call to `fatal'
+	to keep valgrind happy.
+
+Mon Jun  4 01:12:21 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* All relevant files: Updated copyright year to 2007.
+
+Mon May 28 08:06:15 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* main.c (use_lc_numeric): New variable, true for new
+	option `--use-lc-numeric'.
+	(optab): Add option "use-lc-numeric".
+	(usage): Add to usage message.
+	(main): Allow the --use-lc-numeric option to also use the
+	local decimal point.
+
+Fri May 18 16:26:00 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awk.h (_TANDME_SOURCE): Add test for ! _SCO_DS for
+	SCO systems.  Thanks to John DuBois <spcecdt@armory.com>
+
+Tue May 15 13:14:04 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	General capability suggested by Michael May <mmlpz@t-online.de>.
+
+	* configure.ac: New option --disable-directories-fatal. Makes gawk
+	silently skip directories on the command line.
+	* io.c (iop_open): Add fourth parameter, pointer to flag which is set
+	to true if the file is a directory. In this case, close the fd and
+	return NULL.
+	(nextfile): Modify call to iop_open. Add logic to check for directory
+	and skip if --disable-directories-fatal was used. If the configure flag
+	was not used, then if do_traditional also skip.
+	(redirect): Modify call to iop_open and call fatal if isdir is true.
+
+Mon May  7 14:51:54 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* POSIX.STD: Updated.
+
+Wed May  2 19:29:56 2007  Stepan Kasal  <kasal@ucw.cz>
+
+	Revert precedence of concatenation and | getline.
+	From mail dated 2005-10-31.
+
+	* awkgram.y (common_exp): Move the two rules for naked regexp and
+	the rule for "(...) in arr" to ...
+	(non_post_simp_exp): ... here ...
+	(simp_exp): ... and here, respectively. Fixes test/parsefld.awk/.
+	(simp_exp_nc): New nonterminal, needed to fix the
+	precedence of concatenation over "|getline".
+	(common_exp): Can also start with simp_exp_nc.
+
+Tue May  1 19:53:11 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Work around problem with /ab{0}c/.
+	* dfa.h (struct dfa): Add member `broken'.
+	* dfa.c (dfainit): Initialize it to false.
+	(lex): Set it if `minrep == maxrep && minrep == 0'.
+	* re.c (avoid_dfa): Check flag and return TRUE if set.
+
+Tue May  1 05:34:53 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* configure.ac: Add calls to AM_LANGINFO_CODESET, and gt_LC_MESSAGES.
+	Thanks to Matthew Burgess <matthew@linuxfromscratch.org>.
+
+Sun Apr 29 22:55:12 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* regcomp.c (utf8_sb_map): Remove const if not __GNUC__ >= 3.
+	* regex_internal.h (re_dfa_t): Bracket bizarre macro call with
+	check for _LIBC.
+	Thanks to Nelson Beebe for finding both problems.
+
+Sun Apr 29 13:10:31 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* builtin.c (do_strftime): Add optional third argument to strftime()
+	which if non-zero or non-null means to use UTC.
+	* awkgram.y (tokentab): Allow three arguments to strftime.
+
+Fri Apr 27 11:44:27 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* README.cvs, bootstrap.sh: Added to CVS archive, not for
+	inclusion in tarballs.
+
+Fri Apr 20 16:48:30 2007        Pat Rankin      <rankin@pactechdata.com>
+
+	* awk.h: Move inclusion of redirect.h before HAVE_func blocks.
+
+Tue Apr 24 21:55:36 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* re.c (research): In the multibyte case, fall back to the full
+	matcher if need_start, since there are bugs in the dfa matcher
+	in some obscure cases.  Sigh.
+	* builtin.c (format_tree): When using %.0f instead of %d, assert
+	that we're not malloc-ing zero.
+
+Tue Apr 17 21:51:40 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Portability fixes for lsbcc from Nelson Beebe.
+
+	* configure.ac: Check for stddef.h header.
+	* regex.h: Use check and include header to get size_t definition.
+	* main.c: Update UPDATE_YEAR, add #ifdef for HAVE_MTRACE.
+
+Tue Apr 17 13:49:13 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* configure.ac: Add test for struct sockaddr_storage.
+	* io.c: Add macro to redefine sockaddr_storage as sockaddr.
+
+Tue Apr 17 05:45:19 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* io.c (get_a_record): Make it static, to match declaration at the
+	top of the file.  (Thank you GCC for not reporting this. Grr.)
+
+Fri Apr 13 00:29:24 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* replace.c: Only include missing/getaddrinfo.c if HAVE_SOCKETS
+	is defined. Avoids problems on VMS. Thanks to Pat Rankin.
+
+Tue Apr 10 18:53:04 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awkgram.y, builtin.c, eval.c, ext.c, field.c, io.c,
+	node.c: Added some sanity to the lint warnings, to only
+	print them once if they are syntactic or of the type where
+	they don't need to be repeated. Switch to `short' instead
+	of `int', and in general use a variable named `warned', for
+	consistency.
+
+Sun Apr  8 16:49:28 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awkgram.y: Add guard code to ifdef out "signed" for VMS. Thanks for
+	the heads-up to Pat Rankin.
+	* regcomp.c (utf8_sb_map, init_dfa): Move non-GCC code to initialize
+	this array into code, to preserve word-size independance.
+	* configure.ac: Add check for <arpa/inet.h>.
+	* io.c: Include <arpa/inet.h> if we have it, instead of keyed off
+	Tandem, needed on some Unix systems.
+	* awk.h, main.c, msg.c, awkgram.y: Move to use of CAN_USE_STDARG_H
+	instead of continuously repeating check for header and defined STDC
+	and STDC. Thanks to Pat Rankin.
+
+Fri Apr  6 15:28:09 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* builtin.c (do_length): Only print `length(array)' lint warning once.
+	* node.c (dump_wstr): Restore from being ifdef'ed out. Useful in case
+	it needs to be called from a debugger.
+	* regcomp.c (utf8_sb_map): Fix gcc-specific code.
+	* awk.h (snprintf): Add declaration in case not available on the system.
+	(Ceil, Floor): Add macros changing the name for VMS, in an attempt to
+	fix linkage problems.
+	* io.c: Simplify includes for internet headers and for getaddrinfo
+	defines.
+
+Wed Apr  4 23:38:24 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* io.c [AI_ADDRCONFIG]: Add a definition in case it's not available.
+	* main.c (usage): Add comment for translators to add translation
+	bug report address.
+
+Wed Apr  4 18:26:45 2007        Pat Rankin      <rankin@pactechdata.com>
+
+	* regexec.c (build_trtrable): Add missing #if HAVE_ALLOCA.
+
+Thu Mar 29 19:30:20 2007        Pat Rankin      <rankin@pactechdata.com>
+
+	* re.c (make_regexp): Cast casetable to RE_TRANSLATE_TYPE.
+
+Mon Mar 19 12:35:00 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Finish removing references to STRTOD_NOT_C89.
+
+	* awk.h (gawk_strtod): Use now if there is no strtod.
+	* replace.c (strtod.c): Include if there is no strtod.
+	* configure.ac [GAWK_AC_FUNC_STRTOD_C89]: Removed.
+
+Mon Mar 19 12:17:16 2007  Kimura Koichi    <kimura.koichi@canon.co.jp>
+
+	* dfa.c (dfaexec): Add check for half-width katakana characters in
+	character classes in ShiftJIS locale.
+	From mail originally sent Mon, 01 Aug 2005 09:07:55 +0900
+
+Fri Mar  9 11:53:25 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* field.c (rebuild_record): Assert that wide string is off when
+	creating new fields. Inspired by Karel Zak.
+
+Fri Mar  9 11:26:01 2007  Matthew Woehlke   <mwoehlke@tibco.com>
+
+	* io.c (get_a_record): Limit the max amount read to SSIZE_MAX. Needed
+	on Tandem systems where this amount is incredibly small.
+
+Tue Mar  6 08:17:49 2007  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* node.c (is_ieee_magic_val): Don't rely on strncasecmp; it mishandles
+	ASCII bytes in some locales.
+	(get_ieee_magic_val): Use strtod if it works, relying on our handbuilt
+	code only if it doesn't work.  This is more likely to do the right
+	thing with strings like "-nan".
+
+Tue Feb 27 20:51:29 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* configure.ac (AM_PROG_CC_STDC): Removed, per email suggestion
+	from Stepan Kasal some time ago.
+
+Tue Feb 27 20:44:07 2007  Aleksey Cheusov    <vle@gmx.net>
+
+	* awk.h: Revise checks for MEMCPY_ULONG and MEMSET_ULONG
+	for MS Interix using MSVC.
+	* configure.ac (AC_CHECK_FUNCS): Add checks for memcopy_ulong
+	and memset_ulong.
+	From mail dated Tue Aug 30 12:38:39 2005.
+
+Mon Feb 26 12:47:10 2007  Tony Leneis        <tleneis@cvrreg.com>
+
+	* dfa.c (dfacomp): Check that regexp is non-zero in length
+	also. Avoids problems with empty regex and IGNORECASE on
+	systems where `malloc(0)' returns a non-NULL pointer.
+	From mail dated Wed, 26 Oct 2005 15:42:07 -0700.
+
+Wed Feb 21 10:23:12 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* floatcomp.c (Floor, Ceil): Restore correct expression for Cray.
+	Then ifdef out the whole business, since it's likely to be obsolete.
+	Thanks to Paul Eggert.
+
+Mon Feb 19 12:28:47 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* node.c (format_val): Simplify code: always format the value
+	ourselves. Use %.0f if the value is integral.
+	* floatcomp.c (dval_out_of_range): Remove function, not needed.
+	(awknum_fraction_bits): Removed.
+	(adjust_uint): New function, defined IFF have uintmax_t.
+	* builtin.c (tmp_integer): Use adjust_uint.
+	Move include of <inttypes.h> and <stdint.h> ...
+	* awk.h: to here.
+	(awknum_fraction_bits): Removed.
+	(adjust_uint): Declare, or define as do-nothing macro.
+
+Sun Feb 18 17:43:33 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* node.c, floatcomp.c: Add include of <math.h> to get
+	correct declarations of math functions.
+	* configure.ac: If doing development, add -DYYDEBUG and also
+	-fno-builtin for GCC.
+
+Wed Feb 14 19:42:08 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Add support for special infinity and NaN values in non-POSIX
+	mode, and in POSIX mode, just call system `strtod'.
+
+	* configure.ac [GAWK_AC_FUNC_STRTOD_C89]: Comment out.
+	* node.c (is_ieee_magic_val, get_ieee_magic_val): New functions.
+	(r_force_number): Adapt logic and use new functions.
+
+Tue Feb 13 13:02:32 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Move Paul's numeric stuff to a separate file to make code cleaner.
+
+	* floatcomp.c (awknum_fraction_bits): New variable.
+	(Floor, Ceil): Functions, moved here from macros in builtin.c.
+	(dval_out_of_range): New function for checking if double is in range
+	of long.
+	(FLT_RADIX, FLT_MANT_DIG, DBL_MANT_DIG, AWKSMALL_MANT_DIG,
+	AWKNUM_MANT_DIG, AWKNUM_FRACTION_BITS): Moved here from awk.h.
+	* awk.h: Add decls of stuff now in floatcomp.c.
+	* Makefile.am[base_sources]: Add floatcomp.c.
+	* builtin.c (tmp_integer): Refer to `awknum_fraction_bits'
+	instead of AWKNUM_FRACTION_BITS.
+	* node.c (format_val): Call `dval_out_of_range' instead of
+	inline coding the test.
+
+2007-02-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* node.c (format_val): Fix bug when handling numbers close to
+	LONG_MIN and LONG_MAX.
+	* awk.h (FLT_RADIX, FLT_MANT_DIG, DBL_MANT_DIG, AWKSMALL_MANT_DIG,
+	AWKNUM_MANT_DIG, AWKNUM_FRACTION_BITS): Moved here from builtin.c.
+	* builtin.c: Move those macros to awk.h.
+	* awk.h (DBL_FRACTION_BITS): New macro.
+
+Fri Feb  9 13:40:10 2007  Matthew Woehlke    <mw_triad@users.sourceforge.net>
+
+	More Tandem fixes.
+
+	* configure.ac: Check in Tandem's zrldsrl library for dlopen.
+	* regex_internal.h: Move <alloca.h> include into ifdef.
+	* regexec.c: Bracket alloca uses. Fix GCC use of `?:'.
+
+Fri Feb  9 13:30:15 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* replace.c: Add include of snprintf.c. Ooops!
+	* configure.ac: Add check for mkstemp and tmpfile for replacement
+	snprintf.c.
+
+Tue Feb  6 14:33:51 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* node.c (format_val): Restructure a bit to remove need for and
+	use of goto.
+
+Sun Feb  4 16:35:21 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awkgram.y (field_spec, opt_incdec): New terminals.
+	(variable): Change definition of field reference to use field_spec.
+	See test/parse1.awk.
+
+Thu Feb  1 17:38:38 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* main.c: Allow YYDEBUG to enable the `-D' option, not just
+	GAWKDEBUG.
+
+Wed Jan 31 19:30:26 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* node.c (format_val): Restore my test for numeric values
+	being representable, as it includes more conditions than
+	Andrew's, pending a thorough review of undealt-with emails on
+	the topic.
+	* regexec.c (proceed_next_node): Move check for NULL to after
+	variable declarations inside initial `if'.
+
+Wed Jan 31 19:25:21 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* configure.ac (getaddrinfo): Improve test, since this function
+	can be in libsocket on some systems.
+
+Mon Jan 29 15:33:10 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* Makefile.am (valgrind): Also call new valgrind-scan target.
+
+Mon Jan 29 12:44:54 2007  Andreas Schwab  <schwab@suse.de>
+
+	* dfa.c (copytoks): Adjust index into multibyte csets when
+	copying an MBCSET token.
+
+Fri Jan 26 20:01:38 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* node.c (format_val): Test whether a numeric value is integral
+	simply by converting it to long and then back again, and checking
+	if the value matches.  That's more robust than trying to test
+	whether the floating-point value is representable as a long.
+	* builtin.c (format_tree): Fix buffer overflow bug, off-by-one errors
+	in checking snprintf return codes, and use "%.0f" to implement "%d"
+	formatting.  For octal or hex formatting, test whether the value
+	is integral by trying to convert back to floating point and seeing
+	if the value matches.  This is more robust than trying to test
+	whether the floating-point value is representable as an integer.
+
+Tue Jan 23 17:49:28 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* io.c (socketopen): Initialize socketfd to avoid "may be used
+	uninitialized" warning.
+	* regexec.c (regexec, re_search_stub): Removed unused variable `dfa'.
+	* builtin.c (wide_tolower_toupper): Fix signedness of pointer in
+	allocation calls and in call to make_str_node.
+
+Mon Jan 22 12:57:19 2007  Kimura Koichi    <kimura.koichi@canon.co.jp>
+
+	Deal with halfwidth katakana in SJIS locale inside character ranges.
+	Based on http://sources.redhat.com/bugzilla/show_bug.cgi?id=1149.
+	Changes affect non-__LIBC code only.
+
+	* regcomp.c (re_compile_fastmap_iter): Handle half-size characters.
+	* regexec.c (check_node_accept_bytes): Same.
+
+Thu Jan 18 22:19:01 2007  Karel Zak          <kzak@redhat.com>
+
+	* node.c (free_wstr): Assert that type is Node_val.
+
+Thu Jan 18 12:18:47 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* regcomp.c (re_compile_fastmap_iter): Declare `dfa' to be
+	be volatile. Fixes valgrind problem with the ignrcase test.
+	Sheesh.  Gawk should now be valgrind-clean. We hope.
+
+Mon Jan 15 14:28:04 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Use getaddrinfo instead of gethostbyname, to handle IPV6
+	format addresses. Based on patch submitted by
+	Jan Pazdziora <jpazdziora@redhat.com>.
+
+	* configure.ac: Add getaddrinfo to list of checked functions.
+	* configh.in, configure: Regenerated.
+	* io.c: Rework includes based on HAVE_GETADDRINFO.
+	(socketopen): Reworked for getaddrinfo.
+	(devopen): Modified for new socketopen.
+	* replace.c: Include getaddrinfo.c if necessary.
+
+Sun Jan 14 12:19:53 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awkgram.y: For bad name in array subscripting, build a
+	valid node anyway to avoid invalid reads reported by valgrind.
+	* dfa.c (parse_bracket_exp_mb): Remove assignment of NULL
+	to work_mbc->chars, was losing data malloc'ed earlier. Thanks
+	to valgrind.
+	(state_index): Alway initialize d->states[i].mbps elements to zero.
+	(dfafree): Free allocated d->states[i].mbps.elems if needed.
+	* regex.c: Try harder to undef alloca.
+	* regex_internal.h (__mempcpy): Undef before redefinining for
+	more recent versions of GLIBC.
+
+Sat Jan 13 22:10:43 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* node.c (str2wstr): For count of zero from mbrtowc, set count to 1
+	and fall through to code that copies. Originally from Paul Eggert.
+
+	Unrelated:
+	* configure.ac: Add call to AC_USE_SYSTEM_EXTENSIONS, should help
+	on Tandem. This lets us remove AC_AIX and AC_MINIX.
+
+	From Matthew Woehlke <mwoehlke@tibco.com> for Tandem:
+
+	* awk.h (_TANDEM_SOURCE): Also define _XOPEN_SOURCE_EXTENDED.
+	* io.c: (_TANDEM_SOURCE): Include more headers.
+
+Sat Jan 13 21:53:48 2007  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* field.c (set_FIELDWIDTHS): Avoid writing one past the end of
+	the array.
+	* node.c (r_force_number): Avoid reading uninitialized variable.
+
+Sat Jan 13 21:37:15 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (valgrind): New target based on idea from
+	Ralf Wildenhues for running valgrind on test suite.
+
+Sat Jan 13 21:24:54 2007  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de> 
+
+	Enable more `--lint-old' warnings.
+	* awkgram.y: Warning about multiple BEGIN or END rules,
+	`index in array' outside of for loops, multidimensional arrays.
+	* field.c (set_FS): Warn about regex FS.
+	* node.c (parse_escape): Warn about `\b', `\f', `\r'. 
+
+Sat Jan 13 20:56:56 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* node.c (wcasestrstr): Revert use of continue, reinstate goto.
+	Thanks to Andrew Schorr.
+	(free_wstr): Move zeroing of wsptr and wslen and clearing of flag
+	back outside the if.
+	* field.c (rebuild_record): In loop that copies fields to new record,
+	add call to `free_wstr'. This ensures that flag values are correct
+	and avoids double free later. Thanks to Karel Zak for pointing out
+	the problem.
+
+Fri Jan 12 14:01:51 2007  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* builtin.c (do_match): In addition to "gawk_mb_cur_max > 1" check,
+	check for positive string length.
+
+Fri Jan 12 13:57:20 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Sync with GLIBC. Bi-annual this time.
+
+	* regexec.c, regex.h, regex_internal.c, regcomp.c:
+	Reapply any portability patches specific to gawk.
+	* regex_internal.h (build_wcs_upper_buffer): Fix return type
+	in declaration. Reapply any portability patches specific to gawk.
+	* regex.c: Add definitions for `bool', `true' and `false'.
+	Define `alloca' to something invalid to keep it from linking
+	in case a usage of `alloca' slipped through. Reapply any portability
+	patches specific to gawk.
+
+	Base versions:
+		getopt1.c	1.10	Tue Mar  9 10:35:37 2004
+		getopt.c	1.55	Fri Mar 24 10:59:56 2006
+		getopt.h	1.21	Fri Mar 19 00:19:32 2004
+		getopt_int.h	1.1	Tue Mar  9 10:31:19 2004
+		regex.c		1.129	Fri Mar 24 10:59:57 2006
+		regexec.c	1.97	Fri Mar 24 10:59:57 2006
+		regex.h		1.40	Mon Sep 25 20:03:05 2006
+		regex_internal.c	1.67	Mon Sep 25 20:03:05 2006
+		regex_internal.h	1.73	Fri Mar 24 10:59:57 2006
+		regcomp.c	1.112	Fri Mar 24 10:59:57 2006
+
+Fri Jan 12 12:28:51 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* ABOUT-NLS, INSTALL, Makefile.in, aclocal.m4, config.guess,
+	config.rpath, config.sub, configh.in, configure, configure.ac,
+	depcomp, gettext.h, install-sh, missing, mkinstalldirs, ylwrap:
+	Updated to current autotools, Autoconf 2.61, Automake 1.10,
+	gettext 0.16.1.
+
+Thu Jan  4 18:23:50 2007  Dmitry V. Levin    <ldv@altlinux.org>
+
+	* node.c (free_wstr): Zero wstptr and wstlen only if WSTRCUR
+	flag is set.
+	(str2wstr): Replace invalid `free` call with `free_wstr' call.
+
+Thu Jan  4 16:49:21 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* builtin.c (do_match): Move freeing of wc_indices to outside if.
+	Thanks to Sven Wegener <swegener@gentoo.org> for the report.
+
+Thu Dec 21 14:32:13 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* main.c (arg_assign): Reassign the '=' only if not initing.
+	* profile.c (varname): Deleted.
+	(pp_concat): New function to print concatenations.
+	(tree_eval): Don't use `varname' anymore. Use `pp_concat'.
+
+Mon Dec 11 12:43:04 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* builtin.c (sub_common): Clear numeric flags on result
+	unconditionally.
+	* node.c (wcasestr): Replace `goto' with `continue'.
+
+Thu Nov 30 15:54:07 2006  Bruno Haible       <bruno@clisp.org>.
+
+	* builtin.c: Change use of HAVE_LC_MESSAGES to defined(LC_MESSAGES).
+	Bruno suggested only for dcngettext, I did it everywhere (ADR).
+
+Wed Sep  6 02:04:32 2006  Andrew J. Schorr   <aschorr@telemetry-investments.com>
+
+	* awkgram.y (get_src_buf): Adjust `source' and `sourceline' to
+	correctly handle mixed -f and --source options.
+
+Mon Aug 28 21:17:20 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* AUTHORS, FUTURES, LIMITATIONS, NEWS, POSIX.STD, PROBLEMS, README:
+	Added FSF copyright for no other reason than to satisfy the flunkies
+	running Savannah.
+	* Makefile.am: Removed `ansi2knr' from AUTOMAKE_OPTIONS also.
+
+Fri Aug 11 15:07:45 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* field.c (set_field, rebuild_record, set_record): Remove calls to
+	`free_wstr' since they're not needed.
+
+Sat Aug  5 22:04:24 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* node.c (unref): Call `free_wstr' for fields also. Thanks to
+	Andrew Schorr.
+
+Tue Jul  4 22:43:05 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* eval.c (interpret): Node_assign_concat case: Turn off NUMBER and
+	 NUMCUR flags in result.  Sheesh. Thanks to
+	 <Heiner.Marxen@DrB.Insel.DE> for finding the problem.
+
+Mon Jul  3 22:49:44 2006        Pat Rankin      <rankin@pactechdata.com>
+
+	* main.c (load_environ): When AWKPATH is missing from ENVIRON[],
+	  try to find it with getenv("AWKPATH") before resorting to DEFPATH.
+	  Suggested by Galen Tackett.
+
+Mon Jul  3 00:27:59 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* io.c (INTERNAL_HANDLE): New constant for use by `iop_alloc'
+	when allocating an internal IOBUF.
+	(pidopen, useropen): Use it.
+	(iop_alloc): Add check for it and just return iop.
+
+Fri Jun 23 15:48:34 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awkgram.y (subn): At end for `do_sprintf' check, verify
+	that lnode is not NULL before using it assign through.
+
+Sun Jun 18 22:27:25 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Repair internal names like /dev/user, /dev/pid, as well as /dev/fd/N,
+	which have been broken for a long time but noone noticed.
+
+	* io.c (is_internal): New macro to check for internal file like
+	`/dev/user'.
+	(spec_setup): Reduce to two parameters, allocate logic is always true.
+	Add IOP_NO_FREE to flag.
+	(pidopen, useropen): Return `IOBUF *' instead of int. Fix
+	logic to test if `iop' parameter is NULL and if so to allocate it.
+	(specfdopen,): Return `IOBUF *' instead of int. Fix
+	logic to test if `iop' parameter is NULL and if so to allocate it.
+	Don't set IOP_NO_FREE in flag.
+	(iop_open): Remove `IOBUF iob' field from `struct internal' and its use
+	and the use of `spec_setup' from the code here. Change the check in the
+	call to the open function to look for NULL.
+	(get_a_record): Use `is_internal' in initial check for filling the
+	buffer to not try to call `read' on internal files. If true, set
+	the IOP_AT_EOF in the flag and return EOF.
+
+Fri Mar 24 13:05:56 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awkgram.y (get_src_buf): Remove function argument types from
+	declaration of `readfunc' to avoid bugaboos with VMS declaration
+	of `read' system call.
+
+Fri Mar 10 06:28:23 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awk.h (free_wstr): New declaration if MBS_SUPPORT, empty macro
+	otherwise.
+	* node.c (free_wstr): New function, inside MBS_SUPPORT. Frees the wide
+	string part of a node. Provided so that it can be used consistently
+	everywhere.
+	(format_val, r_dupnode, mk_number, make_str_node, unref): Use it.
+	* builtin.c (sub_common): Call `free_wstr' instead of doing it manually.
+	* eval.c (r_tree_eval): Same in Node_assign_concat case.
+	* field.c (set_field, rebuild_record, set_record): Add calls to
+	`free_wstr'.
+
+Mon Feb 13 22:45:34 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* eval.c (r_tree_eval): Node_assign_concat. Release any
+	wide string value and reset the WSTRCUR flag. Based on
+	bug report by Karel Zak.
+
+2006-01-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* Makefile.am (awkgram.c): Use $(AWK), not awk, so that the rule
+	works on Solaris too (e.g., Solaris 10).  Problem reported by
+	Andrew J. Schorr.
+
+Mon Dec 19 05:39:46 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* node.c (format_val): Account for overlow of conversion
+	from double to long. Shows up worse on 64-bit systems.
+
+Wed Dec 14 18:57:34 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* eval.c (set_BINMODE): Fix logic of test for no numeric value.
+	Makes `gawk -v BINMODE=1 ...' work again. Thanks to Eli Zaretskii
+	<eliz@gnu.org> for pointing out the problem.
+
+Wed Oct 19 10:58:27 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* main.c (main, arg_init): Only use the locale's decimal
+	point if do_posix is set. Too many people the world over
+	have complained about this.
+
+Fri Oct  7 13:54:09 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Enhancement to fix from 23 Sept 2005, suggested by Pat Rankin.
+
+	* awkgram.y (one_line_close): New function, closes open FILE * used
+	by `read_one_line'.
+	(fp): Static FILE * used by `read_one_line' and `one_line_close'.
+	* awkgram.y (read_one_line): Simplify check for call to `fdopen'.
+	(get_src_buf): New variable `closefunc' which is a pointer to a
+	function implementing the `close' system call interface.
+
+Fri Oct  7 13:23:29 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* field.c (set_FIELDWIDTHS): Fix off-by-one error in assignment
+	of sentinel value at end of FIELDWIDTHS array.
+
+Fri Sep 23 16:05:13 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awkgram.y (read_one_line): New function, mainly for debugging,
+	that reads one line of data at a time to pass back as a buffer.
+	Emulates the variable-length record filesystem of VMS, where
+	we first saw the problem fixed here.
+	(get_src_buf): New variable `readfunc' which is a pointer to a
+	function implementing the `read' system call interface. Based on
+	an environment variable, use `read_one_line' instead of `read'
+	for testing.   Make the test for expanding the buffer smarter,
+	so that it doesn't grow unnecessarily.
+
+	Thanks to Galen Tackett (tackett_galen@bah.com) for reporting
+	the problem and to Anders Wallin and Pat Rankin for help
+	tracing and reproducing the problem and testing the fix.
+
+Fri Sep  9 15:06:07 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* hard-locale.h (xmalloc): Move declaration to file scope
+	for non-glibc systems and gcc 4. Thanks to Kito Danya Dietrich
+	<kito@gentoo.org>.
+
+Thu Aug 25 22:40:40 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* regcomp.c (build_range_exp): Avoid `btowc' for single-byte
+	characters. Fedora Core 2, maybe others, have a broken version
+	that can't handle values > 127.
+
+Fri Aug 19 16:13:28 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* regexec.c (proceed_next_node): Added a band-aid check at the
+	top of the first `if' to make sure that `mctx->state_log[*pidx]'
+	isn't NULL.
+
+Fri Aug 12 13:10:33 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* io.c (iop_alloc): Only free `iop' if it was malloc'ed in
+	the first place.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
@@ -13,8 +778,9 @@ Wed Jul  6 17:09:02 2005  Arnold D. Robbins  <arnold@skeeve.com>
 	* io.c (do_index): Remove unused variables `mbclen', `mbs1' and `mbs2'.
 	* node.c (wstrstr): Remove unsed variable `j'.
 	(dump_wstr): `#ifdef' out, not currently needed.
-	* eval.c (op_assign): Move decl of `t1' and `t2' into a separate block for
-	the `! HAVE_FMOD' case. Keeps the compiler quiet. Similar for `ltemp'.
+	* eval.c (op_assign): Move decl of `t1' and `t2' into a separate block
+	for the `! HAVE_FMOD' case. Keeps the compiler quiet. Similar for
+	`ltemp'.
 
 Wed Jul  6 16:51:31 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -44,10 +810,10 @@ Mon Jul  4 09:38:29 2005  Arnold D. Robbins  <arnold@skeeve.com>
 	More multibyte fixes from Kimura Koichi, <kimura.koichi@canon.co.jp>.
 
 	* node.c (format_val, r_dupnode): Spell `wstptr' correctly.
-	* regex_internal.c (build_wcs_upper_buffer): Label `offsets_needed' should not
-	be inside `#ifdef _LIBC'.
-	* regcomp.c (build_charclass): Fix declaration of `class_name' in prototype to
-	not be unsigned.
+	* regex_internal.c (build_wcs_upper_buffer): Label `offsets_needed'
+	should not be inside `#ifdef _LIBC'.
+	* regcomp.c (build_charclass): Fix declaration of `class_name' in
+	prototype to not be unsigned.
 
 Thu Jun 30 11:52:34 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -75,9 +841,9 @@ Wed Jun 15 22:12:15 2005  Arnold D. Robbins    <arnold@skeeve.com>
 Wed Jun 15 21:59:54 2005  Arnold D. Robbins    <arnold@skeeve.com>
 
 	* node.c (make_str_node): If working with multibyte characters, while
-	parsing string constants, keep multibyte characters together. This avoids
-	problems in cases where one of the bytes is backslash. Initial patch
-	supplied by Kimura Koichi, <kimura.koichi@canon.co.jp>.
+	parsing string constants, keep multibyte characters together. This
+	avoids problems in cases where one of the bytes is backslash. Initial
+	patch supplied by Kimura Koichi, <kimura.koichi@canon.co.jp>.
 
 Tue Jun 14 21:50:37 2005  Andrew J. Schorr     <ajschorr@users.sourceforge.net>
 
@@ -101,7 +867,8 @@ Thu Jun  2 20:55:27 2005  Arnold D. Robbins    <arnold@skeeve.com>
 
 	From: Benno Schulenberg <benno@nietvergeten.nl>
 
-	* eval.c (func_call): Take message out of gettext call since it's for debugging.
+	* eval.c (func_call): Take message out of gettext call since it's for
+	debugging.
 	* ext.c (get_actual_argument): Fix formatting of message.
 
 Wed May 25 09:19:37 2005  Arnold D. Robbins    <arnold@skeeve.com>
@@ -147,8 +914,8 @@ Wed May 11 11:42:06 2005  Arnold D. Robbins    <arnold@skeeve.com>
 	Straighten out mess with `isblank' which is C99 <ctype.h> function.
 
 	* configure.ac: Remove check for `isblank' in call to AC_CHECK_FUNCS.
-	* regex_internal.h: #ifdef out definition of `isblank' and provide `is_blank'
-	function a la dfa.c.
+	* regex_internal.h: #ifdef out definition of `isblank' and provide
+	`is_blank' function a la dfa.c.
 	* field.c: Ditto.
 	* regcomp.c: #ifdef use of `isblank' and add `is_blank' use instead.
 
@@ -197,7 +964,7 @@ Thu Apr 28 23:40:02 2005  Stepan Kasal  <kasal@ucw.cz>
 
 	* configure.ac (PRINTF_HAS_F_FORMAT): Some cosmetic changes.
 	(custom.h): Don't cat custom.h at the end of config.h; instead, use
-	  AH_BOTTOM([#include "custom.h"])
+	AH_BOTTOM([#include "custom.h"])
 	* awklib/Makefile.am (AM_CPPFLAGS): Add $(top_srcdir) so that
 	  custom.h can be found.
 
@@ -231,9 +998,9 @@ Thu Apr 28 19:12:03 2005  Arnold D. Robbins    <arnold@skeeve.com>
 
 Thu Apr 28 18:16:09 2005  Andrew J. Schorr     <ajschorr@users.sourceforge.net>
 
-	* awk.h (IOBUF): Add new fields `opaque', `get_record', and `close_func',
-	to support insertion of an alternate input processor.  This is used
-	by the XML extension.
+	* awk.h (IOBUF): Add new fields `opaque', `get_record', and
+	*close_func', to support insertion of an alternate input processor.
+	This is used by the XML extension.
 	(register_deferred_variable, register_open_hook, update_ERRNO_saved):
 	Declare new functions.
 	(load_environ, load_procinfo): Remove declarations -- these functions
@@ -348,7 +1115,7 @@ Wed Feb 16 20:43:07 2005   Pat Rankin    <rankin@pactechdata.com>
 	* awk.h "mbsupport.h": Suppress inclusion if NO_MBSUPPORT is defined.
 	* regex.h <sys/types.h>: Guard inclusion with HAVE_SYS_TYPES_H.
 	* regex.c <sys/types.h>: Likewise.
-	* random.c "random.h": include this first to get config.h setup.
+	* random.c "random.h": Include this first to get config.h setup.
 	  <fcntl.h>: Guard inclusion with HAVE_FCNTL_H.
 	  <unistd.h>: Guard inclusion with HAVE_UNISTD_H.
 	* io.c [#if defined(MSDOS) ||... defined(__CYGWIN__)]: Splice the
@@ -847,14 +1614,14 @@ Wed Jul 14 16:00:51 2004  John Haque  <mary1john8@earthlink.net>
 Thu Jul  8 16:59:51 2004  Stepan Kasal  <kasal@ucw.cz>
 
 	* awkgram.y (output_redir): Make sure not to dereference NULL
-          pointer.  The bug was triggered by the following code:
+	  pointer.  The bug was triggered by the following code:
 
-                gawk 'BEGIN{print "date" |& getline}'
+		gawk 'BEGIN{print "date" |& getline}'
 
-        No test case created, beacuse of the following:
-        Correct interpretation involves executing "1" or "0" -- as the user
-        may have defined this, we would have to override this in the test
-        script.  It's not worth the hassle.
+	No test case created, beacuse of the following:
+	Correct interpretation involves executing "1" or "0" -- as the user
+	may have defined this, we would have to override this in the test
+	script.  It's not worth the hassle.
 
 Thu Jul  8 12:59:49 2004  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -890,8 +1657,8 @@ Mon Jun 14 14:01:16 2004  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* awk.h (check_special, get_curfunc_parm_count, get_actual_argument):
 	new function declarations.
-	(get_scalar_argument, get_array_argument): new macros.
-	* awkgram.y (check_special): new function.
+	(get_scalar_argument, get_array_argument): New macros.
+	* awkgram.y (check_special): New function.
 	(yylex): Use `check_special' to search `tokentab'.
 	(dump_funcs): Always count functions, in order to get dynamic ones.
 	Removed bogus use of `static' on `tab' variable.
@@ -974,9 +1741,9 @@ Tue Jun  1 19:23:53 2004  Stepan Kasal  <kasal@ucw.cz>
 
 	* Makefile.am (base_sources): Don't mention version.c, so that
 	it doesn't get distributed.
-	* po/POTFILES.in: remove version.c
+	* po/POTFILES.in: Remove version.c
 	* configure.ac: Create version.i from version.in.
-	* main.c: include version.i.
+	* main.c: Include version.i.
 
 Tue Jun  1 18:33:32 2004  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -1197,7 +1964,7 @@ Thu Feb 12 02:05:34 2004  Stepan Kasal  <kasal@ucw.cz>
 	so that it applies to the current source.
 	* posix/gawkmisc.c: Change a tab to a space (needed for the above).
 
-        Make version control more in the style of current autotools:
+	Make version control more in the style of current autotools:
 
 	* configure.ac: Remove obsolete versions of macros:
 	AM_INIT_AUTOMAKE doesn't need any parameters.
@@ -1335,7 +2102,7 @@ Wed Jan 14 14:26:36 2004  Arnold D. Robbins  <arnold@skeeve.com>
 	(parse_bracket_exp): Use NON_MATCH variable in
 	addition to "mbcset->non_match", not as an
 	alternative.
-	(build_charclass_op): rename NOT parameter to
+	(build_charclass_op): Rename NOT parameter to
 	NON_MATCH, use it instead of declaring a variable. 
 	(parse_bracket_exp) [!_LIBC]: Pass NULL for MBCSET
 	if the character set is single-byte.
@@ -1574,7 +2341,7 @@ Fri Jul 11 09:32:21 2003  Arnold D. Robbins  <arnold@skeeve.com>
 2003-07-10  Paul Eggert  <eggert@twinsun.com>
 
 	* io.c (two_way_open): If /bin/sh cannot be executed, exit
-        with status 126 consistently.
+	with status 126 consistently.
 
 Mon Jul  7 11:01:43 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -1626,15 +2393,15 @@ Mon Jun 23 15:13:39 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
 2003-06-20  Stepan Kasal  <kasal@ucw.cz>
 
-	* eval.c (comp_func): if memcmp returns 0, we have to compare
+	* eval.c (comp_func): If memcmp returns 0, we have to compare
 	  the lengths.
 
 2003-06-19  Stepan Kasal  <kasal@ucw.cz>
 
-        * eval.c (interpret) <Node_K_arrayfor>: use NULL, not 0, to
-          initialize the variable list.
-          (comp_func): array indices no longer are string values,
-          you have to use ahname_str, ahname_len.
+	* eval.c (interpret) <Node_K_arrayfor>: Use NULL, not 0, to
+	  initialize the variable list.
+	  (comp_func): Array indices no longer are string values,
+	  you have to use ahname_str, ahname_len.
 
 Tue Jun 17 11:53:46 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -1643,8 +2410,8 @@ Tue Jun 17 11:53:46 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
 2003-06-17  Stepan Kasal  <kasal@ucw.cz>
 
-        * array.c (get_actual): even if canfatal is FALSE, don't
-          tolerate existence of things which can't happen.
+	* array.c (get_actual): Even if canfatal is FALSE, don't
+	  tolerate existence of things which can't happen.
 
 Mon Jun 16 16:21:44 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -1665,14 +2432,14 @@ Sun Jun 15 20:45:43 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
 2003-06-10  Stepan Kasal  <kasal@ucw.cz>
 
-	* awkgram.y (release_all_vars): do not try to release a value of
+	* awkgram.y (release_all_vars): Do not try to release a value of
 	  Node_var_new; after get_lhs, use the lhs directly, do not try
 	  to do (*lhs)->var_value; the Node_var case doesn't need
 	  special treatment.
 	* builtin.c (do_match): `get_param' is successful iff it returns
 	  Node_var_array---if the variable was new, get_param has already
 	  changed the type.
-	* field.c (do_split): likewise.
+	* field.c (do_split): Likewise.
 
 Sun Jun 15 19:36:35 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -1732,29 +2499,29 @@ Mon Jun  9 11:46:21 2003  Arnold D. Robbins  <arnold@skeeve.com>
 Wed May 28 08:31:23 CEST 2003  Stepan Kasal  <kasal@math.cas.cz>
 
 	* eval.c (forloops_active, in_function): Nuked.
-	(pop_all_forloops, pop_fcall_stack): are now inline.
+	(pop_all_forloops, pop_fcall_stack): Are now inline.
 
 Wed May 28 07:58:35 2003  Stepan Kasal  <kasal@math.cas.cz>
 
-	* field.c, awk.h (Null_field): no longer static.
-	* field.c (init_fields): initial value of $0 can be Nnull_string,
+	* field.c, awk.h (Null_field): No longer static.
+	* field.c (init_fields): Initial value of $0 can be Nnull_string,
 	  no need to copy it.
-	* eval.c (r_get_lhs) <Node_field_spec>: test for uninitialized field,
+	* eval.c (r_get_lhs) <Node_field_spec>: Test for uninitialized field,
 	  which is Nnull_string for $0 and Null_field for $(>0).
-	* builtin.c (do_print_rec): test for uninitialized $0.
+	* builtin.c (do_print_rec): Test for uninitialized $0.
 
 Tue May 27 17:03:02 2003  Stepan Kasal  <kasal@math.cas.cz>
 
 	* awk.h (Node_var_new): New node type for variables which can be
 	either scalar or array.  From now on, Node_var is always scalar.
 	(Node_gvar_ref): Nuked, its role can be taken by Node_array_ref.
-	(orig_var): removed, orig_array is enough.
+	(orig_var): Removed, orig_array is enough.
 	(SCALAR, UNINITIALIZED): Flags nuked.
-	(var_uninitialized): new macro to distinguish uninitialized vars;
+	(var_uninitialized): New macro to distinguish uninitialized vars;
 	used in several other macros.
-	* array.c (r_get_array, array_vname, do_adump): adapt to the
+	* array.c (r_get_array, array_vname, do_adump): Adapt to the
 	above changes.
-	* awkgram.y, eval.c, field.c, main.c, node.c, profile.c: ditto.
+	* awkgram.y, eval.c, field.c, main.c, node.c, profile.c: Ditto.
 
 Tue May 27 14:27:50 2003  Stepan Kasal  <kasal@math.cas.cz>
 
@@ -1767,9 +2534,9 @@ Tue May 27 14:27:50 2003  Stepan Kasal  <kasal@math.cas.cz>
 	* awk.h (get_array, r_get_array): Declare the new function and define
 	a macro to speed it up.
 	* builtin.c (do_match): Use get_array.
-	* eval.c (interpret) <Node_K_arrayfor>: ditto.
-	(r_get_lhs) <Node_K_arrayfor>: ditto.
-	* field.c (do_split): ditto.
+	* eval.c (interpret) <Node_K_arrayfor>: Ditto.
+	(r_get_lhs) <Node_K_arrayfor>: Ditto.
+	* field.c (do_split): Ditto.
 
 Tue May 27 08:23:51 2003  Stepan Kasal  <kasal@math.cas.cz>
 
@@ -1786,7 +2553,7 @@ Tue May 27 08:23:51 2003  Stepan Kasal  <kasal@math.cas.cz>
 
 Sun Jun  8 11:25:36 2003  Stepan Kasal  <kasal@ucw.cz>
 
-	* awkgram.y (append_right): when using savetail, remember that it
+	* awkgram.y (append_right): When using savetail, remember that it
 	is not necessarily the tail of the list---it's just a pointer to
 	the last chunk appended.
 
@@ -1816,7 +2583,7 @@ Wed May 28 11:55:48 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
 Wed May 28 11:38:59 2003  Stepan Kasal  <kasal@math.cas.cz>
 
-	* awkgram.y (switch_body): remove rule ``switch_body:/*empty/''
+	* awkgram.y (switch_body): Remove rule ``switch_body:/*empty/''
 	as ``switch_body:case_statements'' covers it---this disambiguation
 	fixes a reduce/reduce conflict.
 
@@ -1832,7 +2599,7 @@ Sun May 25 15:19:19 2003  Stepan Kasal  <kasal@math.cas.cz>
 	bit was set or not.  We were silly slowing down most of the
 	assignements.
 
-	* (get_a_record): after grow_iop_buffer, move recm.rt_start even
+	* (get_a_record): After grow_iop_buffer, move recm.rt_start even
 	if recm.len == 0.
 
 Mon May 19 16:55:59 2003  Arnold D. Robbins  <arnold@skeeve.com>
@@ -1868,11 +2635,11 @@ Wed May 14 09:01:16 2003  Stepan Kasal  <kasal@math.cas.cz>
 
 	Misc patches:
 
-	* builtin.c (do_match): if third parameter to `match' is supplied,
+	* builtin.c (do_match): If third parameter to `match' is supplied,
 	store all subexpressions which are applicable, even though there
 	are some unused between them.
 
-	* awkgram.y (yylex): when returning from unterminated REGEXP
+	* awkgram.y (yylex): When returning from unterminated REGEXP
 	(which is /* kludge */), take care to fake a yylval, to
 	prevent ``internal error'' later.
 
@@ -1880,7 +2647,7 @@ Sun May 11 15:51:00 2003  Stepan Kasal  <kasal@math.cas.cz>
 
 	* io.c (rsnullscan, get_a_record): Boundary condition bug fixes.
 
-Sun May 11 15:15:20 IDT 2003  Scott Deifik  <scottd@amgen.com>
+Sun May 11 15:15:20 2003  Scott Deifik  <scottd@amgen.com>
 
 	* awk.h: Add decls for `memcpy_ulong', `memset_ulong', and
 	MSC defines.
@@ -1965,10 +2732,10 @@ Sun Apr 13 16:02:10 2003  Arnold D. Robbins  <arnold@skeeve.com>
 	* m4/uintmax_t.m4, m4/ulonglong.m4: Remove; superseded by the above
 	new m4 files.
 
-        * builtin.c (BITS_PER_BYTE): Remove; use CHAR_BIT instead, since
-        it's the standard name.
-        (do_lshift, do_rshift): Complain if the shift width is exactly equal
-        to the word size, too.
+	* builtin.c (BITS_PER_BYTE): Remove; use CHAR_BIT instead, since
+	it's the standard name.
+	(do_lshift, do_rshift): Complain if the shift width is exactly equal
+	to the word size, too.
 
 Thu Mar 27 10:44:11 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -2018,7 +2785,7 @@ Wed Mar 19 14:08:11 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
 Wed Mar 19 13:45:50 2003  Corinna Vinschen  <vinschen@redhat.com>
 
-	* regex.c [RE_ENBABLE_I18N]: remove definition; the one in
+	* regex.c [RE_ENBABLE_I18N]: Remove definition; the one in
 	regex_internal.h is better and makes things work with Cygwin.
 
 Tue Mar 11 11:54:20 2003  Arnold D. Robbins  <arnold@skeeve.com>
@@ -2193,21 +2960,21 @@ Sun Feb  2 15:32:42 2003  Stepan Kasal  <kasal@math.cas.cz>
 
 	ADR: More grammar rationalization/repair from Stepan.
 
-	* awkgram.y (common_exp, simp_exp): the rule from getline (without
+	* awkgram.y (common_exp, simp_exp): The rule from getline (without
 	  pipe) has been moved from common_exp to simp_exp.
 
 	The redirection of print statements reworked.  The idea comes from
 	mawk-1.3.3; much thanks to Michael Brennan!
 
-	* awkgram.y (IO_OUT, IO_IN): new tokens.
-	  (APPEND_OP, TWOWAYIO): swallowed by the above ones.
-	  (in_print, in_parens): new static variables, to trace whether
+	* awkgram.y (IO_OUT, IO_IN): New tokens.
+	  (APPEND_OP, TWOWAYIO): Swallowed by the above ones.
+	  (in_print, in_parens): New static variables, to trace whether
 	  IO_OUT is expected.
-	  (yylex): emit the new tokens, update in_parens on '(' and ')'.
-	  (exp): the print command(s) reworked.
-	  (oputput_redir): reworked.
-	  (print_expression_list): new non-terminal.
-	  (rexp, rexpression_list opt_rexpression_list): nuked.
+	  (yylex): Emit the new tokens, update in_parens on '(' and ')'.
+	  (exp): The print command(s) reworked.
+	  (oputput_redir): Reworked.
+	  (print_expression_list): New non-terminal.
+	  (rexp, rexpression_list opt_rexpression_list): Nuked.
 	  (exp, simp_exp): ``cmd|getline'' rule changed to
 	  ``cmd IO_IN getline'' and moved from exp to simp_exp.
 
@@ -2234,16 +3001,16 @@ Thu Jan 30 17:42:05 2003  Stepan Kasal  <kasal@math.cas.cz>
 	  (shadow_funcs): ... which will enable us to end the program if
 	  lintfunc is fatal.
 	  (program): Cleanup of the rules defining the ``program'' non-terminal.
-	  (start, program, rule): no value associated,
+	  (start, program, rule): No value associated,
 	  expression_value is now treated similarily as begin_block and end_block.
-	  (pattern, rule): bison actions for non-terminal `pattern' now
+	  (pattern, rule): Bison actions for non-terminal `pattern' now
 	  add a new rule to the appropriate Node_rule_list, action for
 	  non-terminal `rule' now only adds the associated code block
 	  to the rnode of Node_rule_node.
-	  (io_allowed): renamed to !begin_or_end_rule.
+	  (io_allowed): Renamed to !begin_or_end_rule.
 	  (append_pattern): New function, adds new Node_rule_node to a rule_list.
 	  (mkrangenode): Deleted, this tiny function was called only once.
-	  (function_body): non-terminal replaced by `action'.
+	  (function_body): Non-terminal replaced by `action'.
 	  (statements, action, statement): `statements' can now be empty;
 	  both callers had to accomodate to this.
 	  (statements): Don't call isnoeffect($2->type) if
@@ -2276,7 +3043,7 @@ Sun Jan 26 11:52:01 2003  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* awk.h [NUMSUBPATS]: New macro.
 	* builtin.c (do_match): Use it in loop that fills in subpattern info.
-	* eval.c (r_tree_eval): for Node_assign, don't call free_temp(),
+	* eval.c (r_tree_eval): For Node_assign, don't call free_temp(),
 	  as assign_val() contains dupnode(), which would clear the TEMP
 	  flag. From Stepan Kasal <kasal@math.cas.cz>.
 	* config.sub: Updated from prep.
@@ -2375,21 +3142,21 @@ Mon Dec  9 14:20:42 2002  Stepan Kasal  <kasal@math.cas.cz>
 
 Wed Nov 27 06:04:20 2002  Pat Rankin  <rankin@pactechdata.com>
 
-        * ext.c [#if !DYNAMIC] (do_ext): Cast string value for error node.
+	* ext.c [#if !DYNAMIC] (do_ext): Cast string value for error node.
 
 Sun Nov 24 18:23:29 2002  Arnold D. Robbins  <arnold@skeeve.com>
 
 	From Paul Eggert, with some edits by me.
 
-        * builtin.c (do_substr): Consistently use floating point
-        values for lint messages, so they should be printed pretty
-        much as the user saw them.  Check for overflow before
-        converting floating point to integer.  Do the right thing with
-        NaNs.
+	* builtin.c (do_substr): Consistently use floating point
+	values for lint messages, so they should be printed pretty
+	much as the user saw them.  Check for overflow before
+	converting floating point to integer.  Do the right thing with
+	NaNs.
 
-        Check for index out-of-range before checking for length
-        out-of-range, to avoid some nasty effects if address
-        arithmetic overflows (e.g., indx + length < index).
+	Check for index out-of-range before checking for length
+	out-of-range, to avoid some nasty effects if address
+	arithmetic overflows (e.g., indx + length < index).
 
 	Allow zero-length substrings when checking for lint if
 	do_lint == LINT_INVALID.
@@ -2538,13 +3305,13 @@ Mon Oct 28 13:21:20 2002  Arnold D. Robbins   <arnold@skeeve.com>
 	from FALSE to 0, it's not Boolean.
 	(free_temp): Evaluate the argument only once, so that we
 	can call free_temp(tree_eval(n)) for achieving side effects.
-        (load_environ, load_procinfo): Changed return type to NODE *.
-        * main.c (load_environ): The ENVIRON_node should be created with type
+	(load_environ, load_procinfo): Changed return type to NODE *.
+	* main.c (load_environ): The ENVIRON_node should be created with type
 	Node_var_array and lnode set to NULL.  Return pointer to the created node
 	and create an empty hash even on TANDEM.
 	(load_procinfo): Same mods for PROCINFO_node.
 	(init_args): ARGV_node should also have lnode set to NULL.
-        * eval.c (r_tree_eval): case Node_assign moved just above the other
+	* eval.c (r_tree_eval): case Node_assign moved just above the other
 	assignment cases.
 	(op_assign): ++ and -- cases merged with += and -=, respectively.
 	(push_args): Evaluate all args, even in cases where more args are
@@ -2554,11 +3321,11 @@ Mon Oct 28 13:21:20 2002  Arnold D. Robbins   <arnold@skeeve.com>
 	can be trusted when linting code.
 	(r_get_lhs): Case Node_param_list was unreachable (unless
 	something breaks really badly), remove it;
-	(r_tree_eval): case Node_var_array removed from the last switch,
+	(r_tree_eval): Case Node_var_array removed from the last switch,
 	it was caught in the first switch above.
 	* profile.c (tree_eval): Again, case Node_var_array was caught above.
-        * awkgram.y (variable): Code simplified, making use of the above
-        changes.
+	* awkgram.y (variable): Code simplified, making use of the above
+	changes.
 	* field.c (sc_parse_field): IGNORECASE only applies to regex based
 	field-splitting, so remove code that pays attention to it.
 	(do_split): Don't use parse_field if RS_is_null.
@@ -2686,12 +3453,12 @@ Mon Oct 14 12:02:39 2002  Arnold D. Robbins  <arnold@skeeve.com>
 	to two NODE's per element from three.
 
 	* awk.h (ahash): Union is gone.
-	(hash.ref): new union member.
-	(ahnext): new definition into hash union.
-	(ahvalue): new definition into hash union.
-	(ahname_str): new member, points into hash union.
-	(ahname_len): new member, points into hash union.
-	(ahname_ref): new member, points into hash union.
+	(hash.ref): New union member.
+	(ahnext): New definition into hash union.
+	(ahvalue): New definition into hash union.
+	(ahname_str): New member, points into hash union.
+	(ahname_len): New member, points into hash union.
+	(ahname_ref): New member, points into hash union.
 	* array.c: Replaces uses of ahname member with string and
 	length.  Set the reference count correctly to 1 on new nodes.
 	* eval.c (interpret): Case for Node_K_arrayfor.  dupnode() the
@@ -2710,11 +3477,11 @@ Sun Oct 13 16:58:27 2002  Stepan Kasal  <kasal@math.cas.cz>
 	* profile.c (pprint): #undef the temporary defines at the end
 	of the case.
 	* eval.c (interpret): Likewise.
-	(assign_val): we can unref() before doing dupnode().
+	(assign_val): We can unref() before doing dupnode().
 	Also, move the check for NF < 0 from here ...
 	* field.c (set_NF): ... to here.
-	* main.c (varinit): no need to call set_NF().
-	* awkgram.y (statements): don't be so generous when concatenating
+	* main.c (varinit): No need to call set_NF().
+	* awkgram.y (statements): Don't be so generous when concatenating
 	`statements' with a `statement'.
 
 
@@ -2727,10 +3494,10 @@ Sun Oct 13 16:58:27 2002  Stepan Kasal  <kasal@math.cas.cz>
 
 Sun Oct 13 21:35:35 2002  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (NODE): reflags is now unsigned long for:
-	(exec_count): defined to be sub.nodep.reflags.  Using `number'
+	* awk.h (NODE): Reflags is now unsigned long for:
+	(exec_count): Defined to be sub.nodep.reflags.  Using `number'
 	broke pgawk.
-	* profile.c (Node_K_delete_loop): print out as a for loop
+	* profile.c (Node_K_delete_loop): Print out as a for loop
 	with a comment that it's internally the same as `delete array'.
 	* eval.c (Node_K_delete_loop): Increment the exec_count. Ooops.
 	* configure.in (AM_GNU_GETTEXT_VERSION): New macro call.
@@ -2833,7 +3600,7 @@ Mon Sep 16 16:40:57 2002  Stepan Kasal  <kasal@math.cas.cz>
 	(regexp): ... to here.
 	(common_exp): New non-terminal; contains common parts of exp
 	and rexp.  (a_relop, relop_or_less): New non-terminals.
-	(rexp): some rules updated to be analogous to exp.
+	(rexp): Some rules updated to be analogous to exp.
 	(output_redir): Can contain only common_exp, not exp in general.
 
 Mon Sep 16 22:51:51 2002  Arnold D. Robbins  <arnold@skeeve.com>
@@ -2985,11 +3752,11 @@ Mon Aug  5 10:12:39 2002  Arnold D. Robbins  <arnold@skeeve.com>
 	* array.c (in_array): Use FALSE not zero for return value.
 	(assoc_exists): New routine to find and return value for an index
 	in an array.
-	* configure.in: test for termios.h and stropts.h, and grantpt function.
-	* io.c: include termios.h and stropts.h if available.
+	* configure.in: Test for termios.h and stropts.h, and grantpt function.
+	* io.c: Include termios.h and stropts.h if available.
 	(redflags2str): Add RED_PTY to table.
 	(redirect): Add RED_PTY to flags turned off when searching.
-	(close_redir): close write channel for two-way pipes
+	(close_redir): Close write channel for two-way pipes
 	that use ptys by sending an EOF.
 	(two_way_open): If pty_vs_pipe(), use pty's to open two-way pipes as
 	they are line-buffered by default --> alleviates deadlock problems.
@@ -2999,9 +3766,9 @@ Mon Aug  5 10:12:39 2002  Arnold D. Robbins  <arnold@skeeve.com>
 
 Sun Aug  4 00:37:38 2002  Stepan Kasal  <kasal@math.cas.cz>
 
-	* re.c (make_regexp): don't pass the error message returned by
-        re_compile_pattern() to gettext(); it's already gettextized.
-	(make_regexp): minor reformat of code.
+	* re.c (make_regexp): Don't pass the error message returned by
+	re_compile_pattern() to gettext(); it's already gettextized.
+	(make_regexp): Minor reformat of code.
 
 Wed Jul 31 23:50:31 2002  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -3049,12 +3816,12 @@ Tue Jun 11 23:26:09 2002  Paul Eggert  <eggert@twinsun.com>
 	* m4/jm-mktime.m4: Removed.
 	* m4/largefile.m4: Removed.
 	* m4/ssize_t.m4: Removed.
-	* ansi2knr.c: updated.
-	* depcomp: updated.
-	* install-sh: updated.
-	* missing: updated.
-	* mkinstalldirs: updated.
-	* ylwrap: updated.
+	* ansi2knr.c: Updated.
+	* depcomp: Updated.
+	* install-sh: Updated.
+	* missing: Updated.
+	* mkinstalldirs: Updated.
+	* ylwrap: Updated.
 
 	* configure.in: Improved quoting.
 	* acinclude.m4: Use `m4_sinclude', not antiquated `sinclude'.
@@ -3171,10 +3938,10 @@ Sun May  5 14:28:34 2002  Arnold D. Robbins  <arnold@skeeve.com>
 	* eval.c (forloops_active, pop_forloop, pop_all_forloops, push_forloop):
 	new functions.
 	(interpret): Case Node_K_arrayfor, call push and pop functions.
-	Case Node_rule_list: pop loops and pop fcalls after longjmp.
+	Case Node_rule_list: Pop loops and pop fcalls after longjmp.
 	Cases Node_K_next, Node_K_nextfile, Node_K_break and
 	Node_K_continue, removed check before longjmp.
-	Case Node_K_exit: add loop check.
+	Case Node_K_exit: Add loop check.
 	(loop_stack, nloops, nloops_active): New variables that implement
 	the stack.
 
@@ -3324,9 +4091,9 @@ Thu Feb 21 09:52:16 2002  Arnold D. Robbins  <arnold@skeeve.com>
 	Upgraded to automake 1.5 and gettext-0.11.
 	Also bug fix to multibyte code.
 
-	* ABOUT-NLS: upgraded.
-	* config.guess, config.sub, config.rpath, gettext.h, ylwrap: new files.
-	* Makefile.am: added above to appropriate places.
+	* ABOUT-NLS: Upgraded.
+	* config.guess, config.sub, config.rpath, gettext.h, ylwrap: New files.
+	* Makefile.am: Added above to appropriate places.
 	* awk.h: Replace libintl.h and macros with include of gettext.h.
 	  (emalloc, erealloc): Add num bytes to error message, put string inside _().
 	  (index_multibyte_buffer): Removed decl.
@@ -3336,16 +4103,16 @@ Thu Feb 21 09:52:16 2002  Arnold D. Robbins  <arnold@skeeve.com>
 	  that we don't try to malloc(0): this fails on some systems.
 	* configure.in (AM_GNU_GETTEXT): Update macro for gettext 0.11.
 	  (ALL_LINGUAS): Removed.
-	* m4/codeset.m4: new file.
-	* m4/gettext.m4: updated.
-	* m4/glibc21.m4: new file.
-	* m4/iconv.m4: new file.
-	* m4/isc-posix.m4: new file.
-	* m4/lcmessage.m4: updated.
-	* m4/lib-ld.m4: new file.
-	* m4/lib-link.m4: new file.
-	* m4/lib-prefix.m4: new file.
-	* m4/progtest.m4: updated.
+	* m4/codeset.m4: New file.
+	* m4/gettext.m4: Updated.
+	* m4/glibc21.m4: New file.
+	* m4/iconv.m4: New file.
+	* m4/isc-posix.m4: New file.
+	* m4/lcmessage.m4: Updated.
+	* m4/lib-ld.m4: New file.
+	* m4/lib-link.m4: New file.
+	* m4/lib-prefix.m4: New file.
+	* m4/progtest.m4: Updated.
 	* intl/*: Replaced with version from gettext 0.11.
 	* po/*: Revised for gettext 0.11.
 
@@ -3392,7 +4159,7 @@ Sun Feb  3 17:56:20 2002  Bruno Haible  <bruno@clisp.org>
 
 	* builtin.c (do_bindtextdomain): Don't free the same variable twice.
 	* main.c (main): Call setlocale for LC_MESSAGE, to make dcgettext
-        function work on glibc systems.
+	function work on glibc systems.
 
 Wed Jan 23 15:03:36 2002  Andreas Buening    <andreas.buening@nexgo.de>
 
@@ -3449,30 +4216,30 @@ Fri Jun 22 05:43:50 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 
 Thu Apr 26 08:03:17 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 
-	* builtin.c (index_multibyte_buffer) : inspect the buffer and write
+	* builtin.c (index_multibyte_buffer): Inspect the buffer and write
 	the index.
-	(sub_common) : in multibyte environment, skip multibyte characters
+	(sub_common): In multibyte environment, skip multibyte characters
 	when we check special characters.
-	* awk.h (index_multibyte_buffer) : add prototype.
-	* eval.c (cmp_nodes) : in multibyte environment, compare per character.
-	* field.c (re_parse_field) : in multibyte environment, avoid to
+	* awk.h (index_multibyte_buffer): Add prototype.
+	* eval.c (cmp_nodes): In multibyte environment, compare per character.
+	* field.c (re_parse_field): In multibyte environment, avoid to
 	call research() on invalid boundary.
-	(sc_parse_field) : in multibyte environment, avoid to compare on
+	(sc_parse_field): In multibyte environment, avoid to compare on
 	invalid boundary.
-	(null_parse_field) : in multibyte environment, split per
+	(null_parse_field): In multibyte environment, split per
 	character, not per byte.
-	* io.c (get_a_record) : in multibyte environment, avoid to compare
+	* io.c (get_a_record): In multibyte environment, avoid to compare
 	on invalid boundary.
 
 Wed Apr 25 08:29:47 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 
-	* awk.h (strncasecmpmbs) : add prototype.
-	* builtin.c (strncasecmpmbs) : new function like strncasecmp but for
+	* awk.h (strncasecmpmbs): Add prototype.
+	* builtin.c (strncasecmpmbs): New function like strncasecmp but for
 	multibyte strings.
-	(do_index) : in multibyte environment, compare per character.
-	* builtin.c (do_tolower) : in multibyte environment, user towlower
+	(do_index): In multibyte environment, compare per character.
+	* builtin.c (do_tolower): In multibyte environment, user towlower
 	instead of TOLOWER.
-	(do_toupper) :  in multibyte environment, user towupper instead
+	(do_toupper): In multibyte environment, user towupper instead
 	of TOUPPER.
 
 Tue Apr 24 10:38:06 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
@@ -3480,62 +4247,62 @@ Tue Apr 24 10:38:06 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 	In multibyte environments, handle multibyte characters as single
 	characters in bracket expressions.
 
-	* dfa.h (mb_char_classes) : new structure.
-	(mbcsets) : new variable.
-	(nmbcsets) : new variable.
-	(mbcsets_alloc) : new variable.
-	* dfa.c (prtok) : handle MBCSET.
-	(fetch_wc) : new function to fetch a wide character.
-	(parse_bracket_exp_mb) : new function to handle multibyte character
+	* dfa.h (mb_char_classes): New structure.
+	(mbcsets): New variable.
+	(nmbcsets): New variable.
+	(mbcsets_alloc): New variable.
+	* dfa.c (prtok): Handle MBCSET.
+	(fetch_wc): New function to fetch a wide character.
+	(parse_bracket_exp_mb): New function to handle multibyte character
 	in lex().
-	(lex) : invoke parse_bracket_exp_mb() for multibyte bracket expression.
-	(atom) : handle MBCSET.
-	(epsclosure) : likewise.
-	(dfaanalyze) : likewise.
-	(dfastate) : likewise.
-	(match_mb_charset) : new function to judge whether a bracket match
+	(lex): Invoke parse_bracket_exp_mb() for multibyte bracket expression.
+	(atom): Handle MBCSET.
+	(epsclosure): Likewise.
+	(dfaanalyze): Likewise.
+	(dfastate): Likewise.
+	(match_mb_charset): New function to judge whether a bracket match
 	with a multibyte character.
-	(check_matching_with_multibyte_ops) : handle MBCSET.
-	(dfainit) : initialize new variables.
-	(dfafree) : free new variables.
+	(check_matching_with_multibyte_ops): Handle MBCSET.
+	(dfainit): Initialize new variables.
+	(dfafree): Free new variables.
 
 Mon Apr 23 01:40:09 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 
 	Implement the mechanism to match with multibyte characters,
 	and use it for `period' in multibyte environments.
 
-	* dfa.h (mbps) : new variable.
-	* dfa.c (prtok) : handle ANYCHAR.
-	(lex) : use ANYCHAR for `period' in multibyte environments.
-	(atom) : handle ANYCHAR.
-	(state_index) : initialize mbps in multibyte environments.
-	(epsclosure) : handle ANYCHAR.
-	(dfaanalyze) : handle ANYCHAR.
-	(dfastate) : handle ANYCHAR.
-	(realloc_trans_if_necessary) : new function.
-	(transit_state_singlebyte) : new function.
-	(match_anychar) : new function.
-	(check_matching_with_multibyte_ops) : new function.
-	(transit_state_consume_1char) : new function.
-	(transit_state) : new function.
-	(dfaexec) : invoke transit_state if expression can match with
+	* dfa.h (mbps): New variable.
+	* dfa.c (prtok): Handle ANYCHAR.
+	(lex): Use ANYCHAR for `period' in multibyte environments.
+	(atom): Handle ANYCHAR.
+	(state_index): Initialize mbps in multibyte environments.
+	(epsclosure): Handle ANYCHAR.
+	(dfaanalyze): Handle ANYCHAR.
+	(dfastate): Handle ANYCHAR.
+	(realloc_trans_if_necessary): New function.
+	(transit_state_singlebyte): New function.
+	(match_anychar): New function.
+	(check_matching_with_multibyte_ops): New function.
+	(transit_state_consume_1char): New function.
+	(transit_state): New function.
+	(dfaexec): Invoke transit_state if expression can match with
 	a multibyte character in multibyte environments.
-	(dfamust) : handle ANYCHAR.
+	(dfamust): Handle ANYCHAR.
 
 Fri Apr 20 11:31:24 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 
 	Avoid incorrect state transition in multibyte environments.
 
-	* dfa.h (nmultibyte_prop) : new variable.
-	(multibyte_prop) : new variable.
-	* dfa.c (addtok) : set inputwcs.
-	(dfastate) : avoid incorrect state transition in multibyte
+	* dfa.h (nmultibyte_prop): New variable.
+	(multibyte_prop): New variable.
+	* dfa.c (addtok): Set inputwcs.
+	(dfastate): Avoid incorrect state transition in multibyte
 	environments.
-	(dfaexec) : likewise.
-	(dfainit) : init multibyte_prop.
-	(dfafree) : free multibyte_prop.
-	(inputwcs): new variable.
-	(mblen_buf) : new variable contains the amount of remain byte
+	(dfaexec): Likewise.
+	(dfainit): Init multibyte_prop.
+	(dfafree): Free multibyte_prop.
+	(inputwcs): New variable.
+	(mblen_buf): New variable contains the amount of remain byte
 	of corresponding multibyte character in the input string.
 
 Fri Apr 20 06:28:59 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
@@ -3543,38 +4310,38 @@ Fri Apr 20 06:28:59 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 	Handle a multibyte character followed by '*', '+', and '{n,m}'
 	correctly.
 
-	* dfa.c (update_mb_len_index): new function.
+	* dfa.c (update_mb_len_index): New function.
 	Support for multibyte string.
-	(FETCH) : call update_mb_len_index.
-	(lex) : check cur_mb_index not to misunderstand multibyte characters.
-	(atom) : make a tree from a multibyte character.
-	(dfaparse) : initialize new variables.
-	(mbs) : new variable.
-	(cur_mb_len) : new variable.
-	(cur_mb_index) : new variable.
+	(FETCH): Call update_mb_len_index.
+	(lex): Check cur_mb_index not to misunderstand multibyte characters.
+	(atom): Make a tree from a multibyte character.
+	(dfaparse): Initialize new variables.
+	(mbs): New variable.
+	(cur_mb_len): New variable.
+	(cur_mb_index): New variable.
 
 Thu Apr 19 09:32:47 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 
-	* awkgram.y (cur_mbstate) : new varialble containing means current
+	* awkgram.y (cur_mbstate): New varialble containing means current
 	shift state.
-	(cur_char_ring) : new varialbe reffering the buffer which contains
+	(cur_char_ring): New varialbe reffering the buffer which contains
 	last some character from the buffer.
-	(cur_ring_idx) : new variable containing the current index on
+	(cur_ring_idx): New variable containing the current index on
 	cur_char_ring.
-	(nextc_is_1stbyte) : new macro, means that last nextc() return a
+	(nextc_is_1stbyte): New macro, means that last nextc() return a
 	singlebyte character or 1st byte of a multibyte character.
-	(nextc) : check the buffer and update cur_ring_char in multibyte
+	(nextc): Check the buffer and update cur_ring_char in multibyte
 	environments.
-	(pushback) : adjust cur_ring_idx in multibyte environments.
-	(yylex) : add check whether nextc() returned 1st-byte in multibyte
+	(pushback): Adjust cur_ring_idx in multibyte environments.
+	(yylex): Add check whether nextc() returned 1st-byte in multibyte
 	environments.
-	* re.c (make_regexp) : in multibyte environment, skip multibyte
+	* re.c (make_regexp): In multibyte environment, skip multibyte
 	characters when we check special characters.
 
 Wed Apr 18 07:58:20 2001  Isamu Hasegawa  <isamu@yamato.ibm.com>
 
-	* awk.h (MBS_SUPPORT) : New flag, means supporting multibyte strings.
-	* configure.in : add check for wchar.h, wctype.h, mbrtowc, and mbrlen.
+	* awk.h (MBS_SUPPORT): New flag, means supporting multibyte strings.
+	* configure.in : Add check for wchar.h, wctype.h, mbrtowc, and mbrlen.
 
 Wed Jan 16 16:32:40 2002  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -3584,20 +4351,20 @@ Wed Jan 16 16:32:40 2002  Arnold D. Robbins  <arnold@skeeve.com>
 
 Mon Jan  7 22:12:15 2002  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awkgram.y (statement): moved delete, print, and expressions into
+	* awkgram.y (statement): Moved delete, print, and expressions into
 	  new non-terminal `simple_stmt'.  Allow opt_simple_stmt in the
 	  first and third part of a for loop, per latest POSIX, which documents
 	  an otherwise undocumented historical oddity in Unix awk.  This has
 	  the pleasant side effect of making line numbers more accurate for
 	  messages involving delete statements.
-	  (opt_simple_stmt, simple_stmt): new non-terminals.
+	  (opt_simple_stmt, simple_stmt): New non-terminals.
 
 	  Based on bug report from drj@pobox.com.
 
 Mon Dec 24 14:04:02 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* configure.in: Changes for VMS with new strftime:
-	(AC_HEADER_TIME): added
+	(AC_HEADER_TIME): Added.
 	(AC_CHECK_HEADERS): Check for sys/time.h.
 	(TIME_T_IN_SYS_TYPES_H): Add header check.
 	* acconfig.h (TIME_T_IN_SYS_TYPES_H): Added.
@@ -3625,8 +4392,8 @@ Tue Dec  4 17:54:30 2001  Arnold D. Robbins  <arnold@skeeve.com>
 	New configure time option, --with-whiny-user-strftime.
 
 	* configure.in (AC_ARG_WITH): Add appropriate code for autoconf.
-	* accondig.h (USE_INCLUDED_STRFTIME): add #undef for it.
-	* custom.h (USE_INCLUDED_STRFTIME): set things up write.
+	* accondig.h (USE_INCLUDED_STRFTIME): Add #undef for it.
+	* custom.h (USE_INCLUDED_STRFTIME): Set things up write.
 
 Tue Dec  4 16:44:07 2001  Andreas Buening    <andreas.buening@nexgo.de>
 
@@ -3634,10 +4401,10 @@ Tue Dec  4 16:44:07 2001  Andreas Buening    <andreas.buening@nexgo.de>
 
 	* awk.h (TOUPPER, TOLOWER): Define only if not already defined.
 	* awkgram.y (extproc feature): Add ifdef for __EMX__.
-	* gawkmisc.c (__EMX__): include pc/gawkmisc.c directly.
+	* gawkmisc.c (__EMX__): Include pc/gawkmisc.c directly.
 	* io.c (__EMX__): Added for a number of places in addition to OS2 def.
 	  (two_way_open): Added OS/2 specific code added that uses spawn.
-	  (gawk_popen): ditto.
+	  (gawk_popen): Ditto.
 
 Mon Dec  3 14:07:56 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -3712,9 +4479,9 @@ Tue Sep 25 15:19:53 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
 2001-09-07  Paul Eggert  <eggert@twinsun.com>
 
-        * io.c (redirect): When deciding to use the fdopen bug hack,
-          use "__sun" rather than "solaris".  No compilers predefine
-          "solaris", but both GCC and Sun C predefine "__sun".
+	* io.c (redirect): When deciding to use the fdopen bug hack,
+	  use "__sun" rather than "solaris".  No compilers predefine
+	  "solaris", but both GCC and Sun C predefine "__sun".
 
 Thu Aug 30 15:17:12 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -3765,7 +4532,7 @@ Fri Aug  3 13:38:54 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
 	Undid BECAMEARRAY changes of 25 June 2001 in favor of correct code:
 	* eval.c (pop_fcall): Change test and comment for freeing n->vname.
-	  (flags2str): removed BECAMEARRAY entry.
+	  (flags2str): Removed BECAMEARRAY entry.
 	* awk.h (BECAMEARRAY): Removed define.
 	* array.c (assoc_lookup): Removed setting of BECAMEARRAY flag.
 
@@ -3789,6 +4556,7 @@ Mon Jun 25 19:34:24 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
 	Further rationalization of treatment of dynamic regexes,
 	so that profiling code works correctly.
+
 	* awk.h (NODETYPE): New type, Node_dynregex.
 	* awkgram.y (mk_rexp): Use Node_dynregex.
 	* eval.c (nodetypes): Add Node_dynregex.
@@ -3799,20 +4567,23 @@ Mon Jun 25 19:34:24 2001  Arnold D. Robbins  <arnold@skeeve.com>
 	  indicate CONST.
 
 	New lint warning.
+
 	* awkgram.y (yylex): Added lint warning that constant with leading
 	  zero is treated as octal or hex.
 
 	Generalized code for those who are Strong In The Ways of the Source.
+
 	* awk.h: New boolean variable.
-	* main.c (main): set it.
+	* main.c (main): Set it.
 	* eval.c (interpret): For arrays, check it. Remove variable 'first',
 	  not needed anymore.
-	* profile.c (pp_string_fp): Enable printing of non-ascii characters
+	* profile.c (pp_string_fp): Enable printing of non-ASCII characters
 	  verbatim if variable set.
 
 	Fix memory corruption on SCO for array vars as params changed globally.
-	* awk.h (BECAMEARRAY): new flag.
-	* array.c (assoc_lookup): set the flag as appropriate.
+
+	* awk.h (BECAMEARRAY): New flag.
+	* array.c (assoc_lookup): Set the flag as appropriate.
 	* eval.c (flags2str): Add the flag.
 	  (pop_fcall): Check the flag, don't free memory if set.
 
@@ -3881,15 +4652,15 @@ Mon Apr  9 11:41:58 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
 Thu Apr  5 20:12:05 2001  Pat Rankin  <rankin@eql.caltech.edu>
 
-	* dfa.c: for VMS, #include <stddef.h> instead of <sys/types.h>.
-	* missing_d/mktime.c: likewise.
+	* dfa.c: For VMS, #include <stddef.h> instead of <sys/types.h>.
+	* missing_d/mktime.c: Likewise.
 
-	* random.c: reorder include directives to get gawk config info
+	* random.c: Reorder include directives to get gawk config info
 	  from random.h sooner.
-	  [fcntl.h]: guard #include with HAVE_FCNTL_H test.
-	  [unistd.h]: guard #include with HAVE_UNISTD_H test.
+	  [fcntl.h]: Guard #include with HAVE_FCNTL_H test.
+	  [unistd.h]: Guard #include with HAVE_UNISTD_H test.
 
-	* random.c (srandomdev): skip /dev/urandom usage if O_RDONLY
+	* random.c (srandomdev): Skip /dev/urandom usage if O_RDONLY
 	  is not defined.
 
 Tue Mar 20 11:07:11 2001  Arnold D. Robbins  <arnold@skeeve.com>
@@ -3916,11 +4687,11 @@ Wed Mar  7 11:28:52 2001  Arnold D. Robbins  <arnold@skeeve.com>
 	* COPYING: Incorporate latest version from FSF, which fixes a Y2k bug.
 
 	* builtin.c (do_mktime): Allow the user to specify the
-          tm_isdst member as an optional trailing integer, and to
-          specify "out-of-range" members.  Check for overflow when
-          subtracting 1 from month or 1900 from year.  Allow years just
-          past INT_MAX, as they work on some hosts when INT_MAX - 1900
-          is representable as an int.
+	  tm_isdst member as an optional trailing integer, and to
+	  specify "out-of-range" members.  Check for overflow when
+	  subtracting 1 from month or 1900 from year.  Allow years just
+	  past INT_MAX, as they work on some hosts when INT_MAX - 1900
+	  is representable as an int.
 
 	* doc/gawk.1, doc/gawk.texi: Document the above changes.
 	  Also, document that the origin-zero Gregorian calendar is used.
@@ -3952,8 +4723,8 @@ Tue Feb  6 18:35:27 2001  Martin C. Brown    <mc@whoever.com>
 Tue Feb  6 18:17:13 2001  Michal Jaegermann  <michal@ellpspace.math.ualberta.ca>
 
 	* regex.c (re_match_2_internal): Case maybe_pop_jump, for
-	  charset and not_charset: change cast from (unsigned char)
-          to (unsigned).  Catches last 8 chars with high bit set
+	  charset and not_charset: Change cast from (unsigned char)
+	  to (unsigned).  Catches last 8 chars with high bit set
 	  if backtracking. See test/rebt8b1.awk, test/rebt8b2.awk.
 
 Tue Feb  6 11:20:21 2001  Arnold D. Robbins  <arnold@skeeve.com>
@@ -3962,21 +4733,21 @@ Tue Feb  6 11:20:21 2001  Arnold D. Robbins  <arnold@skeeve.com>
 	Make sorted for loops a dynamic test instead of a compile time test.
 	Still requires being Strong In The Ways Of The Source.
 
-	* awk.h: (struct search): removed.
-	  (assoc_scan, assoc_next): removed declarations.
-	* array.c (assoc_scan, assoc_next): removed functions.
-	* eval.c (interpret): remove Node_K_array_sorted_for. Change code
+	* awk.h: (struct search): Removed.
+	  (assoc_scan, assoc_next): Removed declarations.
+	* array.c (assoc_scan, assoc_next): Removed functions.
+	* eval.c (interpret): Remove Node_K_array_sorted_for. Change code
 	  at Node_K_arrayfor.
-	  (nodetypes): remove Node_K_array_sorted_for.
-	* configure.in: removed array sorting test.
-	* awkgram.y: removed sorted_in keyword and associated code.
+	  (nodetypes): Remove Node_K_array_sorted_for.
+	* configure.in: Removed array sorting test.
+	* awkgram.y: Removed sorted_in keyword and associated code.
 
 Sun Feb  4 14:57:49 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* eval.c (interpret): use tree->rnode->exec_count to hold count of
+	* eval.c (interpret): Use tree->rnode->exec_count to hold count of
 	  times if was true.
-	  profile.c (interpret): ditto.
-	* main.c (pre_assign): gross hack. malloc fresh copy of assign so can
+	  profile.c (interpret): Ditto.
+	* main.c (pre_assign): Gross hack. malloc fresh copy of assign so can
 	  clear the '=', otherwise screws up profiling print out.
 
 Sun Jan 28 16:16:02 2001  Arnold D. Robbins  <arnold@skeeve.com>
@@ -3990,7 +4761,7 @@ Sun Jan 28 16:16:02 2001  Arnold D. Robbins  <arnold@skeeve.com>
 	* awk.h (dump_fcall_stack): Add declaration.
 	  (init_profiling_signals): Ditto.
 	* main.c (main): Call init_profiling_signals.
-	* profile.c (init_profiling_signals, dump_and_exit, just_dump): new
+	* profile.c (init_profiling_signals, dump_and_exit, just_dump): New
 	  functions.
 
 Sun Jan 28 15:50:02 2001  Eli Zaretskii  <eliz@is.elta.co.il>
@@ -4016,8 +4787,8 @@ Thu Jan 18 14:03:06 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
 Wed Jan 17 11:03:40 2001  Eli Zaretskii  <eliz@is.elta.co.il>
 
-        * io.c (redirect) [F_GETFL && O_APPEND]: Use binmode in the call
-          to fdopen.
+	* io.c (redirect) [F_GETFL && O_APPEND]: Use binmode in the call
+	  to fdopen.
 
 Mon Jan 15 16:29:52 2001  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -4058,7 +4829,7 @@ Wed Jan  3 16:41:33 2001  Arnold D. Robbins  <arnold@skeeve.com>
 	Add a minor memory cleanup facility (undocumented):
 	* awk.h (do_tidy_mem, release_all_vars): Add declarations.
 	* main.c (do_tidy_mem): Add declaration.
-	  (main): if $TIDYMEM exists, do_tidy_mem is true, and call mtrace().
+	  (main): If $TIDYMEM exists, do_tidy_mem is true, and call mtrace().
 	* awkgram.y (release_all_vars): New function.
 
 Sun Dec 31 10:47:37 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4082,13 +4853,13 @@ Tue Dec 12 08:38:03 2000  Arnold D. Robbins  <arnold@skeeve.com>
 Fri Dec  8 11:47:26 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* ext.c (dummy): Make gcc specific via ifdef.
-	* builtin.c (do_dcgettext): make conditional compilation smarter.
+	* builtin.c (do_dcgettext): Make conditional compilation smarter.
 	* msg.c (warning, error, r_fatal): Finish switching back to
 	  multi-version function header.
 
 Wed Dec  6 13:28:58 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* random.h: include <config.h> to get ssize_t definition.
+	* random.h: Include <config.h> to get ssize_t definition.
 	* awkgram.y (yyerror): Restore multi-version function header,
 	  it seems that what ansi2knr produces doesn't quite do the
 	  job on old compilers.
@@ -4113,25 +4884,25 @@ Sun Nov 26 11:58:52 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* builtin.c (do_dcgettext, do_bindtextdomain): Add calls to
 	  free_temp the various arguments.  Sigh.
-	* io.c (yylex): nuked bstart variable, put all uses of mend variable
+	* io.c (yylex): Nuked bstart variable, put all uses of mend variable
 	  into TANDEM ifdef.
-	* main.c (load_environ): removed cp variable, value never used.
+	* main.c (load_environ): Removed cp variable, value never used.
 	* random.c: Remvoed uses of `inline' keyword.
-	* Makefile.am (install-exec-hook, uninstall-local): new targets.
+	* Makefile.am (install-exec-hook, uninstall-local): New targets.
 	  Adds creation of gawk-X.Y.Z and awk links, as in 3.0.x.
 	* configure.in (GAWK_AC_TYPE_SSIZE_T): Added.
-	  m4/ssize_t.m4: new file.
+	  m4/ssize_t.m4: New file.
 
 Wed Nov 22 14:47:18 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	After consultation with Brian Kernighan and Michael Brennan,
 	nuked the abort keyword.
 
-	* awk.h (Node_K_abort): removed.
-	* eval.c (aborting): removed decl.
+	* awk.h (Node_K_abort): Removed.
+	* eval.c (aborting): Removed decl.
 	  (interpret): Removed Node_K_abort case.
 	* io.c (do_input): Removed checks for aborting.
-	* main.c (aborting): removed.
+	* main.c (aborting): Removed.
 	  (main): Removed checks for aborting.
 	* profile.c (pprint): Removed Node_K_abort case.
 	* awk.y (LEX_ABORT): All stuff removed.
@@ -4149,7 +4920,7 @@ Wed Nov 22 10:45:57 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Tue Nov 21 16:25:41 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.y: for (iggy in foo) loops: add test that index
+	* awk.y: for (iggy in foo) loops: Add test that index
 	  in delete statement is a simple variable.
 
 Tue Nov 14 16:11:39 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4164,8 +4935,8 @@ Tue Nov 14 16:11:39 2000  Arnold D. Robbins  <arnold@skeeve.com>
 	  compilation work on PCs.
 	* builtin.c (do_dcgettext): Compile out cat_tab and code
 	  if not ENABLE_NLS.
-	* ext.c: for MSC, no long long variable.
-	* random.c: use clock() instead of gettimeofday().
+	* ext.c: For MSC, no long long variable.
+	* random.c: Use clock() instead of gettimeofday().
 	* builtin.c: Fixed prototypes for new random functions (ADR).
 
 Sun Nov 12 17:45:44 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4181,8 +4952,8 @@ Sun Nov 12 17:45:44 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Wed Nov  8 14:39:20 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* configure.in: Only add -rdynamic for linux.
-	* dfa.h, dfa.c: upgraded to versions in grep 2.4.2.
+	* configure.in: Only add -rdynamic for Linux.
+	* dfa.h, dfa.c: Upgraded to versions in grep 2.4.2.
 
 Tue Nov  7 18:17:17 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -4197,12 +4968,12 @@ Tue Nov  7 16:57:49 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Tue Nov  7 14:09:14 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (os_is_setuid): declare function.
-	* main.c (main): call it if do_lint and warn if true.
+	* awk.h (os_is_setuid): Declare function.
+	* main.c (main): Call it if do_lint and warn if true.
 	* awkgram.y (tokentab):
 	  - Made sure all extensions are actually marked as such.  Ouch.
 	  - Changed "sort" to "asort".  Potential to break too much old code.
-	* getopt.h, getopt.c, getopt1.c: replaced with current versions
+	* getopt.h, getopt.c, getopt1.c: Replaced with current versions
 	  from glibc CVS archive.
 
 Mon Nov  6 18:14:33 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4227,7 +4998,7 @@ Tue Oct 24 12:20:18 2000  Arnold D. Robbins  <arnold@skeeve.com>
 	* awkgram.y (valinfo, var_comp, dump_vars): New functions to dump
 	  the list of global variables.
 	* awk.h: Declare dump_vars.
-	* main.c (optab): new option "dump-variables".
+	* main.c (optab): New option "dump-variables".
 	  (main): Code to handle it, set the output file and then call
 	  dump_vars() at the end.
 	  (usage): New option added to usage message.
@@ -4239,8 +5010,8 @@ Sat Oct 21 22:59:59 2000  Arnold D. Robbins  <arnold@skeeve.com>
 	  (shadow_funcs): Go through all functions and call parms_shadow().
 	  (isnoeffect, isassignable): Add Node_LINT and NODE_BINMODE.
 	* main.c (main): If do_lint, call shadow_funcs().
-	* awk.h: add declaration of shadow_funcs().
-	* configure.in: added m4/Makefile and awklib/eg/network/Makefile
+	* awk.h: Add declaration of shadow_funcs().
+	* configure.in: Added m4/Makefile and awklib/eg/network/Makefile
 	  to list of generated makefiles.
 
 Tue Oct 17 10:47:35 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4273,7 +5044,7 @@ Fri Oct 13 09:17:04 2000  Arnold D. Robbins  <arnold@skeeve.com>
 	  fails.  Rationalize return value to either 0 or -1.
 	* builtin.c (do_gensub): 3rd arg of zero generates a
 	  warning.
-	  (do_fflush): rationalize return value: -1 for unopen or read-only
+	  (do_fflush): Rationalize return value: -1 for unopen or read-only
 	  redirection, status of fflush otherwise.
 
 Wed Oct 11 22:11:19 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4283,13 +5054,13 @@ Wed Oct 11 22:11:19 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Thu Oct  5 11:56:42 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h, awkgram.y, configure.in, eval.c: enabled
+	* awk.h, awkgram.y, configure.in, eval.c: Enabled
 	  `for (i in_sorted array)' loops for those who
 	  are Strong In The Way Of The Source.  So there.
 
 Mon Oct  2 10:09:32 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (do_close): make close(x) for non-open x return -1
+	* io.c (do_close): Make close(x) for non-open x return -1
 	  and update ERRNO.  close(FILENAME) no longer does anything
 	  magic; this is all for better consistency with other awks
 	  and is more logical, anyway.
@@ -4308,7 +5079,7 @@ Tue Sep 26 14:41:41 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Sun Sep 24 16:38:04 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (freenode): set the flags straight to UNINITIALIZED.
+	* awk.h (freenode): Set the flags straight to UNINITIALIZED.
 	* node.c (unref): Fix test for MALLOC|TEMP to test the
 	  actual flags, not zero.
 	* builtin.c (format_tree): ala print and concat, dupnode
@@ -4373,15 +5144,15 @@ Wed Sep  6 16:28:12 2000  Arnold D. Robbins  <arnold@skeeve.com>
 	  `do_bindtextdomain', `set_TEXTDOMAIN' and variables
 	  `TEXTDOMAIN', `TEXTDOMAIN_node'.  New NODETYPE enum
 	  `Node_TEXTDOMAIN'.
-	* eval.c (nodetypes): add Node_TEXTDOMAIN at end.
-	  (set_TEXTDOMAIN): new function.
-	  (r_get_lhs): add case for Node_TEXTDOMAIN.
-	* main.c (varinit): add entry for TEXTDOMAIN.
+	* eval.c (nodetypes): Add Node_TEXTDOMAIN at end.
+	  (set_TEXTDOMAIN): New function.
+	  (r_get_lhs): Add case for Node_TEXTDOMAIN.
+	* main.c (varinit): Add entry for TEXTDOMAIN.
 	* node.c (format_val): If INTLSTR use dcgettext of string
 	  and TEXTDOMAIN.
 	* awkgram.y (tokentab): Add entries for "dcgettext" and
 	  "bindtextdomain".
-	* builtin.c (do_dcgettext, do_bindtextdomain): new functions.
+	* builtin.c (do_dcgettext, do_bindtextdomain): New functions.
 
 Tue Sep  5 17:01:34 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -4391,20 +5162,20 @@ Tue Sep  5 17:01:34 2000  Arnold D. Robbins  <arnold@skeeve.com>
 	  chars or after embedded newline, for --gen-po.
 	  Fix the calls to it everywhere for new boolean option
 	  to yes/no break lines.
-	* m4/strtod.m4: new file, defines GAWK_AC_FUNC_STRTOD_C89.
+	* m4/strtod.m4: New file, defines GAWK_AC_FUNC_STRTOD_C89.
 	* configure.in: GAWK_AC_FUNC_STRTOD_C89 call added
-	* acinclude.m4: include strtod.m4.
-	* acconfig.h: add entry for STRTOD_NOT_C89.
+	* acinclude.m4: Include strtod.m4.
+	* acconfig.h: Add entry for STRTOD_NOT_C89.
 	  Remove entries for BITOPS and NON_DEC_DATA.
-	* missing/missing.c: add check for STRTOD_NOT_C89, use ours
+	* missing/missing.c: Add check for STRTOD_NOT_C89, use ours
 	  if set.
-	* missing/strtod.c: make smarter for input like 0x345.
-	* awk.h: [STRTOD_NOT_C89]: define strtod gawk_strtod to get
+	* missing/strtod.c: Make smarter for input like 0x345.
+	* awk.h: [STRTOD_NOT_C89]: Define strtod gawk_strtod to get
 	  our version.  Avoids linker weirdness.
 
 Mon Sep  4 09:16:43 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* field.c (set_record): fix from Utz-Uwe Haus
+	* field.c (set_record): Fix from Utz-Uwe Haus
 	  <haus@saturn.Math.Uni-Magdeburg.DE> to make sure there's
 	  always enough room in the record.
 	* builtin.c (nondec2awknum): Fix octal conversions to exit
@@ -4425,20 +5196,20 @@ Sun Sep  3 13:52:11 2000  Arnold D. Robbins  <arnold@skeeve.com>
 	  In .developing check, remove the AC_DEFINEs.
 	* awk.h: Decls for bitwise functions now there by default.
 	  Add decl of `do_non_decimal_data'.
-	* main.c (do_non_decimal_data): new variable
-	  (optlist): add new entry for `--non-decimal-data'.
-	  (main): turn off `do_non_decimal_data' if `do_traditional'.
-	  (usage): add the new option.
-	* node.c (r_force_number): make check for non-decimal data a
+	* main.c (do_non_decimal_data): New variable
+	  (optlist): Add new entry for `--non-decimal-data'.
+	  (main): Turn off `do_non_decimal_data' if `do_traditional'.
+	  (usage): Add the new option.
+	* node.c (r_force_number): Make check for non-decimal data a
 	  runtime check based on do_non_decimal_data.
-	* awkgram.y (yylex): make non-decimal constants a runtime check.
-	* builtin.c: remove the ifdefs around the bit functions and
+	* awkgram.y (yylex): Make non-decimal constants a runtime check.
+	* builtin.c: Remove the ifdefs around the bit functions and
 	  nondec2awknum.
 
 Tue Aug 29 18:45:56 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* configure.in: go back to ARRAYDEBUG if .developing set.
-	* awkgram.y: use ARRAYDEBUG for adump(), use multiple tests
+	* configure.in: Go back to ARRAYDEBUG if .developing set.
+	* awkgram.y: Use ARRAYDEBUG for adump(), use multiple tests
 	  for stopme().
 
 Mon Aug 28 17:09:06 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4448,31 +5219,35 @@ Mon Aug 28 17:09:06 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Mon Aug 14 23:01:55 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Add %COUNT$... handling to printf.
-	  awk.h (printf_count): new define in NODE structure.
-	  (format_tree): added decl.
-	  awkgram.y (count_args): new function to set printf_count in
+	Add %COUNT$... handling to printf.
+
+	* awk.h (printf_count): New define in NODE structure.
+	  (format_tree): Added decl.
+	* awkgram.y (count_args): New function to set printf_count in
 		a node.
-	  [print productions]: call the function.
-	  (snode): for do_sprintf, call count_args, set the count
+	  [print productions]: Call the function.
+	* (snode): For do_sprintf, call count_args, set the count
 	  	in the lnode.
-	  builtin.c (format_tree): new fourth arg is argument count.
+	* builtin.c (format_tree): New fourth arg is argument count.
 	  Add smarts to handle the `$' in a format.
-	  (do_sprintf): use new argument to format_tree.
-	  node.c (format_val): ditto.
+	* (do_sprintf): Use new argument to format_tree.
+	  node.c (format_val): Ditto.
 
 Sun Aug 13 11:10:41 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	Changes from Alan J. Broder (ajb@woti.com):
 	- Array third arg to match puts subtexts into the array:
+
 	* awk.y (tokentab): "match" gets third arg, and lint warning
-	* builtin.c (do_match): if third arg there, fill it with subtexts
+	* builtin.c (do_match): If third arg there, fill it with subtexts
+
 	- New builtin sort function:
-	* awk.h (do_sort): declared.
+
+	* awk.h (do_sort): Declared.
 	* array.c (do_sort, dup_table, merge, merge_sort, assoc_from_list,
-	  assoc_sort_inplace): new functions.
+	  assoc_sort_inplace): New functions.
 
-	* eval.c (tree_eval): in debug code, make uninitialized var
+	* eval.c (tree_eval): In debug code, make uninitialized var
 	  a warning, not a fatal error.  Breaks too many things.
 
 Wed Aug  9 10:51:41 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4480,11 +5255,11 @@ Wed Aug  9 10:51:41 2000  Arnold D. Robbins  <arnold@skeeve.com>
 	* eval.c (func_call): Increment the exec_count on the
 	  function's node; this allows printing a call count for
 	  functions.
-	  profile.c (pp_func): print the count for functions.
+	  profile.c (pp_func): Print the count for functions.
 	* ALL: Changed DEBUG to GAWKDEBUG in all gawk files, so that
 	  I don't get regex/dfa debugging.  In some cases, changed
 	  memory-related stuff to MEMDEBUG.  Still have work to do.
-	* awk.h, node.c, profile.c: removed exec_count_init variable;
+	* awk.h, node.c, profile.c: Removed exec_count_init variable;
 	  code has been cleaned up to not need different values for
 	  profiling/not profiling.
 
@@ -4492,7 +5267,7 @@ Thu Jul  5 21:10:59 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* eval.c (casetable): Removed the USE_PURE_ASCII stuff; it
 	  was never documented.  Latin 1 forever.
-	* main.c (main): only call `init_profiling' after arg parsing
+	* main.c (main): Only call `init_profiling' after arg parsing
 	  if `do_profiling' is still false.  Avoids resetting `prof_fp'
 	  back to stderr.
 
@@ -4516,46 +5291,46 @@ Thu Jul  5 21:10:59 2000  Arnold D. Robbins  <arnold@skeeve.com>
 Sun Jan  2 14:48:23 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	First edit of the new millenium!
-	* awk.y (yylex): if lint checking, be obnoxious about gotos.
+	* awk.y (yylex): If lint checking, be obnoxious about gotos.
 
 Mon Oct 25 19:12:02 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h: remove C_ALLOCA ifdef.
-	* main.c (main): remove C_ALLOCA code.
-	* io.c (do_input): ditto.
+	* awk.h: Remove C_ALLOCA ifdef.
+	* main.c (main): Remove C_ALLOCA code.
+	* io.c (do_input): Ditto.
 
 Mon Aug  9 17:36:24 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* bisonfix.sed: unconditionally #undef YYSTACK_USE_ALLOCA.
-	* configure.in: remove all alloca and ALLOCA related stuff.
-	* Makefile.in: ditto
+	* bisonfix.sed: Unconditionally #undef YYSTACK_USE_ALLOCA.
+	* configure.in: Remove all alloca and ALLOCA related stuff.
+	* Makefile.in: Ditto.
 
 Thu Jul 29 18:32:05 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* awk.h (NODE): exec_count now in #ifndef NO_PROFILING.
-	* Makefile.in: changes to only recompile eval.c and profile.c to a
+	* Makefile.in: Changes to only recompile eval.c and profile.c to a
 	  special version for profiling.
-	* custom.h [MSC_VER]: turn on NO_PROFILING to omit the exec_count
+	* custom.h [MSC_VER]: Turn on NO_PROFILING to omit the exec_count
 	  and save space.
-	* node.c (more_nodes): move setting of exec_count to
+	* node.c (more_nodes): Move setting of exec_count to
 	  #ifndef NO_PROFILING.
 
 Thu Jul  1 12:12:05 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* configure.in (AC_PREREQ): update to 2.13.
+	* configure.in (AC_PREREQ): Update to 2.13.
 	  GAWK_AC_C_STRINGIZE: convert to AC_C_STRINGIZE.
-	* aclocal.m4 (GAWK_AC_C_STRINGIZE): remove definition, now
+	* aclocal.m4 (GAWK_AC_C_STRINGIZE): Remove definition, now
 	  part of autoconf.
-	* acconfig.h (HAVE_STRINGIZE): ditto.
+	* acconfig.h (HAVE_STRINGIZE): Ditto.
 
 Wed Apr 28 11:08:05 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* array.c (assoc_lookup): fix call to free_temp(subs) to after
+	* array.c (assoc_lookup): Fix call to free_temp(subs) to after
 	  last use of subs.
 
 Sun Apr 25 16:48:06 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (redirect): add lint warning when same file is used for
+	* io.c (redirect): Add lint warning when same file is used for
 	  > and >>.
 
 Thu Apr 22 15:05:30 1999  Arnold D. Robbins  <arnold@skeeve.com>
@@ -4567,45 +5342,46 @@ Thu Apr 22 15:05:30 1999  Arnold D. Robbins  <arnold@skeeve.com>
 Thu Apr  8 14:27:58 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
 	  New features for profiling:
-	* awk.h (NODE): add `exec_count' member.
-	  (freenode): clear `exec_count' upon free.
-	* awk.y (func_count): new variable, counts total number of functions.
-	  (func_install): increment func_count.
-	  (struct finfo): information for use in sorting functions when
+
+	* awk.h (NODE): Add `exec_count' member.
+	  (freenode): Clear `exec_count' upon free.
+	* awk.y (func_count): New variable, counts total number of functions.
+	  (func_install): Increment func_count.
+	  (struct finfo): Information for use in sorting functions when
 	  pretty printing.
-	  (fcompare): compare two finfo structures.
-	  (dump_funcs): print the functions in sorted order for profiling.
-	  (getfname): return the name of a builtin function.
-	* eval.c (INCREMENT): new macro for counting execution of nodes.
-	  (interpret): call INCREMENT() appropriately.
-	* main.c (do_profiling): new flag if doing profiling.
-	  `--profiling': new option added to getopt_long machinery.
+	  (fcompare): Compare two finfo structures.
+	  (dump_funcs): Print the functions in sorted order for profiling.
+	  (getfname): Return the name of a builtin function.
+	* eval.c (INCREMENT): New macro for counting execution of nodes.
+	  (interpret): Call INCREMENT() appropriately.
+	* main.c (do_profiling): New flag if doing profiling.
+	  `--profiling': New option added to getopt_long machinery.
 	  (main): For profiled version, set do_profile and output file.
 	  Call `dump_prog' and `dump_funcs' if do_profiling at end.
-	  (usage): add new argument.
-	* node.c (more_nodes, freenode): set exec_count to zero.
-	* profile.c: new file, does pretty printing and prints counts.
-	* Makefile.in: update to create two versions of gawk, regular
+	  (usage): Add new argument.
+	* node.c (more_nodes, freenode): Set exec_count to zero.
+	* profile.c: New file, does pretty printing and prints counts.
+	* Makefile.in: Update to create two versions of gawk, regular
 	  and `pgawk' which does profiling.
 
 Wed Mar 10 21:38:14 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (close_redir): use update_ERRNO() instead of manually
+	* io.c (close_redir): Use update_ERRNO() instead of manually
 	  doing it.
 
 Mon Dec 21 15:58:21 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* configure.in: add BeOS to list of cases where we hardwire
+	* configure.in: Add BeOS to list of cases where we hardwire
 	  GETPGRP_VOID.
-	  custom.h: remove the #define from __be_os case. Cleaner to
+	  custom.h: Remove the #define from __be_os case. Cleaner to
 	  do it all in configure. Based on email from Martin C. Brown,
 	  mc@whoever.com.
 
 Mon Nov 30 20:52:52 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* eval.c (update_ERRNO): new function, mainly for use by
+	* eval.c (update_ERRNO): New function, mainly for use by
 	  extension functions.
-	* awk.h: add decl.
+	* awk.h: Add decl.
 
 Tue Nov 24 18:13:29 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -4619,52 +5395,52 @@ Tue Nov 24 18:13:29 1998  Arnold D. Robbins  <arnold@skeeve.com>
 	  - --lint=fatal makes lint errors become fatal
 	  - LINT="fatal" has the same effect, any other positive
 	    value makes lint errors be just warnings
-	* Makefile.in (includedir): new variable for gawk header files
-	  (ext.c, ext.o): new source and object files
-	  (OTHERS, extension): new directory for macro with example extension
-	  (install): install header files
-	* acconfig.h (DYNAMIC): new macro, true if can do dynamic loading
-	* array.c (assoc_lookup): new parameter `reference' is true if we
+	* Makefile.in (includedir): New variable for gawk header files
+	  (ext.c, ext.o): New source and object files
+	  (OTHERS, extension): New directory for macro with example extension
+	  (install): Install header files
+	* acconfig.h (DYNAMIC): New macro, true if can do dynamic loading
+	* array.c (assoc_lookup): New parameter `reference' is true if we
 	  want to do reference  checking. Add appropriate reference checking
 	  code.
-	* awk.h (UNITITIALIZED): new flag
-	  (lintfunc): function pointer for correct function to use
-	  (lintwarn): new macro to produce warnings
-	  (result): new macro for func call result, used in commented out
+	* awk.h (UNITITIALIZED): New flag
+	  (lintfunc): Function pointer for correct function to use
+	  (lintwarn): New macro to produce warnings
+	  (result): New macro for func call result, used in commented out
 	  code in eval.c.
-	  (getnode, freenode): revised to set UNINITIALIZED.
-	  (get_lhs): third arg for reference checking, change all calls
+	  (getnode, freenode): Revised to set UNINITIALIZED.
+	  (get_lhs): Third arg for reference checking, change all calls
 	  -- Add appropriate decls of new/changed functions
-	* awk.y (tokentab): new builtin "extension" for adding extensions
-	  (node_common): set flags to UNINITIALIZED for Node_var.
-	* configure.in (dynamic linking): new check. Probably should
+	* awk.y (tokentab): New builtin "extension" for adding extensions
+	  (node_common): Set flags to UNINITIALIZED for Node_var.
+	* configure.in (dynamic linking): New check. Probably should
 	  be a separate macro.
-	* eval.c (flag2str): add UNINITIALIZED to the table.
-	  (r_tree_eval): add checks for UNINITIALIZED.
-	  (push_args): appropriate changes for UNINITIALIZED to work.
-	  (r_get_lhs): new third argument for reference checking.
-	  (set_LINT): add code to handle setting `lintfunc' appropriately.
-	* ext.c: new file, for doing dynamic library extensions.
-	* extension/*: new directory with simple example code.
-	* main.c (VERSION_node, EXTENSION_node): new nodes for new vars.
-	  (optab): change for "lint" to allow optional argument.
-	  (lintfunc): definition.
-	  (main): add case in option processing for --lint.
-	  (varinit): add entries for VERSION and EXTENSION.
-	* node.c (r_force_number): checks that string really is a number.
-	  (morenodes): set UNITIALIZED in the flags.
-	* re.c (all): change `result' to `res' globally to avoid conflict
+	* eval.c (flag2str): Add UNINITIALIZED to the table.
+	  (r_tree_eval): Add checks for UNINITIALIZED.
+	  (push_args): Appropriate changes for UNINITIALIZED to work.
+	  (r_get_lhs): New third argument for reference checking.
+	  (set_LINT): Add code to handle setting `lintfunc' appropriately.
+	* ext.c: New file, for doing dynamic library extensions.
+	* extension/*: New directory with simple example code.
+	* main.c (VERSION_node, EXTENSION_node): New nodes for new vars.
+	  (optab): Change for "lint" to allow optional argument.
+	  (lintfunc): Definition.
+	  (main): Add case in option processing for --lint.
+	  (varinit): Add entries for VERSION and EXTENSION.
+	* node.c (r_force_number): Checks that string really is a number.
+	  (morenodes): Set UNITIALIZED in the flags.
+	* re.c (all): Change `result' to `res' globally to avoid conflict
 	  with new macro.
-	* GLOBAL: change lint calls to warning() to  lintwarn().
-	* GLOBAL: change all calls to get_lhs() to have 3rd arg.
-	* GLOBAL: change all calls to assoc_lookup() to have 3rd arg.
+	* GLOBAL: Change lint calls to warning() to  lintwarn().
+	* GLOBAL: Change all calls to get_lhs() to have 3rd arg.
+	* GLOBAL: Change all calls to assoc_lookup() to have 3rd arg.
 
 Sun Nov 22 17:07:39 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* patchlev.h: renamed from patchlevel.h to make life
+	* patchlev.h: Renamed from patchlevel.h to make life
 	  easier for the PC guys.
-	  (main.c): changed to include patchlev.h.
-	  (Makefile.in): changed to ref patchlev.h where needed.
+	  (main.c): Changed to include patchlev.h.
+	  (Makefile.in): Changed to ref patchlev.h where needed.
 
 Sat Nov  7 21:29:52 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -4674,53 +5450,54 @@ Sat Nov  7 21:29:52 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
 Thu Nov  5 16:58:38 1998 Arnold D. Robbins  <arnold@skeeve.com>
 
-	* main.c (init_fds): new function to pre-open 0, 1, and 2 on
+	* main.c (init_fds): New function to pre-open 0, 1, and 2 on
 	  /dev/null if they're not open. Robustness, more or less.
-	  (main): call init_fds.
-	* io.c (str2mode): add smarts for two-letter strings
+	  (main): Call init_fds.
+	* io.c (str2mode): Add smarts for two-letter strings
 	  such as "rw", "r+", "wr", "w+" and "a+".
 
 Mon Nov  2 16:55:46 1998 Arnold D. Robbins  <arnold@skeeve.com>
 
-	* builtin.c (do_*): added lint checks for non-numeric
+	* builtin.c (do_*): Added lint checks for non-numeric
 	  and/or non-string arguments, as appropriate. This should
 	  have been done long ago.
 
 Tue Oct 20 21:56:06 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (LINT_node): new variable for LINT special var
-	  (Node_LINT): new node type.
-	  (set_LINT): declare function.
-	* main.c (varinit): add LINT variable.
-	  (usage): print an emphatic pointer to the manual for bug reports.
-	* eval.c (nodetypes): new entry for Node_LINT.
-	  (r_get_lhs): case added for Node_LINT.
-	  (set_LINT): set do_lint from LINT variable.
+	* awk.h (LINT_node): New variable for LINT special var
+	  (Node_LINT): New node type.
+	  (set_LINT): Declare function.
+	* main.c (varinit): Add LINT variable.
+	  (usage): Print an emphatic pointer to the manual for bug reports.
+	* eval.c (nodetypes): New entry for Node_LINT.
+	  (r_get_lhs): Case added for Node_LINT.
+	  (set_LINT): Set do_lint from LINT variable.
 
 Mon Oct 19 22:35:46 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* configure.in: for GCC, add -Wall to get warnings for development.
-	* Makefile.in (awktab.c): move sed stuff to separate script.
-	* bisonfix.sed: new script, with old fix and Solaris x86 fix.
-	* awk.h (nodetype2str): add declaration.
-	  (load_procinfo): add declaration.
+	* configure.in: For GCC, add -Wall to get warnings for development.
+	* Makefile.in (awktab.c): Move sed stuff to separate script.
+	* bisonfix.sed: New script, with old fix and Solaris x86 fix.
+	* awk.h (nodetype2str): Add declaration.
+	  (load_procinfo): Add declaration.
 
 Tue Oct 13 22:28:56 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Changes to make PROCINFO["FS"] reflect the use of FIELDWIDTHS or FS.
-	  eval.c (assign_val): new function that does the mechanics of
+	  Changes to make PROCINFO["FS"] reflect the use of FIELDWIDTHS or FS.
+
+	* eval.c (assign_val): New function that does the mechanics of
 	 	 assignment
-	  main.c (load_procinfo): add setting of PROCINFO["FS"] to "FS".
-	  field.c (update_PROCINFO): new function to update the array.
-	  (set_FS): call update_PROCINFO.
-	  (set_FIELDWIDTHS): ditto.
+	* main.c (load_procinfo): Add setting of PROCINFO["FS"] to "FS".
+	* field.c (update_PROCINFO): New function to update the array.
+	  (set_FS): Call update_PROCINFO.
+	  (set_FIELDWIDTHS): Ditto.
 
 Sun Sep 27 10:18:05 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (reisstring): new prototype.
-	* re.c (reisstring): new function, returns true if the re did
+	* awk.h (reisstring): New prototype.
+	* re.c (reisstring): New function, returns true if the re did
 	  a simple string match. This is rather simplistic in its logic.
-	* io.c (get_a_record): in the case that RS is a regexp, AND
+	* io.c (get_a_record): In the case that RS is a regexp, AND
 	  the re matched at the exact end of the buffer, add a call to
 	  `reisstring' in case it's a simple string match. If so, we
 	  don't need to read more into the buffer because we don't
@@ -4730,32 +5507,32 @@ Sun Sep 27 10:18:05 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
 Thu Aug 13 22:07:40 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (socketopen): fixes from Juergen Kahrs to socket
+	* io.c (socketopen): Fixes from Juergen Kahrs to socket
 	  opening code for "any host".
 
 Tue Jul 14 19:02:33 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* aclocal.m4 (GAWK_AC_LIB_SOCKETS): removed the caching;
+	* aclocal.m4 (GAWK_AC_LIB_SOCKETS): Removed the caching;
 	  configure gave different results the second time it was run!
 
 Fri Jul 10 09:11:06 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* eval.c (interpret): minor cleanups: add variable name to
+	* eval.c (interpret): Minor cleanups: add variable name to
 	  fatal error Node_K_array_for and other minor changes.
 
 Mon Jun 22 16:53:34 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Makefile.in (tags, TAGS): add $(LIBSRC).
+	* Makefile.in (tags, TAGS): Add $(LIBSRC).
 
 Tue Jun  2 15:23:05 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (devopen): relax previous change, don't require "any",
+	* io.c (devopen): Relax previous change, don't require "any",
 	  just that a port be there. The user can put 0 if they
 	  don't care.
 
 Wed May 27 21:33:45 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (devopen): for /inet, require that local and remote
+	* io.c (devopen): For /inet, require that local and remote
 	  ports and the remote hostname be there, and that `any'
 	  be used for a port if they don't care.
 
@@ -4770,102 +5547,102 @@ Mon May  4 12:42:49 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* awk.h (NODETYPE): Sorted the Node_xxx entries for the
 	  builtin variables. Gotta look nice, don't we?
-	* eval.c (nodetypes): ditto.
-	  (genflags2str): added code to check that we don't
+	* eval.c (nodetypes): Ditto.
+	  (genflags2str): Added code to check that we don't
 	  overflow the static buffer. This is just a debugging
 	  routine, not worth the hassle of dynamic allocation.
 
 Mon Mar  2 16:06:16 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Makefile.in (dist): remove any embedded copied RCS or CVS
+	* Makefile.in (dist): Remove any embedded copied RCS or CVS
 	  directories.
 
 Mon Feb 23 00:09:52 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (genflags2str): add declaration.
-	* eval.c (genflags2str): new function.
-	  (flags2str): use new general purpose function.
-	* io.c (redflags2str): same.
+	* awk.h (genflags2str): Add declaration.
+	* eval.c (genflags2str): New function.
+	  (flags2str): Use new general purpose function.
+	* io.c (redflags2str): Same.
 
 Sun Feb 22 23:57:29 1998  Arnold D. Robbins  <arnold@skeeve.com>
 
 	Significant changes to add two-way i/o and sockets!!!
 
-	* Makefile.in: add @SOCKET_LIBS@ to LIBS variable.
-	* acconfig.h: add HAVE_SOCKETS and HAVE_PORTALS defs.
-	* aclocal.m4: new macro GAWK_AC_LIB_SOCKETS.
-	* awk.h: new node type, Node_redirect_twoway, and new redirection
+	* Makefile.in: Add @SOCKET_LIBS@ to LIBS variable.
+	* acconfig.h: Add HAVE_SOCKETS and HAVE_PORTALS defs.
+	* aclocal.m4: New macro GAWK_AC_LIB_SOCKETS.
+	* awk.h: New node type, Node_redirect_twoway, and new redirection
 	  flags: RED_TWOWAY, and RED_SOCKET.
-	* awk.y (parser): add TWOWAYIO token and appropriate productions.
-	  (yylex): recognize `|&' token if not traditional.
-	* builtin.c (do_print, do_printf): flush buffer if TWOWAYIO.
-	* configure.in: add header checks for networking header files,
+	* awk.y (parser): Add TWOWAYIO token and appropriate productions.
+	  (yylex): Recognize `|&' token if not traditional.
+	* builtin.c (do_print, do_printf): Flush buffer if TWOWAYIO.
+	* configure.in: Add header checks for networking header files,
 	  add --enable-portals switch, call GAWK_AC_LIB_SOCKETS
-	* eval.c (nodetypes): add string constant for Node_redirect_twoway.
-	* io.c (redflags2str): new function.
-	  (redirect): better error message in default case, add code for
+	* eval.c (nodetypes): Add string constant for Node_redirect_twoway.
+	* io.c (redflags2str): New function.
+	  (redirect): Better error message in default case, add code for
 	  Node_redirect_twoway.
-	  (socketopen): new function.
-	  (iop_open, devopen): add recognition of `/inet/...'.
-	  (two_way_open): new function.
+	  (socketopen): New function.
+	  (iop_open, devopen): Add recognition of `/inet/...'.
+	  (two_way_open): New function.
 
 Sat Dec 13 21:15:07 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (struct node): new member, `param_list' in union `x', becomes
+	* awk.h (struct node): New member, `param_list' in union `x', becomes
 	  `node->parmlist' in the code.
-	* awk.y (func_install): rearranged a bit, to build up a list of
+	* awk.y (func_install): Rearranged a bit, to build up a list of
 	  the function parameter names and to save it in the `parmlist' field.
-	* eval.c (push_args): new parameter, `varnames', which is the list
+	* eval.c (push_args): New parameter, `varnames', which is the list
 	  of variable names.  Use this to set the vname field of each
 	  parameter's value as it's created. Special case arrays to include
 	  where they came from, mainly for array vs. scalar diagnostics.
-	  (r_tree_eval): don't set the `vname' field for parameters.
-	  (pop_fcall): free the `vname' field if it's an array.
-	  (func_call): pass in the `parmlist' field to call of push_args().
-	  (r_get_lhs): for Node_subscript, change error message to use
+	  (r_tree_eval): Don't set the `vname' field for parameters.
+	  (pop_fcall): Free the `vname' field if it's an array.
+	  (func_call): Pass in the `parmlist' field to call of push_args().
+	  (r_get_lhs): For Node_subscript, change error message to use
 	  the `vname' field.
-	  (stopme): new do-nothing function for use with debugging code
+	  (stopme): New do-nothing function for use with debugging code
 	  and setting breakpoints.
 
 Thu Dec  4 15:18:17 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.y: fixed several lint checks and moved some into
+	* awk.y: Fixed several lint checks and moved some into
 	  test for do_lint_old.
-	* eval.c (fmt_index): add value of bad format spec to
+	* eval.c (fmt_index): Add value of bad format spec to
 	  error message.
 
 Tue Nov 18 22:19:02 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Makefile.in (install): strip the installed binary.
+	* Makefile.in (install): Strip the installed binary.
 	  From Anatoly A. Orehovsky (tolik@mpeks.tomsk.su).
 
 Sun Nov 16 22:12:39 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* array.c (in_array, assoc_lookup): add symbol->vname to
+	* array.c (in_array, assoc_lookup): Add symbol->vname to
 	  fatal calls for scalar in array context.
 
 Wed Nov 12 22:18:33 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h [ISASCII]: on all IS* macros, add cast to unsigned char.
-	  [TOUPPER, TOLOWER]: new macros using unsigned char.
-	* awk.y: change to use of IS* vs. is* macros.
-	* builtin.c (nondec2awknum): change to use of IS* vs. is* macros,
+	* awk.h [ISASCII]: On all IS* macros, add cast to unsigned char.
+	  [TOUPPER, TOLOWER]: New macros using unsigned char.
+	* awk.y: Change to use of IS* vs. is* macros.
+	* builtin.c (nondec2awknum): Change to use of IS* vs. is* macros,
 	  change casts for casetable[] from int to unsigned char.
 	  use new TOLOWER, TOUPPER macros
-	* dfa.c [ISASCII]: on all IS* macros, add cast to unsigned char.
-	  (lex): change isdigit to ISDIGIT.
-	  [TOUPPER, TOLOWER]: new macros using unsigned char, now used.
- 	* eval.c (fmt_ok): change to use of IS* vs. is* macros.
-	* field.c (sc_parse_field): change to use of IS* vs. is* macros,
+	* dfa.c [ISASCII]: On all IS* macros, add cast to unsigned char.
+	  (lex): Change isdigit to ISDIGIT.
+	  [TOUPPER, TOLOWER]: New macros using unsigned char, now used.
+	* eval.c (fmt_ok): Change to use of IS* vs. is* macros.
+	* field.c (sc_parse_field): Change to use of IS* vs. is* macros,
 	  change casts for casetable[] from int to unsigned char.
-	  (set_FS): change to use of IS* vs. is* macros.
-	* io.c (get_a_record): change to use of IS* vs. is* macros,
+	  (set_FS): Change to use of IS* vs. is* macros.
+	* io.c (get_a_record): Change to use of IS* vs. is* macros,
 	  change casts for casetable[] from int to unsigned char.
-	* main.c (main): change to use of IS* vs. is* macros.
-	* node.c (r_force_number, parse_escape): change to use of IS* vs.
+	* main.c (main): Change to use of IS* vs. is* macros.
+	* node.c (r_force_number, parse_escape): Change to use of IS* vs.
 	  is* macros.
-	* re.c (make_regexp): change to use of IS* vs. is* macros.
-	* regex.c [ISASCII]: on all IS* macros, add cast to unsigned char.
+	* re.c (make_regexp): Change to use of IS* vs. is* macros.
+	* regex.c [ISASCII]: On all IS* macros, add cast to unsigned char.
 
 Sun Oct 19 12:36:47 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -4877,17 +5654,17 @@ Wed Oct 15 03:38:12 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
 Thu Oct  9 19:28:39 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* custom.h [SEQUENT]: removed; not needed any more since the
+	* custom.h [SEQUENT]: Removed; not needed any more since the
 	  mmap code was ripped out.
 
 Wed Oct  8 17:22:03 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* configure.in: remove check for madvise; don't need it any more
+	* configure.in: Remove check for madvise; don't need it any more
 	  after nuking use of mmap.
 
 Tue Oct  7 11:14:21 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* eval.c (flags2str): made the code table driven. Shortened a lot.
+	* eval.c (flags2str): Made the code table driven. Shortened a lot.
 
 Tue Sep 30 20:59:17 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -4897,59 +5674,62 @@ Tue Sep 30 20:59:17 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
 Wed Sep 24 20:47:59 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* custom.h [TANDEM]: new changes. Finishes up Tandem
+	* custom.h [TANDEM]: New changes. Finishes up Tandem
 	  integration.
 
 Mon Sep 22 00:42:34 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* custom.h [__be_os]: remove BROKEN_TOKEN definition.
-	  dfa.c, dfa.h: change `token' to `dfa_token' to avoid BeOS
+	* custom.h [__be_os]: Remove BROKEN_TOKEN definition.
+	* dfa.c, dfa.h: Change `token' to `dfa_token' to avoid BeOS
 	  compile problems.
 
 Thu Aug  7 22:35:17 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Changes for BeOS from mc@whoever.com
-	  awk.h (strncasecmp): bracket prototype.
-	  custom.h [__be_os]: new stuff.
-	  dfa.h, dfa.c [BROKEN_TOK]: new ifdefs to use dfa_token, not token.
+	Changes for BeOS from mc@whoever.com
+
+	* awk.h (strncasecmp): Bracket prototype.
+	  custom.h [__be_os]: New stuff.
+	  dfa.h, dfa.c [BROKEN_TOK]: New ifdefs to use dfa_token, not token.
 
 Fri Aug  1 13:32:49 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Tandem changes:
-	  awk.h [TANDEM]: misc additions, as needed.
-	  io.c (get_a_record): changes for fixed length records; not used
+	Tandem changes:
+
+	* awk.h [TANDEM]: Misc additions, as needed.
+	* io.c (get_a_record): Changes for fixed length records; not used
 	  on other systems.
-	  main.c (MRL): new variable, TANDEM specific.
-	  (main): update handling -mr option for TANDEM.
-	  (load_environ): comment out whole routine if TANDEM.
-	  missing.c [TANDEM]: new includes.
-	  gawkmisc.c [TANDEM]: include `tmiscc'.
+	* main.c (MRL): New variable, TANDEM specific.
+	  (main): Update handling -mr option for TANDEM.
+	  (load_environ): Comment out whole routine if TANDEM.
+	  missing.c [TANDEM]: New includes.
+	  gawkmisc.c [TANDEM]: Include `tmiscc'.
 
 Wed Jul 30 19:53:52 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Close-on-exec changes:
-	  awk.h: (os_close_on_exec, os_isdir): new functions.
-	  gawkmisc.c: add include fcntl.h.
-	  configure.in [AC_CHECK_HEADERS]: add fcntl.h.
-	  io.c (devopen, iop_open): change to use os_isdir(), not S_IFDIR().
-	  (redirect, devopen, iop_open, gawk_popen): change all calls to
+	Close-on-exec changes:
+
+	* awk.h: (os_close_on_exec, os_isdir): New functions.
+	* gawkmisc.c: Add include fcntl.h.
+	* configure.in [AC_CHECK_HEADERS]: Add fcntl.h.
+	* io.c (devopen, iop_open): Change to use os_isdir(), not S_IFDIR().
+	  (redirect, devopen, iop_open, gawk_popen): Change all calls to
 	  fcntl() to os_close_on_exec().
 
 Tue Jul 29 11:09:45 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* eval.c (set_BINMODE): fixed check for digits to use isdigit()
+	* eval.c (set_BINMODE): Fixed check for digits to use isdigit()
 	  instead of looping over digits and using strchr(). Duh.
 
 Sat Jul 26 22:52:08 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* eval.c (set_BINMODE): fix so that `-v BINMODE=w' works.
-	* node.c (r_force_number): add decl of strtod(); makes things
+	* eval.c (set_BINMODE): Fix so that `-v BINMODE=w' works.
+	* node.c (r_force_number): Add decl of strtod(); makes things
 	  work on MIPS.
-	* Makefile.in (install-strip): new target.
+	* Makefile.in (install-strip): New target.
 
 Fri Jul 18 13:28:05 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (redirect, devopen, iop_open, gawk_popen): set the
+	* io.c (redirect, devopen, iop_open, gawk_popen): Set the
 	  close-on-exec flag on all files and pipes opened for I/O.
 	  Keeps children run via system() or other pipes from running out
 	  of file descriptors.
@@ -4962,7 +5742,7 @@ Tue Jul  8 22:18:00 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
 Tue Jul  8 06:46:32 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* dfa.c: changes from pjr@jet.UK (Paul J Rippin) from an old
+	* dfa.c: Changes from pjr@jet.UK (Paul J Rippin) from an old
 	  bug report against 2.14.0 that speed up initialization and
 	  rewrite the inner loop into readable code.
 
@@ -4973,83 +5753,86 @@ Thu Jul  3 11:44:50 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
 Sun Jun 29 14:17:37 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.y (exp): fixed warning about `x = /foo/'.
+	* awk.y (exp): Fixed warning about `x = /foo/'.
 
 Wed Jun 25 09:07:57 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* PORTS: removed from distribution.
-	* Makefile.in (MISC): removed PORTS.
+	* PORTS: Removed from distribution.
+	* Makefile.in (MISC): Removed PORTS.
 
 Sun Jun 22 11:52:57 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* BINMODE changes
-	  awk.h (Node_BINMODE): added.
-	  (struct redirect): added mode field to save for io.c:close_one().
-	  (BINMODE, BINMODE_node, set_BINMODE): add declarations.
-	  awk.y (isnoeffect): add Node_BINMODE.
-	  eval.c (nodetypes): add Node_BINMODE string.
-	  (r_tree_eval, r_get_lhs): add cases for Node_BINMODE.
-	  (set_BINMODE): new function.
-	  io.c (binmode): new function.
-	  (nextfile, redirect, gawk_popen): add calls to binmode().
-	  main.c (BINMODE, BINMODE_node): add decls.
-	  (main): add call to setmode() if BINMODE is set.
-	  (varinit): add entry for BINMODE.
+	BINMODE changes.
+
+	* awk.h (Node_BINMODE): Added.
+	  (struct redirect): Added mode field to save for io.c:close_one().
+	  (BINMODE, BINMODE_node, set_BINMODE): Add declarations.
+	* awk.y (isnoeffect): Add Node_BINMODE.
+	* eval.c (nodetypes): Add Node_BINMODE string.
+	  (r_tree_eval, r_get_lhs): Add cases for Node_BINMODE.
+	  (set_BINMODE): New function.
+	* io.c (binmode): New function.
+	  (nextfile, redirect, gawk_popen): Add calls to binmode().
+	* main.c (BINMODE, BINMODE_node): Add decls.
+	  (main): Add call to setmode() if BINMODE is set.
+	  (varinit): Add entry for BINMODE.
 
 Wed Jun  4 21:52:25 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* configure.in [AC_FUNC_MMAP]: removed call.
-	* awk.h [struct iobuf]: removed IOP_MMAPED flag and `getrec' member.
-	* io.c: removed all mmap related code.
+	* configure.in [AC_FUNC_MMAP]: Removed call.
+	* awk.h [struct iobuf]: Removed IOP_MMAPED flag and `getrec' member.
+	* io.c: Removed all mmap related code.
 
 Sun Apr 27 16:23:56 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* aclocal.m4 [GAWK_AC_FUNC_MKTIME]: new macro.
-	* configure.in (GAWK_AC_FUNC_MKTIME): call it.
+	* aclocal.m4 [GAWK_AC_FUNC_MKTIME]: New macro.
+	* configure.in (GAWK_AC_FUNC_MKTIME): Call it.
 
 Thu Apr 24 23:25:06 1997  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (devopen): remove stat test for /dev/foo files. Finally.
+	* io.c (devopen): Remove stat test for /dev/foo files. Finally.
 
 Fri Jul 26 09:23:15 1996  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Changes to add an abort statement, a la tawk
-	  awk.h (Node_K_abort): new enum value for NODETYPE.
-	  main.c (aborting): new flag variable.
-	  (main): add logic to handle aborting.
-	  eval.c (interpret): add case for Node_K_abort.
-	  io.c (do_input): if aborting, break loop.
-	  awk.y (tokentab): add entry for "abort" keyword
-	  (PRODUCTIONS): add production for LEX_ABORT.
+	Changes to add an abort statement, a la tawk.
+
+	* awk.h (Node_K_abort): New enum value for NODETYPE.
+	* main.c (aborting): New flag variable.
+	  (main): Add logic to handle aborting.
+	* eval.c (interpret): Add case for Node_K_abort.
+	* io.c (do_input): If aborting, break loop.
+	* awk.y (tokentab): Add entry for "abort" keyword
+	  (PRODUCTIONS): Add production for LEX_ABORT.
 
 Wed Jul 24 12:49:52 1996  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* First cut at changes for i18n.
-	  awk.h (do_intl): declare new flag variable.
-	  [INTLSTR]: new flag def.
-	  (m_tree_eval): fix definitions for INTLSTR.
-	  (force_string): fix definitions for INTLSTR.
-	  awk.y (yylex): add _"..." for international strings.
-	  (dumpintlstr): new function.
-	  main.c (do_intl): define new flag variable.
-	  (optab): add "gen-po" entry.
-	  (main): if do_intl, exit, don't run the program.
-	  (gawkoption): add "gen-po" entry.
-	  node.c (r_force_string): call gettext if flags indicate INTLSTR.
+	First cut at changes for i18n.
+
+	* awk.h (do_intl): Declare new flag variable.
+	  [INTLSTR]: New flag def.
+	  (m_tree_eval): Fix definitions for INTLSTR.
+	  (force_string): Fix definitions for INTLSTR.
+	* awk.y (yylex): Add _"..." for international strings.
+	  (dumpintlstr): New function.
+	* main.c (do_intl): Define new flag variable.
+	  (optab): Add "gen-po" entry.
+	  (main): If do_intl, exit, don't run the program.
+	  (gawkoption): Add "gen-po" entry.
+	* node.c (r_force_string): Call gettext if flags indicate INTLSTR.
 
 Thu Mar 14 06:29:42 1996  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (do_mktime): added declaration of new function.
-	* builtin.c (do_mktime): new function.
-	* awk.y (tokentab): added "mktime" to list of gawk extensions.
-	* missing.c [HAVE_MKTIME]: added include of mktime.c if needed.
+	* awk.h (do_mktime): Added declaration of new function.
+	* builtin.c (do_mktime): New function.
+	* awk.y (tokentab): Added "mktime" to list of gawk extensions.
+	* missing.c [HAVE_MKTIME]: Added include of mktime.c if needed.
 
 Mon Feb 26 22:32:19 1996  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* io.c (pidopen, useropen): added warnings to use PROCINFO[],
+	* io.c (pidopen, useropen): Added warnings to use PROCINFO[],
 	  not special files.
-	* main.c (load_procinfo): new function.
-	* awk.y (variable): added call to load_procinfo() function.
+	* main.c (load_procinfo): New function.
+	* awk.y (variable): Added call to load_procinfo() function.
 
 Mon Aug  7 15:23:00 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -5057,11 +5840,11 @@ Mon Aug  7 15:23:00 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Thu Aug  3 17:47:53 2000  Greg McGary  <greg@mcgary.org>
 
-	* regex.c: patches for gcc bounded pointer handling.
+	* regex.c: Patches for gcc bounded pointer handling.
 
 Thu Aug  3 13:09:09 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* array.c (in_array, do_delete): fix tests for index equality
+	* array.c (in_array, do_delete): Fix tests for index equality
 	  when searching through the array to work correctly when
 	  index is "".
 
@@ -5073,7 +5856,7 @@ Fri Jul 14 21:40:17 2000  Pat Rankin  <rankin@eql.caltech.edu>
 	  instead of char *; reputedly fixed in V6.1).
 
 	* eval.c (C): New macro.
-	[casetable]: Use it to add explicit casts for the character
+	  [casetable]: Use it to add explicit casts for the character
 	  values outside the range of 0 to 127.
 	* missing/strncasecmp.c [C, charmap]: Likewise.
 
@@ -5083,13 +5866,14 @@ Fri Jul 14 11:57:23 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	Efficiency hack: turn `for (iggy in foo) delete foo[iggy]'
 	into moral equivalent of `delete foo'.
-	* array.c (do_delete_loop): new routine.
-	* awk.h [NODETYPE]: new Node_K_delete_loop value.
+
+	* array.c (do_delete_loop): New routine.
+	* awk.h [NODETYPE]: New Node_K_delete_loop value.
 	  Add declaration of do_delete_loop.
 	* awk.y [LEX_FOR]: Fix code to recognize special case.
-	* eval.c (nodetypes): new entry for Node_K_delete_loop.
-	(interpret): add case for Node_K_delete_loop, add more
-	diagnostic info in default  (cant_happen) case.
+	* eval.c (nodetypes): New entry for Node_K_delete_loop.
+	(interpret): Add case for Node_K_delete_loop, add more
+	diagnostic info in default (cant_happen) case.
 
 Tue Jul 11 22:15:10 2000  Pat Rankin  <rankin@eql.caltech.edu>
 
@@ -5098,9 +5882,9 @@ Tue Jul 11 22:15:10 2000  Pat Rankin  <rankin@eql.caltech.edu>
 
 Tue Jul 11 14:08:23 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* array.c (do_delete): switch to string comparison, not
+	* array.c (do_delete): Switch to string comparison, not
 	  cmp_nodes.
-	  (assoc_find): add call to force_string on subscript.
+	  (assoc_find): Add call to force_string on subscript.
 	* eval.c (interpret): Case Node_K_arrayfor: check for
 	  Node_array_ref and fetch original_array. Yowser.
 
@@ -5116,7 +5900,7 @@ Sun Jun 25 15:08:19 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Wed Jun 14 13:03:45 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* field.c (set_record): manage a private buffer for $0.
+	* field.c (set_record): Manage a private buffer for $0.
 	  Keeps things safe in case `getline var' rearranges the
 	  IOBUF's contents that $0 is still pointing into.
 
@@ -5160,7 +5944,7 @@ Wed Jun  7 13:23:09 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Mon May 22 17:29:43 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* Makefile.in (clean): get `*/core' too.
+	* Makefile.in (clean): Get `*/core' too.
 
 Sun May  7 16:33:05 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
@@ -5170,17 +5954,17 @@ Sun May  7 16:33:05 2000  Arnold D. Robbins  <arnold@skeeve.com>
 Tue May  2 09:54:29 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 	Fix referencing freed memory as shown by test/arynocls.* tests.
-	* awk.h [Node_array_ref]: new node type.
-	  [orig_array]: new macro element in NODE structure.
-	* field.c (do_split): handle case for Node_array_ref, fetch
+	* awk.h [Node_array_ref]: New node type.
+	  [orig_array]: New macro element in NODE structure.
+	* field.c (do_split): Handle case for Node_array_ref, fetch
 	  the original array.
-	* array.c (in_array, do_delete): ditto.
-	* eval.c (nodetypes[]): add Node_array_ref string.
-	  (r_tree_eval): handle case for Node_array_ref.
-	  (push_args): push arrays as Node_array_ref, and pass them on.
-	  (pop_fcall): don't unref lnode if it's an array when releasing
+	* array.c (in_array, do_delete): Ditto.
+	* eval.c (nodetypes[]): Add Node_array_ref string.
+	  (r_tree_eval): Handle case for Node_array_ref.
+	  (push_args): Push arrays as Node_array_ref, and pass them on.
+	  (pop_fcall): Don't unref lnode if it's an array when releasing
 	  local arguments.  Check for both Node_array and Node_array_ref.
-	  (r_get_lhs): choke on Node_array_ref as for Node_array.
+	  (r_get_lhs): Choke on Node_array_ref as for Node_array.
 	  For Node_subscript, handle Node_array_ref.
 
 Tue May  2 09:52:12 2000  Bruno Haible  <haible@clisp.cons.org>
@@ -5212,7 +5996,7 @@ Sun Feb  6 11:39:33 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
 Tue Feb  1 18:41:40 2000  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* eval.c (op_assign): reget the rval after regetting
+	* eval.c (op_assign): Reget the rval after regetting
 	  the left hand side.  See test/opasnslf.awk for why.
 
 Thu Jan 27 18:06:31 2000  Arnold D. Robbins  <arnold@skeeve.com>
@@ -5241,7 +6025,7 @@ Mon Dec  6 15:17:34 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
 Thu Dec  2 13:08:18 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* builtin.c (do_compl): test `d' for negative inside the do_lint
+	* builtin.c (do_compl): Test `d' for negative inside the do_lint
 	  test, not uval.  Ooops.
 
 Fri Nov 26 10:58:36 1999  Arnold D. Robbins  <arnold@skeeve.com>
@@ -5252,7 +6036,7 @@ Fri Nov 26 10:58:36 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
 Tue Nov 23 11:58:53 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* regex.c (SYNTAX): cast argument to `unsigned char' instead of
+	* regex.c (SYNTAX): Cast argument to `unsigned char' instead of
 	  &-ing with 0xFF.  Hopefully somewhat more portable, ala 21 Nov 99
 	  changes to awk.y.
 
@@ -5264,22 +6048,22 @@ Sun Nov 21 22:25:27 1999  Paul Eggert  <eggert@twinsun.com>
 
 Sun Nov 21 20:33:35 1999 Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h (nextc): remove declaration, don't need it here.
+	* awk.h (nextc): Remove declaration, don't need it here.
 	  awk.y (nextc): Cast values to unsigned char so that latin-1
 	  characters in strings don't turn themselves into EOF.
 	  Most notably y-umlaut, which is decimal 255.
 
 Mon Nov  1 20:00:25 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* regex.c (init_syntax_once): move below definition of
+	* regex.c (init_syntax_once): Move below definition of
 	  ISALNUM etc., then use ISALNUM to init the table, so that
 	  the word ops will work if i18n'ed.
 	  (SYNTAX): And subscript with 0xFF for Latin-1 characters.
 
 Mon Oct 25 18:37:13 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.h, main.c, io.c: undo previous changes (22 Oct 1999).
-	* main.c (main): move call to `init_fields()' to before
+	* awk.h, main.c, io.c: Undo previous changes (22 Oct 1999).
+	* main.c (main): Move call to `init_fields()' to before
 	  arg parsing.  This allows `-v NF=blah' to work ok.
 
 Fri Oct 22 17:43:40 1999  Arnold D. Robbins  <arnold@skeeve.com>
@@ -5287,8 +6071,8 @@ Fri Oct 22 17:43:40 1999  Arnold D. Robbins  <arnold@skeeve.com>
 	* main.c (arg_assign): Add new arg, `initing' for icky special
 	  casing of -v of special variables.  Use it to check for NF.
 	  May need to add other cases later.
-	  (pre_assign): change call arg_assign, passing initing=TRUE;
-	  io.c (nextfile): change call arg_assign, passing initing=FALSE;
+	  (pre_assign): Change call arg_assign, passing initing=TRUE;
+	  io.c (nextfile): Change call arg_assign, passing initing=FALSE;
 	  awk.h: Change prototype for arg_assign.
 
 Tue Oct 19 16:06:48 1999  Paul Eggert  <eggert@twinsun.com>
@@ -5298,7 +6082,7 @@ Tue Oct 19 16:06:48 1999  Paul Eggert  <eggert@twinsun.com>
 
 Wed Oct  6 17:47:47 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* main.c (arg_assign): return NULL on bad variable.  Allows
+	* main.c (arg_assign): Return NULL on bad variable.  Allows
 	  things like `./3x=stuff' to work as a filename.
 
 Thu Sep 23 21:35:46 1999  Paul Eggert  <eggert@twinsun.com>
@@ -5317,31 +6101,31 @@ Mon Aug  9 13:06:01 1999  Arnold D. Robbins  <arnold@skeeve.com>
 	  a private copy of each index.  Balloons memory usage for
 	  no good reason that I can see.  Just use dupnode in all
 	  cases.
-	* configure.in: check for $srcdir/.developing adds extra
+	* configure.in: Check for $srcdir/.developing adds extra
 	  defines for my testing/debugging use.  Yes, hack alert.
 
 Sun Aug  1 11:02:02 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* node.c (dupnode): turn off FIELD when copying nodes.
-	* array.c (do_adump, assoc_dump): new functions for array debugging.
-	* awk.y (tokentab): conditionally add "adump" function for debugging.
-	* awk.h: delcare new functions.
+	* node.c (dupnode): Turn off FIELD when copying nodes.
+	* array.c (do_adump, assoc_dump): New functions for array debugging.
+	* awk.y (tokentab): Conditionally add "adump" function for debugging.
+	* awk.h: Delcare new functions.
 
 Thu Jul 29 23:26:40 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
 	From wsanchez@apple.com:
-	* Makefile.in (install-strip): new target, coding stds. compatibility.
+	* Makefile.in (install-strip): New target, coding stds. compatibility.
 	* config.guess, config.sub: Add MacOS X recognition.
 
 Thu Jul 29 19:09:19 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* awk.y (func_install): make `function foo(foo)' a fatal error.
-	  eval.c (r_tree_eval): diagnose use of a function name as a
+	* awk.y (func_install): Make `function foo(foo)' a fatal error.
+	  eval.c (r_tree_eval): Diagnose use of a function name as a
 	  variable inside the function.
 
 Sun Jul  4 16:53:14 1999  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* eval.c (eval_condition): add extra braces to avoid
+	* eval.c (eval_condition): Add extra braces to avoid
 	  gcc warning.  I'm not going to bother for the library
 	  code like dfa and regex.
 
@@ -5351,11 +6135,11 @@ Wed Jun 30 16:14:36 1999  Arnold D. Robbins  <arnold@gnu.org>
 
 Wed Jun 30 16:10:11 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* awk.h: add include of <assert.h>, and comment about config.h
+	* awk.h: Add include of <assert.h>, and comment about config.h
 	  having to be included before any system headers.  Otherwise,
 	  with egcs-2.91.66 and later on Linux systems, and possibly
 	  others, things break badly, due to the LFS macros.
-	* awk.y, builtin.c, eval.c, field.c, io.c: removed include
+	* awk.y, builtin.c, eval.c, field.c, io.c: Removed include
 	  of assert.h
 
 Wed Jun  9 11:39:19 1999  Paul Eggert  <eggert@twinsun.com>
@@ -5377,7 +6161,7 @@ Wed Jun  9 11:39:19 1999  Paul Eggert  <eggert@twinsun.com>
 	* acconfig.h (_FILE_OFFSET_BITS, _LARGEFILE_SOURCE, _LARGE_FILES):
 	  New macros.
 
-	* Makefile.in (MISC): add config.guess and config.sub so they get
+	* Makefile.in (MISC): Add config.guess and config.sub so they get
 	  included in the distribution.
 
 Wed Jun  9 11:29:29 1999  Paul Eggert  <eggert@twinsun.com>
@@ -5401,35 +6185,35 @@ Tue Jun  1 14:24:59 1999  Arnold D. Robbins  <arnold@gnu.org>
 
 Tue May 25 16:32:37 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* builtin.c (format_tree): more smarts for weird cases, such as
+	* builtin.c (format_tree): More smarts for weird cases, such as
 	  zero precisions and zero values used with the `#' flag.
 	  Thanks to Andreas Schwab (schwab@gnu.org) for pointing these out.
 
 Wed May 19 14:02:54 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* io.c (do_close): move test for `close(FILENAME)' to after
+	* io.c (do_close): Move test for `close(FILENAME)' to after
 	  loop through all open redirections. Fixes problems in obscure
 	  cases with redirections in END rules.
 
 Sun May 16 14:08:39 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* awk.y (yylex): fix group of characters including ',' to
+	* awk.y (yylex): Fix group of characters including ',' to
 	  set want_assign = FALSE.  Fixes bizarre parsing problems in
 	  function call lists, for example.
-	* io.c (get_a_record): repair logic for single-leading-newline
+	* io.c (get_a_record): Repair logic for single-leading-newline
 	  case.
 
 Tue May 11 16:48:11 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* aclocal.m4 (GAWK_AC_AIX_TWEAK): new macro.
-	* configure.in: call it
-	* Makefile.in: (awklib/all): pass CFLAGS on to sub-make so
+	* aclocal.m4 (GAWK_AC_AIX_TWEAK): New macro.
+	* configure.in: Call it
+	* Makefile.in: (awklib/all): Pass CFLAGS on to sub-make so
 	  that password programs will get AIX magic defines. Avoids
 	  having to tweak program code for those in doc/gawk.texi.
 
 Mon May  3 16:56:23 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* array.c (do_delete): don't free_temp(subs) until after all
+	* array.c (do_delete): Don't free_temp(subs) until after all
 	  references to it are finished.
 
 Mon May  3 13:41:16 1999  Arnold D. Robbins  <arnold@gnu.org>
@@ -5444,13 +6228,13 @@ Sun May  2 18:25:43 1999  Arnold D. Robbins  <arnold@gnu.org>
 
 Wed Apr 28 12:27:49 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* configure.in: more HP stuff: fix the manual alloca code so that
+	* configure.in: More HP stuff: fix the manual alloca code so that
 	  gawk will compile and link on HP systems. See the comments.
 
 Sun Apr 25 13:39:16 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* Makefile.in (gawk): add $(CFLAGS) to linking step.
-	* configure.in: correctly do AC_FUNC_GETPGRP on HP systems too.
+	* Makefile.in (gawk): Add $(CFLAGS) to linking step.
+	* configure.in: Correctly do AC_FUNC_GETPGRP on HP systems too.
 
 Tue Apr 13 20:21:00 1999  Arnold D. Robbins  <arnold@gnu.org>
 
@@ -5458,14 +6242,14 @@ Tue Apr 13 20:21:00 1999  Arnold D. Robbins  <arnold@gnu.org>
 
 Tue Apr 13 19:02:20 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* io.c (useropen, pidopen): add casts to int on arguments to
+	* io.c (useropen, pidopen): Add casts to int on arguments to
 	  silence gcc warnings.
-	* regex.c (regcomp,regexec,regfree): add ifdef for APPLE.
+	* regex.c (regcomp,regexec,regfree): Add ifdef for APPLE.
 
 Thu Feb  4 10:38:02 1999  Arnold D. Robbins  <arnold@gnu.org>
 
-	* custom.h: hacks for BeOS. Not documented in the manual right now.
-	* configure.in: hacks for BeOS.  Check for HP-UX and define C_ALLOCA
+	* custom.h: Hacks for BeOS. Not documented in the manual right now.
+	* configure.in: Hacks for BeOS.  Check for HP-UX and define C_ALLOCA
 	  if not using gcc.  I wish they'd just fix bison already.
 
 Sun Dec 20 16:57:38 1998  Arnold D. Robbins  <arnold@gnu.org>
@@ -5491,7 +6275,7 @@ Tue Nov  3 16:24:35 1998  Arnold D. Robbins  <arnold@gnu.org>
 
 Sun Nov  1 15:24:52 1998  Arnold D. Robbins  <arnold@gnu.org>
 
-	* builtin.c (format_tree): improve handling of zero-fill
+	* builtin.c (format_tree): Improve handling of zero-fill
 	  when a precision is present. See test/zeroflag.awk.
 
 Wed Oct 28 20:40:17 1998  Arnold D. Robbins  <arnold@gnu.org>
@@ -5503,9 +6287,9 @@ Wed Oct 28 20:40:17 1998  Arnold D. Robbins  <arnold@gnu.org>
 
 Sun Oct 18 21:27:24 1998  Arnold D. Robbins  <arnold@gnu.org>
 
-	* awk.y (append_right): bug fix, if `list' or `new' are NULL,
+	* awk.y (append_right): Bug fix, if `list' or `new' are NULL,
 	  return `list', so that things don't break too badly.
-	* regex.c (re_compile_fastmap): remove unused variable `num_regs'.
+	* regex.c (re_compile_fastmap): Remove unused variable `num_regs'.
 
 Thu Oct  8 19:36:57 1998  Arnold D. Robbins  <arnold@gnu.org>
 
@@ -5519,36 +6303,36 @@ Mon Jul 27 10:14:33 1998  Arnold D. Robbins  <arnold@gnu.org>
 
 Mon Apr 27 11:31:32 1998  Arnold D. Robbins  <arnold@gnu.org>
 
-	* main.c (usage): fix the email address for the bug list.
-	  (copyleft): update the copyright year.
+	* main.c (usage): Fix the email address for the bug list.
+	  (copyleft): Update the copyright year.
 
 Mon Mar 23 21:22:32 1998  Arnold D. Robbins  <arnold@gnu.org>
 
-	* eval.c (r_get_lhs): make sure that values of type
+	* eval.c (r_get_lhs): Make sure that values of type
 	  Node_param_list don't have the FUNC flag set. This means
 	  we don't allow the use of a function name as a variable or
 	  array from within the function.
 
 Sun Mar 22 19:12:32 1998  Paul Eggert  <eggert@twinsun.com>
 
-	* aclocal.m4 (GAWK_AC_LARGE_FILES): new macro that checks for
+	* aclocal.m4 (GAWK_AC_LARGE_FILES): New macro that checks for
 	  large file support, and updates CPPFLAGS, LDFLAGS, LIBS as
 	  needed.
-	* configure.in: call GAWK_AC_LARGE_FILES.
+	* configure.in: Call GAWK_AC_LARGE_FILES.
 	* Makefile.in (CPPFLAGS, LDFLAGS): Let autoconf configure.
 	(COMPFLAGS): Add $(CPPFLAGS).
 
 Mon Mar 16 14:06:41 1998  Arnold D. Robbins  <arnold@gnu.org>
 
-	* field.c (using_FIELDWIDTHS): new macro.
-	  (using_fieldwidths): use new macro.
-	  (do_split): in case for FS_DFLT, also check that
+	* field.c (using_FIELDWIDTHS): New macro.
+	  (using_fieldwidths): Use new macro.
+	  (do_split): In case for FS_DFLT, also check that
 	  we're not using FIELDWIDTHS. Otherwise, split() would use
 	  FIELDWIDTHS, not current value of FS. Oops.
 
 Sun Nov 16 20:08:59 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* builtin.c (sub_common): fix for count of matches in gsub
+	* builtin.c (sub_common): Fix for count of matches in gsub
 	  from Geert.Debyser@esat.kuleuven.ac.be.
 
 Wed Oct 15 03:38:12 1997  Arnold D. Robbins  <arnold@gnu.org>
@@ -5561,35 +6345,35 @@ Wed Oct 15 03:38:12 1997  Arnold D. Robbins  <arnold@gnu.org>
 
 Sun Oct  5 11:56:52 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* configure.in: if ISC add -D_SYSV3 to CFLAGS, per email from
+	* configure.in: If ISC add -D_SYSV3 to CFLAGS, per email from
 	  Mario Vanoni (vanonim@dial.eunet.ch).
 
 Fri Sep 26 00:57:49 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* awk.y (append_right): return if either list is NULL. Prevents
+	* awk.y (append_right): Return if either list is NULL. Prevents
 	  syntax errors from causing core dumps.
 
 Wed Sep 17 15:34:15 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* field.c (rebuild_record): set things up so that all fields point
+	* field.c (rebuild_record): Set things up so that all fields point
 	  into the new record and release any changed fields without
 	  causing memory leaks.  Avoids problems when fields are extended
 	  with the value of $0 or other fields and then $0 is assigned to.
 
 Mon Sep 15 16:12:55 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* builtin.c (do_print): when testing for NUMBER, make sure
+	* builtin.c (do_print): When testing for NUMBER, make sure
 	  it's not a string too. Thanks to Michael Brennan for
 	  clarifying the semantics.
 
 Sun Sep 14 19:55:12 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* node.c (format_val): always format values ourselves: avoids
+	* node.c (format_val): Always format values ourselves: avoids
 	  problems if OFMT is bizarre, like %s.
 
 Sun Sep 14 00:08:53 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* io.c (get_a_record): replace all occurrences of the test
+	* io.c (get_a_record): Replace all occurrences of the test
 	  `grRS == FALSE' with `RS_is_null' which makes ` RS = "\0" '
 	  actually work, is clearer code, and actually makes use of
 	  the `RS_is_null' variable!
@@ -5601,21 +6385,21 @@ Sun Aug 17 07:15:12 1997  Arnold D. Robbins  <arnold@gnu.org>
 
 Wed Aug  6 21:04:37 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* io.c (VMS et al gawk_popen): use pclose, not fclose, if
+	* io.c (VMS et al gawk_popen): Use pclose, not fclose, if
 	  iop_alloc fails.
 
 Wed Jul 30 19:53:52 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* awk.y [variable]: fix case for subscript if $3 == NULL.
+	* awk.y [variable]: Fix case for subscript if $3 == NULL.
 
 Sun Jul 27 22:47:30 1997  Arnold D. Robbins  <arnold@gnu.org>
 
-	* awk.y (get_src_buf): don't close file if it's stdin.
+	* awk.y (get_src_buf): Don't close file if it's stdin.
 
 Sun Jul 27 22:47:15 1997  Pat Rankin  <rankin@eql.caltech.edu>
 
-	* io.c (#if VMS: vmsrtl_fileno): new routine.
-	  (#if VMS: fileno): new macro substituted for stdio one.
+	* io.c (#if VMS: vmsrtl_fileno): New routine.
+	  (#if VMS: fileno): New macro substituted for stdio one.
 
 Thu Jul 17 20:05:59 1997  Arnold D. Robbins  <arnold@gnu.org>
 
@@ -5629,8 +6413,8 @@ Wed Jul 16 10:01:16 1997  Arnold D. Robbins  <arnold@gnu.org>
 	  CHAR_SET_SIZE is not defined, though used in regcomp.  It should
 	  be taken out of #ifdef SYNTAX_TABLE. Fix from bug group, from
 	  Akim Demaille, demaille@inf.enst.fr.
-	* awk.h (isnondecimal): make test a little smarter.
-	  builtin.c (nondec2awknum): add bailout for decimal numbers, e.g.
+	* awk.h (isnondecimal): Make test a little smarter.
+	* builtin.c (nondec2awknum): Add bailout for decimal numbers, e.g.
 	  `00.1'. Fix from Larry Schwimmer <rosebud@cyclone.Stanford.EDU>.
 
 Thu Jun 19 19:00:40 1997  Arnold D. Robbins  <arnold@gnu.org>
@@ -5652,79 +6436,79 @@ Thu May 15 12:49:08 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Wed May 14 08:06:08 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (do_close): add lint warning if closing something that
+	* io.c (do_close): Add lint warning if closing something that
 	  isn't open.
 
 Tue May 13 12:14:12 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* random.c, builtin.c: remove __GLIBC__ tests, since it breaks
+	* random.c, builtin.c: Remove __GLIBC__ tests, since it breaks
 	  `make test'. I prefer consistency across platforms.
-	* Makefile.in (gawk): undid April 25 changes and added comment.
+	* Makefile.in (gawk): Undid April 25 changes and added comment.
 	  Putting COMPLAGS in breaks with -g on VMS POSIX.
 
 Sun May 11 14:48:04 1997  Darrell Hankerson  <hankedr@mail.auburn.edu>
 
-	* io.c [MSC_VER]: add cases for WIN32.
-	* regex.c [MSC_VER]: add cases for WIN32.
+	* io.c [MSC_VER]: Add cases for WIN32.
+	* regex.c [MSC_VER]: Add cases for WIN32.
 
 Sun May 11 07:04:01 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (do_print): in the loop that evaluates each expression
+	* builtin.c (do_print): In the loop that evaluates each expression
 	  to be printed, do a dupnode to avoid bizarre output. Thanks to
 	  Michal for finding this problem.
-	* awk.y (yylex): fix scanning of hexadecimal constants.
+	* awk.y (yylex): Fix scanning of hexadecimal constants.
 
 Wed May  7 15:09:25 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (get_a_record): fix casetable indexing with cast to int.
+	* io.c (get_a_record): Fix casetable indexing with cast to int.
 	  Keeps Michal happy.
 
 Tue May  6 16:40:19 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* eval.c (func_call): removed unneeded variables.
+	* eval.c (func_call): Removed unneeded variables.
 
 Mon May  5 21:17:37 1997  Pat Rankin  <rankin@eql.caltech.edu>
 
-	* missing/strftime.c [case 'v', VMS_EXT]: for VMS date format, two
+	* missing/strftime.c [case 'v', VMS_EXT]: For VMS date format, two
 	  digit day of month should not be zero padded on the 1st through
 	  the 9th.
 
 Mon May  5 06:33:47 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* regex.h, regex.c: merge with current GLIBC version.
+	* regex.h, regex.c: Merge with current GLIBC version.
 
 Mon May  5 06:33:47 1997  Pat Rankin  <rankin@eql.caltech.edu>
 
-	* io.c (nextfile): move the check for null return from iop_open
+	* io.c (nextfile): Move the check for null return from iop_open
 	  in the normal case and add one for the "no args" case.
 
 Fri Apr 25 16:52:33 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* array.c (grow_table): add a bunch more large primes so arrays
+	* array.c (grow_table): Add a bunch more large primes so arrays
 	  can get really big. Thanks to christos@deshaw.com.
-	* all files: remove ifdef'ed out code and update copyrights.
-	* Makefile.in (gawk): add $(COMPFLAGS) to command line.
-	* eval.c (flags2str): added case for FIELD.
+	* all files: Remove ifdef'ed out code and update copyrights.
+	* Makefile.in (gawk): Add $(COMPFLAGS) to command line.
+	* eval.c (flags2str): Added case for FIELD.
 
 Thu Apr 24 22:39:23 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* COPYING: changed to current official version from FSF.
-	* regex.c: merge with GLIBC version.
-	* awk.h [_GNU_SOURCE]: bracket definition inside ifdef.
-	  (NODE.source_line): move name member out of `x' union and
+	* COPYING: Changed to current official version from FSF.
+	* regex.c: Merge with GLIBC version.
+	* awk.h [_GNU_SOURCE]: Bracket definition inside ifdef.
+	  (NODE.source_line): Move name member out of `x' union and
 	  into `nodep'; avoids problems doing diagnostics.
-	  (nondec2num): put decl into #if BITOPS || NONDECDATA
+	  (nondec2num): Put decl into #if BITOPS || NONDECDATA
 	* posix/gawkmisc.c, missing/system.c, missing/strtod.c,
-	  missing/strerror.c: move to generic GPL statement at top.
-	* builtin.c (nondec2num): put into #if BITOPS || NONDECDATA
+	  missing/strerror.c: Move to generic GPL statement at top.
+	* builtin.c (nondec2num): Put into #if BITOPS || NONDECDATA
 
 Wed Apr 23 22:14:14 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* dfa.c: misc changes for really pedantic SGI compilers.
-	* builtin.c: bracket defs of random() etc for GLIBC.
-	* random.c: bracket whole file for GLIBC.
-	* configure.in: extra goop for GETPGRP test for VMS POSIX.
-	* custom.h [VMS]: remove hard definition of GETPGRP_VOID.
+	* dfa.c: Misc changes for really pedantic SGI compilers.
+	* builtin.c: Bracket defs of random() etc for GLIBC.
+	* random.c: Bracket whole file for GLIBC.
+	* configure.in: Extra goop for GETPGRP test for VMS POSIX.
+	* custom.h [VMS]: Remove hard definition of GETPGRP_VOID.
 
 Fri Apr 18 07:55:47 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
@@ -5733,26 +6517,26 @@ Fri Apr 18 07:55:47 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 Tue Apr 15 21:35:45 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 	NEW UNDOCUMENTED FEATURE. USE THE SOURCE LUKE!
-	* acconfig.h [NONDECDATA]: new macro.
-	* awk.h: add decl of do_strtonum.
-	* awk.y (tokentab): add entry for strtonum function.
-	* builtin.c (do_strtonum): new function.
-	* configure.in (non-decimal-data): new --enable-* option.
-	* node.c (r_force_number): change to allow non-decimal data inside
+	* acconfig.h [NONDECDATA]: New macro.
+	* awk.h: Add decl of do_strtonum.
+	* awk.y (tokentab): Add entry for strtonum function.
+	* builtin.c (do_strtonum): New function.
+	* configure.in (non-decimal-data): New --enable-* option.
+	* node.c (r_force_number): Change to allow non-decimal data inside
 	  ifdef NONDECDATA.
 
 Tue Apr 15 06:32:50 1997  Pat Rankin  <rankin@eql.caltech.edu>
 
-	* missing/strftime.c (malloc, realloc, getenv, strchr): only
+	* missing/strftime.c (malloc, realloc, getenv, strchr): Only
 	  declare these when STDC_HEADERS is not defined.
-	  <stdlib.h, string.h>: include these when STDC_HEADERS is defined.
-	* awk.h (freenode, tree_eval, m_tree_eval): reorganize definitions.
-	* alloca.c (malloc): if malloc is already defined as a macro,
+	  <stdlib.h, string.h>: Include these when STDC_HEADERS is defined.
+	* awk.h (freenode, tree_eval, m_tree_eval): Reorganize definitions.
+	* alloca.c (malloc): If malloc is already defined as a macro,
 	  presumeably by config.h, don't define or declare it.
 
 Wed Apr  9 22:45:27 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in [COMPFLAGS]: per suggestion from Karl Berry, put
+	* Makefile.in [COMPFLAGS]: Per suggestion from Karl Berry, put
 	  $(CFLAGS) last.
 
 Tue Apr  8 23:54:46 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
@@ -5764,14 +6548,14 @@ Tue Apr  8 23:54:46 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 Mon Apr  7 18:22:37 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 	* awk.h: Add decls of new routines do_compl() and set_loc().
-	* awk.y (tokentab): add entry for "compl" function.
-	* builtin.c (do_compl): new function to do ones complement.
-	  (do_substr): rationalized yet again, now notices negative start
+	* awk.y (tokentab): Add entry for "compl" function.
+	* builtin.c (do_compl): New function to do ones complement.
+	  (do_substr): Rationalized yet again, now notices negative start
 	  and length parameters.
-	* eval.c (push_args): fix if call_list gets realloc'ed in the
+	* eval.c (push_args): Fix if call_list gets realloc'ed in the
 	  middle of things. Avoids crash for deeply nested function calls.
-	* main.c (catch_sig): add call to set_loc().
-	* msg.c (set_loc, srcfile, srcline): new function and private
+	* main.c (catch_sig): Add call to set_loc().
+	* msg.c (set_loc, srcfile, srcline): New function and private
 	  variables to help out in tracing down source of error messages.
 
 Fri Mar 28 08:42:27 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
@@ -5783,68 +6567,68 @@ Fri Mar 28 08:42:27 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Thu Mar 27 08:48:57 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* custom.h [_SEQUENT_]: undef HAVE_MMAP.
+	* custom.h [_SEQUENT_]: Undef HAVE_MMAP.
 
 Wed Mar 26 09:08:16 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (iop_alloc): fix definition to make it static.
+	* io.c (iop_alloc): Fix definition to make it static.
 
 Mon Mar 24 23:09:07 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* field.c (init_fields, etc..): more clean up use of Null_field
+	* field.c (init_fields, etc..): More clean up use of Null_field
 	  and the various flags.
-	* node.c (unref): if a field, free the node itself. Fixes
+	* node.c (unref): If a field, free the node itself. Fixes
 	  memory leak problems.
 
 Sun Mar 23 22:51:09 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.h [FIELD]: new flag for node->flags field.
-	* builtin.c (sub_common): if FIELD is set, dup the string.
-	* field.c (init_fields): set up a new Null_field global var.
+	* awk.h [FIELD]: New flag for node->flags field.
+	* builtin.c (sub_common): If FIELD is set, dup the string.
+	* field.c (init_fields): Set up a new Null_field global var.
 	  (init_fields, set_field, set_record) use the FIELD flag.
-	  (getfield): use Null_field instead of private variable.
-	* io.c (wait_any): comment out calls to pclose and iop_close,
+	  (getfield): Use Null_field instead of private variable.
+	* io.c (wait_any): Comment out calls to pclose and iop_close,
 	  caused weird race conditions. See test/pipeio1.awk. Thanks
 	  to Darrell Hankerson for tracing this one down.
 
 Tue Mar 18 20:57:18 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* dfa.c (inboth): free templist; plugs memory leak.
+	* dfa.c (inboth): Free templist; plugs memory leak.
 	* field.c (init_fields, grow_fields_arr, set_field, rebuild_record,
-	  set_record): remove PERM flag from entries in fields_arr[]. Fixes
+	  set_record): Remove PERM flag from entries in fields_arr[]. Fixes
 	  nasty memory leak.
 
 Tue Mar 18 06:33:00 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.y (dup_parms): robustified against parameter errors.
+	* awk.y (dup_parms): Robustified against parameter errors.
 
 Sun Mar 16 21:31:40 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 	NEW UNDOCUMENTED FEATURE. USE THE SOURCE LUKE!
-	* acconfig.h [BITOPS]: new macro. If set, do octal & hex and bit ops.
-	* awk.h [isnondecimal]: new macro, and decl of new functions.
-	* awk.y (yylex): add recognition of octal and hex constants.
-	* builtin.c (do_and, do_or, do_xor, do_lshift, do_rshift): new
+	* acconfig.h [BITOPS]: New macro. If set, do octal & hex and bit ops.
+	* awk.h [isnondecimal]: New macro, and decl of new functions.
+	* awk.y (yylex): Add recognition of octal and hex constants.
+	* builtin.c (do_and, do_or, do_xor, do_lshift, do_rshift): New
 	  functions that do bit operations.
-	  (nondec2awknum): new function to convert octal or hex to double.
+	  (nondec2awknum): New function to convert octal or hex to double.
 	* configure.in: Add AC_ARG_ENABLE for bit operations.
-	* node.c (r_force_number): add octal and hex conversion.
+	* node.c (r_force_number): Add octal and hex conversion.
 
 Sun Mar 16 21:28:56 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.h [IOP_NOFREE_OBJ]: new macro.
-	* io.c (iop_open, iop_alloc): add new third parameter, which is
+	* awk.h [IOP_NOFREE_OBJ]: New macro.
+	* io.c (iop_open, iop_alloc): Add new third parameter, which is
 	  either NULL, meaning allocate a new IOP, or the address of one
 	  already allocated.  Have a static one in the `nextfile'
 	  routine, and use the IOP_NOFREE_OBJ flag for it.  All of this
 	  keeps us from reading freed memory. The `swaplns' test fails
 	  otherwise.
-	  (iop_close): if IOP_NOFREE_OBJ is set, don't free the IOBUF.
+	  (iop_close): If IOP_NOFREE_OBJ is set, don't free the IOBUF.
 
 Wed Feb 26 06:21:02 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 	* eval.c (in_function, pop_fcall_stack, pop_fcall, push_args):
-	  new functions. These manage "frames" of awk function call arguments.
+	  New functions. These manage "frames" of awk function call arguments.
 	  The problem is that a `next' or a `nextfile' from a function
 	  leaks memory. These changes allow us to free up that memory.
 	  (interpret): for Node_K_next and Node_K_nextfile, check if in
@@ -5852,29 +6636,30 @@ Wed Feb 26 06:21:02 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Fri Feb 21 06:23:19 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Misc changes from Katsuyuki Okabe <HGC02147@niftyserve.or.jp>:
-	* builtin.c (do_substr): change a %d to %ld in warning message.
-	* eval.c (op_assign): fix format string for warning about %=.
+	Misc changes from Katsuyuki Okabe <HGC02147@niftyserve.or.jp>:
+
+	* builtin.c (do_substr): Change a %d to %ld in warning message.
+	* eval.c (op_assign): Fix format string for warning about %=.
 
 Wed Feb 19 23:29:02 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* main.c (main): add do_intervals to condition that causes
+	* main.c (main): Add do_intervals to condition that causes
 	  resetup() to be called again. Makes the --re-interval option
 	  actually work. What a concept.
 
 Fri Feb 14 09:47:31 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c [#include "awk.h"]: undef HAVE_MMAP to just use the old code.
+	* io.c [#include "awk.h"]: Undef HAVE_MMAP to just use the old code.
 	  Something is causing a file descriptor leak, and this is getting to
 	  be just too much hair. I reserve the right to rip out the mmap
 	  code entirely at a future date.
 
 Tue Feb 11 06:28:29 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (iop_alloc): for an mmap'ed file, close the file descriptor,
+	* io.c (iop_alloc): For an mmap'ed file, close the file descriptor,
 	  and then touch each page to get a private copy. Fixes nasty case
 	  of truncating our input file.
-	  (iop_close): don't call close on mmap'ed file.
+	  (iop_close): Don't call close on mmap'ed file.
 
 Wed Feb  5 17:59:04 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
@@ -5886,34 +6671,34 @@ Wed Feb  5 17:59:04 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Sun Jan 26 22:58:29 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* getopt.h, getopt.c, getopt1.c: replaced with new versions from
+	* getopt.h, getopt.c, getopt1.c: Replaced with new versions from
 	  GLIBC 2.
 
 Sun Jan 19 23:37:03 1997  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* eval.c (nodetype2str): not static, for debugging.
-	  (flags2str) new function: for debugging.
-	* field.c (get_field): add new var that is like Nnull_string but
+	* eval.c (nodetype2str): Not static, for debugging.
+	  (flags2str): New function for debugging.
+	* field.c (get_field): Add new var that is like Nnull_string but
 	  does not have numeric attributes, so that new fields are strings.
-	  (set_record): turn off PERM flag before unrefing fields and field 0.
-	* array.c (in_array): always evaluate subscript, could have
+	  (set_record): Turn off PERM flag before unrefing fields and field 0.
+	* array.c (in_array): Always evaluate subscript, could have
 	  side effects.
-	* builtin.c (do_strftime): way increase size of buffer to make sure
+	* builtin.c (do_strftime): Way increase size of buffer to make sure
 	  we don't have overflow problem. Keeps Paul Eggert happy.
-	* custom.h [__amigaos__]: define fork to vfork. From Fred Fish.
-	* dfa.c: move include of config.h to top, for RSXNT. From Kai
+	* custom.h [__amigaos__]: Define fork to vfork. From Fred Fish.
+	* dfa.c: Move include of config.h to top, for RSXNT. From Kai
 	  Uwe Rommel.
-	  (ISALPHA, etc): change from Jacob Engelbrecht (jaen@novo.dk)
-	  to better handle non-ascii environments.
-	* gawkmisc.c: remove amigados case, posix should now work fine.
-	* amiga/*: nuked per previous entry.
-	* Makefile.in: removed all references to amiga
+	  (ISALPHA, etc): Change from Jacob Engelbrecht (jaen@novo.dk)
+	  to better handle non-ASCII environments.
+	* gawkmisc.c: Remove amigados case, posix should now work fine.
+	* amiga/*: Nuked per previous entry.
+	* Makefile.in: Removed all references to amiga
 	* io.c [HAVE_SYS_PARAM_H]: Add #undef RE_DUP_MAX to avoid
 	  spurious conflict with regex.h.
-	  (flush_io): remove amiga ifdefs, not needed anymore.
-	  (spec_setup): set getrec field for special files. Fix from
+	  (flush_io): Remove amiga ifdefs, not needed anymore.
+	  (spec_setup): Set getrec field for special files. Fix from
 	  Mark Gray (markgray@pdt.net).
-	* node.c (more_nodes): fix to get the last entry in the array.
+	* node.c (more_nodes): Fix to get the last entry in the array.
 
 Wed Jan  8 17:42:37 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
@@ -5932,9 +6717,9 @@ Wed Dec 25 11:25:22 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Wed Dec 25 11:17:32 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in (install, uninstall): use $(srcdir)/patchlevel.h.
+	* Makefile.in (install, uninstall): Use $(srcdir)/patchlevel.h.
 	  Thanks to Richard Levitte, LeViMS@stacken.kth.se.
-	  (install): remove chmod command; let $(INSTALL_PROGRAM) use -m.
+	  (install): Remove chmod command; let $(INSTALL_PROGRAM) use -m.
 
 Mon Dec 23 20:36:59 1996  Pat Rankin  <rankin@eql.caltech.edu>
 
@@ -5942,9 +6727,9 @@ Mon Dec 23 20:36:59 1996  Pat Rankin  <rankin@eql.caltech.edu>
 
 Fri Dec 20 08:59:55 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* getopt.c, getopt1.c: comment out the `#if defined (_LIBC) ||
+	* getopt.c, getopt1.c: Comment out the `#if defined (_LIBC) ||
 	  !defined (__GNU_LIBRARY__)' and `#endif' to force use of this
-	  getopt, even on systems like linux.  This will be handled
+	  getopt, even on systems like Linux.  This will be handled
 	  better in 3.1 / glibc 2.
 
 Thu Dec 19 22:52:39 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
@@ -5955,7 +6740,7 @@ Thu Dec 19 22:52:39 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Wed Dec 18 22:42:10 1996  Darrel Hankerson  <hankedr@mail.auburn.edu>
 
-	* getopt.c (_getopt_internal): if 'W' and ';', if optind == argc,
+	* getopt.c (_getopt_internal): If 'W' and ';', if optind == argc,
 	  return c, don't fall through.
 
 Wed Dec 18 10:09:44 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
@@ -5967,7 +6752,7 @@ Wed Dec 18 10:09:44 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Tue Dec 17 22:23:16 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (do_strftime): fix case if format string is "".
+	* builtin.c (do_strftime): Fix case if format string is "".
 	  Also fix it if format is not "" but result of strftime is "".
 	  See comments in code.
 
@@ -5977,13 +6762,13 @@ Tue Dec 10 23:09:26 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Tue Dec 10 22:39:41 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in (dist): add dependency on `info'. Remove line that
+	* Makefile.in (dist): Add dependency on `info'. Remove line that
 	  does makeinfo.
-	  (install): use $(LN) not $(LN_S) to link gawk gawk-version.
+	  (install): Use $(LN) not $(LN_S) to link gawk gawk-version.
 
 Sun Dec  8 07:53:44 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in (gawk): took COMPFLAGS out of link line for help
+	* Makefile.in (gawk): Took COMPFLAGS out of link line for help
 	  on VMS posix. Shouldn't (I hope) affect anything else.
 
 Thu Nov 28 11:52:24 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
@@ -5998,22 +6783,22 @@ Tue Nov 26 22:42:00 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Sun Nov 24 22:16:26 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (do_printf): if no args, fatal error. Return silently
+	* builtin.c (do_printf): If no args, fatal error. Return silently
 	  if --traditional.
 
 Thu Nov  7 20:54:43 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (inrec): make sure EOF hasn't already happened before
+	* io.c (inrec): Make sure EOF hasn't already happened before
 	  trying to read; prevents accessing freed buffer. Thanks to
 	  Michal Jaegermann.
-	* Makefile.in [AWKSRC]: add random.h.
-	  random.h: new file, redefines names of the `random' functions.
-	  random.c, builtin.c: add include of random.h.
+	* Makefile.in [AWKSRC]: Add random.h.
+	* random.h: New file, redefines names of the `random' functions.
+	* random.c, builtin.c: Add include of random.h.
 
 Thu Nov  7 09:06:21 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.y (snode): undo 4 Oct change, put do_split code back.
-	  field.c (do_split): restore old code; add test for CONST, so
+	* awk.y (snode): Undo 4 Oct change, put do_split code back.
+	* field.c (do_split): Restore old code; add test for CONST, so
 	  that re_parse_field is used if third arg to split is a regexp
 	  constant.
 
@@ -6025,20 +6810,20 @@ Mon Nov  4 12:57:11 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Sun Nov  3 11:23:21 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* field.c (def_parse_field): add \n to list of acceptable white space.
-	  (posix_def_parse_field): new routine, just like def_parse_field(),
+	* field.c (def_parse_field): Add \n to list of acceptable white space.
+	  (posix_def_parse_field): New routine, just like def_parse_field(),
 	  but only allows space and tab as separators.
-	  (do_split, set_FS): make appropriate choice between the two
+	  (do_split, set_FS): Make appropriate choice between the two
 	  *def_parse_field() routines.
 
 Fri Oct 25 10:13:06 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* configure.in: remove test for random.
-	* Makefile.in: add random.c to list of files always compiled.
-	* missing.c: remove HAVE_RANDOM test.
-	* builtin.c: remove ifdef's for HAVE_RANDOM.
-	  [GAWK_RAND_MAX]: use constant we know works with our random().
-	* random.c: new file - moved from missing/ directory.
+	* configure.in: Remove test for random.
+	* Makefile.in: Add random.c to list of files always compiled.
+	* missing.c: Remove HAVE_RANDOM test.
+	* builtin.c: Remove ifdef's for HAVE_RANDOM.
+	  [GAWK_RAND_MAX]: Use constant we know works with our random().
+	* random.c: New file - moved from missing/ directory.
 
 Wed Oct 23 19:46:01 1996  Pat Rankin  <rankin@eql.caltech.edu>
 
@@ -6052,41 +6837,41 @@ Tue Oct 22 21:27:52 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Tue Oct 22 08:49:20 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* main.c (copyleft): update copyright date to 1996.
-	  too many files to list: update copyright date to 1996.
+	* main.c (copyleft): Update copyright date to 1996.
+	* Too many files to list: Update copyright date to 1996.
 
 Sun Oct 20 12:21:09 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.y, dfa.c, eval.c, io.c, re.c: added various FIXME comments.
+	* awk.y, dfa.c, eval.c, io.c, re.c: Added various FIXME comments.
 
 Sat Oct 19 22:06:42 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* eval.c (nodetype2str): make static, add prototype.
-	* field.c (sc_parse_field): cast array subscripts to int to
+	* eval.c (nodetype2str): Make static, add prototype.
+	* field.c (sc_parse_field): Cast array subscripts to int to
 	  shut up gcc warnings.
-	* gawkmisc.c: add prototype for xmalloc.
-	* awk.h: add prototype for getredirect.
-	* builtin.c (do_fflush): remove extern decl of getredirect.
-	* io.c (get_a_record, mmap_get_record): change decl of rs to int,
+	* gawkmisc.c: Add prototype for xmalloc.
+	* awk.h: Add prototype for getredirect.
+	* builtin.c (do_fflush): Remove extern decl of getredirect.
+	* io.c (get_a_record, mmap_get_record): Change decl of rs to int,
 	  to shut up gcc warnings.
-	* awk.y (isassignable): add a default to switch to quiet gcc.
-	* getopt.c (_getopt_internal): give default value to `indfound'.
+	* awk.y (isassignable): Add a default to switch to quiet gcc.
+	* getopt.c (_getopt_internal): Give default value to `indfound'.
 
 Fri Oct 18 09:00:49 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* regex.h [RE_SYNTAX_AWK]: add RE_CONTEXT_INDEP_ANCHORS.
+	* regex.h [RE_SYNTAX_AWK]: Add RE_CONTEXT_INDEP_ANCHORS.
 
 Thu Oct 17 22:32:55 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* aclocal.m4 [AM_SANITY_CHECK_CC]: added.
-	* configure.in: use it.
+	* aclocal.m4 [AM_SANITY_CHECK_CC]: Added.
+	* configure.in: Use it.
 
 Thu Oct 17 21:43:25 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* configure.in: add checks for locale.h and setlocale().
-	  awk.h: include locale.h and define out setlocale() if not available.
-	  main.c (main): call setlocale().
-	  builtin.c (do_tolower, do_toupper): use unsigned char pointers,
+	* configure.in: Add checks for locale.h and setlocale().
+	* awk.h: Include locale.h and define out setlocale() if not available.
+	* main.c (main): Call setlocale().
+	* builtin.c (do_tolower, do_toupper): Use unsigned char pointers,
 	  to get other charsets right in different locales.
 
 Wed Oct 16 21:32:53 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
@@ -6097,9 +6882,9 @@ Wed Oct 16 21:32:53 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Wed Oct 16 21:22:08 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in [MISC]: removed TAGS and tags
-	  (local-distclean): added TAGS and tags
-	  (maintainer-clean): removed TAGS and tags
+	* Makefile.in [MISC]: Removed TAGS and tags.
+	  (local-distclean): Added TAGS and tags.
+	  (maintainer-clean): Removed TAGS and tags.
 
 Wed Oct 16 12:28:43 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
@@ -6108,28 +6893,27 @@ Wed Oct 16 12:28:43 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Sun Oct  6 22:19:45 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* regex.c: updated to Emacs 19.34b base.
+	* regex.c: Updated to Emacs 19.34b base.
 
 Sun Oct  6 21:57:34 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* re.c (make_regexp): fixed to handle \8 and \9 in the middle
+	* re.c (make_regexp): Fixed to handle \8 and \9 in the middle
 	  of a regexp.
 
 Fri Oct  4 10:26:16 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.y (snode): remove case for do_split; always making the
+	* awk.y (snode): Remove case for do_split; always making the
 	  third arg a Node_regex is wrong.
-	  field.c (do_split): rationalized to distinguish `/ /' from `" "'.
+	* field.c (do_split): Rationalized to distinguish `/ /' from `" "'.
 	  Generally fixed up.
 	* node.c (parse_escape): Allow single digit \x escapes.
 
 1996-10-02  Paul Eggert  <eggert@twinsun.com>
 
-	* builtin.c (format_tree):
-	Fix bug in %d and %i format: NaNs, and values
-	in the range LONG_MAX+1 .. ULONG_MAX, were mishandled.
-	Don't assume that double values <= -1 are converted to unsigned
-	long in the expected way; the C Standard doesn't guarantee this.
+	* builtin.c (format_tree): Fix bug in %d and %i format: NaNs, and
+	  values in the range LONG_MAX+1 .. ULONG_MAX, were mishandled.
+	  Don't assume that double values <= -1 are converted to unsigned
+	  long in the expected way; the C Standard doesn't guarantee this.
 
 1996-10-02  Paul Eggert  <eggert@twinsun.com>
 
@@ -6141,37 +6925,37 @@ Mon Sep 30 22:19:11 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 	  by a ';' then search through the long opts table. This makes
 	  `-W foo=bar' same as `--foo=bar'.
 	* main.c (main): 'W' now prints an error message.
-	  (gawk_option): deleted the routine.
+	  (gawk_option): Deleted the routine.
 
 Sun Sep 29 23:04:54 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (sub_common): fix several bugs with gsub when
+	* builtin.c (sub_common): Fix several bugs with gsub when
 	  matching null strings. See test/gsubtest.awk.
 
 Fri Sep 20 17:35:54 1996  Pat Rankin  <rankin@eql.caltech.edu>
 
-	* alloca.c (NULL): don't define if <config.h> has already done so.
+	* alloca.c (NULL): Don't define if <config.h> has already done so.
 
 Fri Sep 20 11:54:31 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (do_print): evaluate all the expressions first and
+	* builtin.c (do_print): Evaluate all the expressions first and
 	  then print them. Avoids surprising behavior. See test/prtoeval.awk
 	  for an example.
 
 Tue Sep 10 06:21:40 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.h [FUNC]: new flag, marks a Node_parameter_list as really
+	* awk.h [FUNC]: New flag, marks a Node_parameter_list as really
 	  being the function name; allows more checking in awk.y.
-	* awk.y (isassignable): now takes a NODE * instead of a type, to
+	* awk.y (isassignable): Now takes a NODE * instead of a type, to
 	  check if a function parameter is marked FUNC, then it's the function
 	  name, which is not assignable. Fix call from snode().
-	  (function_prologue): mark function name as FUNC.
-	  (yyerror): don't call exit() anymore; gawk will now report
+	  (function_prologue): Mark function name as FUNC.
+	  (yyerror): Don't call exit() anymore; gawk will now report
 	  all syntax errors.
 
 Sun Sep  1 19:36:30 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* field.c (rebuild_record): after building new field 0, go through
+	* field.c (rebuild_record): After building new field 0, go through
 	  all old fields, and if they used to point into the old one,
 	  have them point into the new one.  Then turn off PERM flag before
 	  unref-ing field 0.
@@ -6183,62 +6967,62 @@ Wed Aug 28 19:13:34 1996  Arnold D. Robbins  <arnold@math.utah.edu>
 
 Wed Aug 28 22:06:33 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* main.c (usage): add email addresses for bug reporting, per
+	* main.c (usage): Add email addresses for bug reporting, per
 	  change in GNU Coding Standards from RMS.
 
 Sun Aug 11 23:13:22 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in (install): correct use of $(INSTALL_PROGRAM).
+	* Makefile.in (install): Correct use of $(INSTALL_PROGRAM).
 
 Thu Aug  8 23:29:43 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* parse.y (isassignable): new function, checks in type can
+	* parse.y (isassignable): New function, checks in type can
 	  be assigned to.
-	  (snode): changed checking for 3rd arg of gsub to be more
+	  (snode): Changed checking for 3rd arg of gsub to be more
 	  general, supersedes earlier change.
 
 Thu Aug  8 13:58:26 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 	* parse.y (snode): If third arg to sub or gsub is builtin
 	  function, complain, since can't substitute into result.
-	* eval.c (r_get_lhs): diagnose Node_builtin as an error, instead
+	* eval.c (r_get_lhs): Diagnose Node_builtin as an error, instead
 	  of falling through into default case and using cant_happen().
 
 Thu Aug  1 07:13:14 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* regex.h [RE_DEBUG]: new macro.
-	  [RE_SYNTAX_GNU_AWK]: add RE_DEBUG.
-	  [RE_SYNTAX_POSIX_AWK]: add RE_INTERVALS.
-	* regex.c (re_set_syntax): add #ifdef DEBUG code to turn on `debug'
+	* regex.h [RE_DEBUG]: New macro.
+	  [RE_SYNTAX_GNU_AWK]: Add RE_DEBUG.
+	  [RE_SYNTAX_POSIX_AWK]: Add RE_INTERVALS.
+	* regex.c (re_set_syntax): Add #ifdef DEBUG code to turn on `debug'
 	  flag if RE_DEBUG set, and turn off debug if not set and debug
 	  was on.
-	* main.c (main): remove `do_intervals = TRUE' from `if (do_posix)',
+	* main.c (main): Remove `do_intervals = TRUE' from `if (do_posix)',
 	  it's now handled in the definition of RE_SYNTAX_POSIX_AWK.
 
 Mon Jul 29 17:49:07 1996  Pat Rankin  <rankin@eql.caltech.edu>
 
-	* io.c (O_ACCMODE): define it if <fcntl.h> doesn't.
+	* io.c (O_ACCMODE): Define it if <fcntl.h> doesn't.
 
 Mon Jul 29 12:02:48 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* eval.c (set_IGNORECASE): made somewhat smarter. gawk -v IGNORECASE=0
+	* eval.c (set_IGNORECASE): Made somewhat smarter. gawk -v IGNORECASE=0
 	  was acting the same as -v IGNORECASE=1. Thanks to Darrell Hankerson
 	  for the bug report.
 
 Fri Jul 26 12:04:43 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.h (format_val): add declaration of new routine.
-	* node.c (format_val): new routine, abstracts old guts of
+	* awk.h (format_val): Add declaration of new routine.
+	* node.c (format_val): New routine, abstracts old guts of
 	  r_forcestring; accepts format string and index as additional params.
-	  (r_force_string): changed to call format_val.
-	* builtin.c (do_print):  don't tree_eval the tree twice in case
+	  (r_force_string): Changed to call format_val.
+	* builtin.c (do_print):  Don't tree_eval the tree twice in case
 	  OFMTidx != CONVFMTidx; doing so could cause side effects
 	  (from bug report by Tobias Rettstadt, xassp@ipds.uni-kiel.de).
 	  Instead, call format_val.
 
 Mon Jul 22 21:59:15 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (iop_close): change check for "is $0 in the input buffer"
+	* io.c (iop_close): Change check for "is $0 in the input buffer"
 	  to use `< (iop->buf + iop->secsiz + iop->size)' instead of
 	  `< iop->end'. The latter is bogus if EOF has been hit on the
 	  file.  Fix from Darrel Hankerson based on bug report by
@@ -6246,14 +7030,14 @@ Mon Jul 22 21:59:15 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Thu Jul 18 19:43:20 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (sub_common): backed out change of Feb 14 in favor of:
+	* builtin.c (sub_common): Backed out change of Feb 14 in favor of:
 	  (do_gensub): Changed to use make_string and then to |= TEMP
 	  flag, based on bug report and patch from Katsuyuki Okabe,
 	  hgc02147@niftyserve.or.jp.
 
 Thu Jul 18 19:23:53 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* custom.h: added ifdef for QNX, based on bug report from
+	* custom.h: Added ifdef for QNX, based on bug report from
 	  Michael Hunter, mphunter@qnx.com.
 
 Mon Jul 15 09:31:01 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
@@ -6265,69 +7049,69 @@ Mon Jul 15 09:31:01 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Sun Jul 14 18:40:26 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* configure.in: added call to AC_CHECK_LIB(m, fmod), since
+	* configure.in: Added call to AC_CHECK_LIB(m, fmod), since
 	  apparently some systems have fmod in the math library.
-	  Portability: the Holy Grail.  Sigh.
+	  Portability: The Holy Grail.  Sigh.
 
 Sun Jul 14 18:08:01 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* awk.h: add Jim Meyerings ISASCII etc hacks for ctype macros.
-	* builtin.c (do_toupper, do_tolower, sub_common): changed to use
+	* awk.h: Add Jim Meyerings ISASCII etc hacks for ctype macros.
+	* builtin.c (do_toupper, do_tolower, sub_common): Changed to use
 	  upper-case versions of ctype macros.
-	* main.c (main): ditto.
-	* node.c (r_force_number, parse_escape): ditto.
+	* main.c (main): Ditto.
+	* node.c (r_force_number, parse_escape): Ditto.
 
 Sun Jul 14 06:34:18 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* field.c (set_record): made it always do the PERM flag.
+	* field.c (set_record): Made it always do the PERM flag.
 	  Fixes cases where $0 is assigned to, e.g. by gsub, keeps
 	  the fields valid.
-	  (get_field): removed the call to reset_record in
+	  (get_field): Removed the call to reset_record in
 	  case where ! field0_valid. We want to leave the fields alone
 	  if they've been changed.
 
 Thu Jul 11 23:04:20 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (devopen): change tests of (flag & O_fooONLY) to
+	* io.c (devopen): Change tests of (flag & O_fooONLY) to
 	  (flag & O_ACCMODE) == O_fooONLY. Per (long standing) bug
 	  report from Chapman Flack.
-	  (close_redir): change final conditional to just (status != 0)
+	  (close_redir): Change final conditional to just (status != 0)
 	  so that ERRNO always set; the warning had its own `if (do_lint)'
 	  anyway.
-	* eval.c (do_split): force type of array to be Node_var_array
+	* eval.c (do_split): Force type of array to be Node_var_array
 	  instead of Node_var.  Per (long standing) bug report from
 	  Chapman Flack.
 
 Thu Jul 11 22:17:14 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in (install): added symlink of gawk to awk if
+	* Makefile.in (install): Added symlink of gawk to awk if
 	  no awk in $(bindir).
-	  (LN_S): new variable for symlinking.
-	  (uninstall): remove awk if it's the same gawk.
+	  (LN_S): New variable for symlinking.
+	  (uninstall): Remove awk if it's the same gawk.
 	* Configure.in: Added call to AC_PROG_LN_S for Makefile.in.
 
 Sun Jul  7 15:47:13 1996  Arnold D. Robbins  <arnold@infographix.com>
 
-	* main.c (main): made `--posix' turn on interval expressions.
+	* main.c (main): Made `--posix' turn on interval expressions.
 	  Gawk now matches its documentation. (What a concept!)
 
 Wed Jul  3 15:02:48 1996  Arnold D. Robbins  <arnold@infographix.com>
 
-	* regex.h, regex.c: upgraded to changes from Emacs 19.31.
+	* regex.h, regex.c: Upgraded to changes from Emacs 19.31.
 
 Fri May 17 08:46:07 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (get_a_record): added `continued' flag. Fix from
+	* io.c (get_a_record): Added `continued' flag. Fix from
 	  Darrell Hankerson for when RS = "\n|something".
 
 Wed May 15 02:34:55 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in (awklib/all): now depends on gawk, fixes problem
+	* Makefile.in (awklib/all): Now depends on gawk, fixes problem
 	  with parallel make.
 
 Tue May 14 15:02:52 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (format_tree): fix handling of '*' to deal with
+	* builtin.c (format_tree): Fix handling of '*' to deal with
 	  negative value for fieldwidth -- make positive and turn on
 	  left justify. Per bug report from Michael Brennan.
 
@@ -6338,27 +7122,27 @@ Sun May 12 20:42:06 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Sun May  5 10:11:52 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (redirect): call flush_io() before creating a new output pipe,
+	* io.c (redirect): Call flush_io() before creating a new output pipe,
 	  per bug report from Brian Kernighan (bwk@research.bell-labs.com).
 
 Fri Mar 15 06:38:33 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* Makefile.in (install): use $(INSTALL_PROGRAM), not $(INSTALL).
-	  (local-distclean): add `*~' to list of files to be removed.
-	  (CFLAGS): now contains just @CFLAGS@.
-	  (COMPFLAGS): replaces use of CFLAGS, has CFLAGS plus all the
+	* Makefile.in (install): Use $(INSTALL_PROGRAM), not $(INSTALL).
+	  (local-distclean): Add `*~' to list of files to be removed.
+	  (CFLAGS): Now contains just @CFLAGS@.
+	  (COMPFLAGS): Replaces use of CFLAGS, has CFLAGS plus all the
 	  other stuff.
 
 Wed Mar 13 14:19:38 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (mmap_get_record): fixed to not place sentinel at end
+	* io.c (mmap_get_record): Fixed to not place sentinel at end
 	  of mmap'ed object. Won't work if file is exact multiple of
 	  disk block size. See comments in code for more info.
 	  Thanks to Rick Adams (rick@uunet.uu.net) for help in testing.
 
 Sun Mar 10 22:50:23 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* io.c (do_close): notice if we were called as `close(FILENAME)'
+	* io.c (do_close): Notice if we were called as `close(FILENAME)'
 	  and arrange to close the current input file. This turns out
 	  to be easy to do, just call `nextfile(TRUE)'. Based on bug report
 	  from Pascal A. Dupuis, <dupuis@lei.ucl.ac.be>.
@@ -6374,58 +7158,58 @@ Thu Mar  7 08:08:51 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 	* field.c (set_NF): If NF is decremented, clear fields between
 	  NF and parse_high_water, otherwise if NF incremented, clear
 	  fields between parse_high_water and NF.
-	* eval.c (nodetype2str): new function, used for diagnostics.
-	  eval.c (interpret): use nodetype2str when finding invalid node.
+	* eval.c (nodetype2str): New function, used for diagnostics.
+	  (interpret): Use nodetype2str when finding invalid node.
 
 Mon Mar  4 09:02:28 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (do_toupper, do_tolower): use isascii along with
+	* builtin.c (do_toupper, do_tolower): Use isascii along with
 	  isupper/islower before changing case, in case characters have
 	  the high bit set. This is a hack.
 
 Mon Feb 26 22:24:44 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (sub_common): if no match, and called from gensub,
+	* builtin.c (sub_common): If no match, and called from gensub,
 	  don't free the temporary string, since the tmp_number then
 	  writes over it.
 
 Sun Feb 25 23:13:01 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (format_tree): fixed %c to treat user input as
+	* builtin.c (format_tree): Fixed %c to treat user input as
 	  numeric also by adding test for MAYBE_NUM.
 
 Tue Feb 20 12:25:50 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 	* configure.in: Added AC_FUNC_MMAP call and add madvise to
 	  list of functions to look for.
-	* awk.h [IOP_ISMAPPED]: new flag value for mmap support and new
+	* awk.h [IOP_ISMAPPED]: New flag value for mmap support and new
 	  `getrec' structure member in struct iobuf.
-	* io.c (iop_alloc, iop_close): changed to map/unmap input file
+	* io.c (iop_alloc, iop_close): Changed to map/unmap input file
 	  into memory if possible.
-	  (mmap_get_record): new function to actually retrieve the
+	  (mmap_get_record): New function to actually retrieve the
 	  record from mmaped file.
 
 Thu Feb  1 08:56:46 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (do_substr): fixed lint message to use indx+1 when
+	* builtin.c (do_substr): Fixed lint message to use indx+1 when
 	  start position is past end of string.
 
 Sun Jan 28 07:00:56 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (do_substr): rationalized handling of missing length
+	* builtin.c (do_substr): Rationalized handling of missing length
 	  argument, as well as various accompanying lint warnings. Previous
 	  code was slightly bogus. Talk about your Day 1 bugs.
 
 Thu Jan 25 14:09:11 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* builtin.c (do_substr): if length exceeds length of actual
+	* builtin.c (do_substr): If length exceeds length of actual
 	  string, do computation of needed substring length *after*
 	  the lint warning.
 
 Wed Jan 24 10:06:16 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 	* Makefile.in (gawk): Add $(CFLAGS) to link line.
-	  (Makefile): target depends on the Makefile.in files.
+	  (Makefile): Target depends on the Makefile.in files.
 	  (OTHERS): Added TAGS and tags to the distribution.
 	  (local-distclean): New rule.
 	  (distclean): Use it.
@@ -6436,15 +7220,15 @@ Wed Jan 24 10:06:16 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 Mon Jan 22 13:16:37 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* main.c (usage): takes new fp parameter which is either
+	* main.c (usage): Takes new fp parameter which is either
 	  stdout for `--help' (per the GNU Coding Standards) or stderr
 	  if an error occurs. Fix all calls.
-	  (version): prints to stdout per the coding stds.
-	  (copyleft): prints to stdout now, not stderr, and exits.
+	  (version): Prints to stdout per the coding stds.
+	  (copyleft): Prints to stdout now, not stderr, and exits.
 
 Fri Jan 19 08:10:29 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
-	* regex.h [RE_GNU_AWK]: added RE_CONTEXT_INDEP_OPS to set of
+	* regex.h [RE_GNU_AWK]: Added RE_CONTEXT_INDEP_OPS to set of
 	  bits we turn off for regular operation. Breaks things like
 	  /^+[0-9]+/ to match a literal `+' at the beginning of, say,
 	  a phone number.
@@ -6461,8 +7245,8 @@ Wed Dec 27 11:46:16 1995  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 Mon Aug 28 23:04:30 1995  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
 
 	* awk.h updated for NeXT - bracket TRUE/FALSE
-	* io.c (get_a_record): removed shadowing of 'start' in
-	* Makefile.in and doc/Makefile.in: fixed to use gawk.1 and gawk.texi,
+	* io.c (get_a_record): Removed shadowing of 'start' in
+	* Makefile.in and doc/Makefile.in: Fixed to use gawk.1 and gawk.texi,
 	  instead of gawk.1.in and gawk.texi.in.
 
 Mon Aug 25 11:04:30 1995  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
diff --git a/FUTURES b/FUTURES
index f591ad3c..8747b1da 100644
--- a/FUTURES
+++ b/FUTURES
@@ -1,3 +1,9 @@
+  Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+  
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
 This file lists future projects and enhancements for gawk.  Items are listed
 in roughly the order they will be done for a given release.  This file is
 mainly for use by the developers to help keep themselves on track, please
@@ -40,13 +46,15 @@ For 3.2
 
 	Make POSIX 2001 behavior the default for sub/gsub.
 
+	Add IPv6 support.
+
+	Add an optional base to strtonum, allowing 2-36.
+
 	Simplify awk.h.
 
 	Consider moving var_value info into Node_var itself
 	to reduce memory usage.
 
-	Add IPv6 support.
-
 	Look at ISO C 99 printf features.
 
 	Consider integrating Fred Fish's DBUG library into gawk.
diff --git a/INSTALL b/INSTALL
index 56b077d6..5458714e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
 
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -78,7 +78,7 @@ details on some of the pertinent environment variables.
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
@@ -87,31 +87,29 @@ Compiling For Multiple Architectures
 
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
 
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +157,7 @@ where SYSTEM can have one of these forms:
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
@@ -190,12 +188,12 @@ them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
diff --git a/LIMITATIONS b/LIMITATIONS
index 05e8bc41..719f018a 100644
--- a/LIMITATIONS
+++ b/LIMITATIONS
@@ -1,3 +1,9 @@
+  Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+  
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
 This file describes limits of gawk on a Unix system (although it
 is variable even then).  Non-Unix systems may have other limits.
 
diff --git a/Makefile.am b/Makefile.am
index 3a913150..af7b12f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 2000-2005 the Free Software Foundation, Inc.
+# Copyright (C) 2000-2007 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 #
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GAWK is distributed in the hope that it will be useful,
@@ -24,7 +24,7 @@
 ## process this file with automake to produce Makefile.in
 
 # Automatic de-ANSI-fication if needed, make .bz2 files also.
-AUTOMAKE_OPTIONS = ansi2knr dist-bzip2
+AUTOMAKE_OPTIONS = dist-bzip2
 
 # This undocumented variable insures that aclocal runs
 # correctly after changing configure.ac
@@ -88,6 +88,7 @@ base_sources = \
 	dfa.h \
 	ext.c \
 	field.c \
+	floatcomp.c \
 	gawkmisc.c \
 	getopt.c \
 	getopt.h \
@@ -128,15 +129,11 @@ AM_CPPFLAGS =
 # Get rid of core files when cleaning
 CLEANFILES = core core.*
 
-MAINTAINERCLEANFILES = version.c awkgram.c
+MAINTAINERCLEANFILES = version.c
 
 # We want hard links for install-exec-hook, below
 LN= ln
 
-SUFFIXES = .i
-.c.i:
-	$(COMPILE) -E $< > $@
-
 # First, add a link from gawk to gawk-X.Y.Z.
 # Same for pgawk.
 #
@@ -166,18 +163,27 @@ check-local: gawk$(EXEEXT) pgawk$(EXEEXT)
 # FIXME: most of this rule should go away upon switching to libtool.
 dist-hook:
 	cd $(distdir)/extension ; rm -f *.o *.so
+	cd $(distdir) ; find . -type d -name CVS | xargs rm -fr
 
 # Special rules for individual files
 awkgram.c: awkgram.y
 	$(YACC) $(AM_YFLAGS) $(YFLAGS) $<
-	awk -f $(srcdir)/bisonfix.awk y.tab.c > $*.c && rm y.tab.c
+	$(AWK) -f $(srcdir)/bisonfix.awk y.tab.c > $*.c && rm y.tab.c
 	if test -f y.tab.h; then \
 	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
 	else :; fi
 
+version.c: config.status version.in
+	$(SHELL) ./config.status --file=version.c:version.in
+
 # This is for my development & testing.
 efence: gawk
 	$(CC) $(LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LIBS) -lefence
 
-diffout:
-	@$(MAKE) -C test $@
+diffout valgrind-scan:
+	@cd test && $(MAKE) $(AM_MAKEFLAGS) $@
+
+valgrind:
+	cd test; rm -f log.[0-9]*; \
+	make check AWK="valgrind --log-file=log ../gawk"; \
+	make valgrind-scan
diff --git a/Makefile.in b/Makefile.in
index 4fb6a59e..6c69fa28 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,14 +17,14 @@
 #
 # Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 2000-2005 the Free Software Foundation, Inc.
+# Copyright (C) 2000-2007 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 #
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GAWK is distributed in the hope that it will be useful,
@@ -37,16 +37,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
-SOURCES = $(gawk_SOURCES) $(pgawk_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -60,55 +54,52 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-ANSI2KNR = @ANSI2KNR@
 bin_PROGRAMS = gawk$(EXEEXT) pgawk$(EXEEXT)
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/configh.in \
-	$(srcdir)/version.in $(top_srcdir)/configure ABOUT-NLS AUTHORS \
-	COPYING ChangeLog INSTALL NEWS ansi2knr.1 ansi2knr.c awkgram.c \
-	config.guess config.rpath config.sub depcomp install-sh \
-	missing mkinstalldirs ylwrap
-subdir = .
+	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
+	INSTALL NEWS awkgram.c config.guess config.rpath config.sub \
+	depcomp install-sh missing mkinstalldirs ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/socket.m4 \
-	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intmax_t.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/stdint_h.m4 \
 	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = version.c
+CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__objects_1 = array$U.$(OBJEXT) awkgram$U.$(OBJEXT) \
-	builtin$U.$(OBJEXT) dfa$U.$(OBJEXT) ext$U.$(OBJEXT) \
-	field$U.$(OBJEXT) gawkmisc$U.$(OBJEXT) getopt$U.$(OBJEXT) \
-	getopt1$U.$(OBJEXT) io$U.$(OBJEXT) main$U.$(OBJEXT) \
-	msg$U.$(OBJEXT) node$U.$(OBJEXT) random$U.$(OBJEXT) \
-	re$U.$(OBJEXT) regex$U.$(OBJEXT) replace$U.$(OBJEXT) \
-	version$U.$(OBJEXT)
-am_gawk_OBJECTS = $(am__objects_1) eval$U.$(OBJEXT) \
-	profile$U.$(OBJEXT)
+am__objects_1 = array.$(OBJEXT) awkgram.$(OBJEXT) builtin.$(OBJEXT) \
+	dfa.$(OBJEXT) ext.$(OBJEXT) field.$(OBJEXT) \
+	floatcomp.$(OBJEXT) gawkmisc.$(OBJEXT) getopt.$(OBJEXT) \
+	getopt1.$(OBJEXT) io.$(OBJEXT) main.$(OBJEXT) msg.$(OBJEXT) \
+	node.$(OBJEXT) random.$(OBJEXT) re.$(OBJEXT) regex.$(OBJEXT) \
+	replace.$(OBJEXT) version.$(OBJEXT)
+am_gawk_OBJECTS = $(am__objects_1) eval.$(OBJEXT) profile.$(OBJEXT)
 gawk_OBJECTS = $(am_gawk_OBJECTS)
 gawk_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 gawk_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_pgawk_OBJECTS = $(am__objects_1) eval_p$U.$(OBJEXT) \
-	profile_p$U.$(OBJEXT)
+am_pgawk_OBJECTS = $(am__objects_1) eval_p.$(OBJEXT) \
+	profile_p.$(OBJEXT)
 pgawk_OBJECTS = $(am_pgawk_OBJECTS)
 pgawk_LDADD = $(LDADD)
 pgawk_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -121,10 +112,13 @@ SOURCES = $(gawk_SOURCES) $(pgawk_SOURCES)
 DIST_SOURCES = $(gawk_SOURCES) $(pgawk_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -143,8 +137,6 @@ distcleancheck_listfiles = find . -type f -print
 # Directory for gawk's data files. Automake supplies datadir.
 pkgdatadir = $(datadir)/awk
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -164,6 +156,9 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -180,8 +175,9 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -201,12 +197,14 @@ U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -218,31 +216,42 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # Automatic de-ANSI-fication if needed, make .bz2 files also.
-AUTOMAKE_OPTIONS = ansi2knr dist-bzip2
+AUTOMAKE_OPTIONS = dist-bzip2
 
 # This undocumented variable insures that aclocal runs
 # correctly after changing configure.ac
@@ -305,6 +314,7 @@ base_sources = \
 	dfa.h \
 	ext.c \
 	field.c \
+	floatcomp.c \
 	gawkmisc.c \
 	getopt.c \
 	getopt.h \
@@ -338,16 +348,15 @@ AM_CPPFLAGS =
 
 # Get rid of core files when cleaning
 CLEANFILES = core core.*
-MAINTAINERCLEANFILES = version.c awkgram.c
+MAINTAINERCLEANFILES = version.c
 
 # We want hard links for install-exec-hook, below
 LN = ln
-SUFFIXES = .i
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .i .c .o .obj .y
+.SUFFIXES: .c .o .obj .y
 am--refresh:
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -385,7 +394,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/configh.in $(top_builddir)/config.status
@@ -398,11 +407,9 @@ $(srcdir)/configh.in:  $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-version.c: $(top_builddir)/config.status $(srcdir)/version.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -425,116 +432,57 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 gawk$(EXEEXT): $(gawk_OBJECTS) $(gawk_DEPENDENCIES) 
 	@rm -f gawk$(EXEEXT)
-	$(LINK) $(gawk_LDFLAGS) $(gawk_OBJECTS) $(gawk_LDADD) $(LIBS)
+	$(LINK) $(gawk_OBJECTS) $(gawk_LDADD) $(LIBS)
 pgawk$(EXEEXT): $(pgawk_OBJECTS) $(pgawk_DEPENDENCIES) 
 	@rm -f pgawk$(EXEEXT)
-	$(LINK) $(pgawk_LDFLAGS) $(pgawk_OBJECTS) $(pgawk_LDADD) $(LIBS)
+	$(LINK) $(pgawk_OBJECTS) $(pgawk_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
-ansi2knr: ansi2knr.$(OBJEXT)
-	$(LINK) ansi2knr.$(OBJEXT) $(LIBS)
-ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
-
-clean-krextra:
-	-rm -f ansi2knr
-
-mostlyclean-kr:
-	-test "$U" = "" || rm -f *_.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/awkgram$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/builtin$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dfa$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval_p$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/field$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gawkmisc$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profile$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profile_p$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/re$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replace$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version$U.Po@am__quote@
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/awkgram.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/builtin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dfa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval_p.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/field.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floatcomp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gawkmisc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profile_p.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/re.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replace.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-array_.c: array.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/array.c; then echo $(srcdir)/array.c; else echo array.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-awkgram_.c: awkgram.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/awkgram.c; then echo $(srcdir)/awkgram.c; else echo awkgram.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-builtin_.c: builtin.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/builtin.c; then echo $(srcdir)/builtin.c; else echo builtin.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-dfa_.c: dfa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dfa.c; then echo $(srcdir)/dfa.c; else echo dfa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-eval_.c: eval.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/eval.c; then echo $(srcdir)/eval.c; else echo eval.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-eval_p_.c: eval_p.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/eval_p.c; then echo $(srcdir)/eval_p.c; else echo eval_p.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-ext_.c: ext.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ext.c; then echo $(srcdir)/ext.c; else echo ext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-field_.c: field.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/field.c; then echo $(srcdir)/field.c; else echo field.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-gawkmisc_.c: gawkmisc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gawkmisc.c; then echo $(srcdir)/gawkmisc.c; else echo gawkmisc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-getopt_.c: getopt.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-getopt1_.c: getopt1.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-io_.c: io.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/io.c; then echo $(srcdir)/io.c; else echo io.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-main_.c: main.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/main.c; then echo $(srcdir)/main.c; else echo main.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-msg_.c: msg.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/msg.c; then echo $(srcdir)/msg.c; else echo msg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-node_.c: node.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/node.c; then echo $(srcdir)/node.c; else echo node.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-profile_.c: profile.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/profile.c; then echo $(srcdir)/profile.c; else echo profile.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-profile_p_.c: profile_p.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/profile_p.c; then echo $(srcdir)/profile_p.c; else echo profile_p.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-random_.c: random.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/random.c; then echo $(srcdir)/random.c; else echo random.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-re_.c: re.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/re.c; then echo $(srcdir)/re.c; else echo re.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-regex_.c: regex.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/regex.c; then echo $(srcdir)/regex.c; else echo regex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-replace_.c: replace.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/replace.c; then echo $(srcdir)/replace.c; else echo replace.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-version_.c: version.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/version.c; then echo $(srcdir)/version.c; else echo version.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-array_.$(OBJEXT) awkgram_.$(OBJEXT) builtin_.$(OBJEXT) dfa_.$(OBJEXT) \
-eval_.$(OBJEXT) eval_p_.$(OBJEXT) ext_.$(OBJEXT) field_.$(OBJEXT) \
-gawkmisc_.$(OBJEXT) getopt_.$(OBJEXT) getopt1_.$(OBJEXT) io_.$(OBJEXT) \
-main_.$(OBJEXT) msg_.$(OBJEXT) node_.$(OBJEXT) profile_.$(OBJEXT) \
-profile_p_.$(OBJEXT) random_.$(OBJEXT) re_.$(OBJEXT) regex_.$(OBJEXT) \
-replace_.$(OBJEXT) version_.$(OBJEXT) : $(ANSI2KNR)
 
 .y.c:
-	$(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
-uninstall-info-am:
+	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -567,8 +515,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -670,24 +617,22 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/m4 $(distdir)/po
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -701,7 +646,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -709,6 +654,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -719,7 +666,7 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -794,7 +741,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -816,11 +763,11 @@ distcleancheck: distclean
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
-all-am: Makefile $(ANSI2KNR) $(PROGRAMS) config.h
+all-am: Makefile $(PROGRAMS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -851,7 +798,7 @@ maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic clean-krextra mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -872,14 +819,22 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -891,7 +846,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
 pdf: pdf-recursive
 
@@ -901,30 +856,29 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-exec-am install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am check-local clean clean-binPROGRAMS clean-generic \
-	clean-krextra clean-recursive ctags ctags-recursive dist \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am check-local clean \
+	clean-binPROGRAMS clean-generic ctags ctags-recursive dist \
 	dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \
 	dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-recursive \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-exec-hook install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-kr mostlyclean-recursive pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am
-
-.c.i:
-	$(COMPILE) -E $< > $@
+	distclean-generic distclean-hdr distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
 
 # First, add a link from gawk to gawk-X.Y.Z.
 # Same for pgawk.
@@ -955,21 +909,30 @@ check-local: gawk$(EXEEXT) pgawk$(EXEEXT)
 # FIXME: most of this rule should go away upon switching to libtool.
 dist-hook:
 	cd $(distdir)/extension ; rm -f *.o *.so
+	cd $(distdir) ; find . -type d -name CVS | xargs rm -fr
 
 # Special rules for individual files
 awkgram.c: awkgram.y
 	$(YACC) $(AM_YFLAGS) $(YFLAGS) $<
-	awk -f $(srcdir)/bisonfix.awk y.tab.c > $*.c && rm y.tab.c
+	$(AWK) -f $(srcdir)/bisonfix.awk y.tab.c > $*.c && rm y.tab.c
 	if test -f y.tab.h; then \
 	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
 	else :; fi
 
+version.c: config.status version.in
+	$(SHELL) ./config.status --file=version.c:version.in
+
 # This is for my development & testing.
 efence: gawk
 	$(CC) $(LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LIBS) -lefence
 
-diffout:
-	@$(MAKE) -C test $@
+diffout valgrind-scan:
+	@cd test && $(MAKE) $(AM_MAKEFLAGS) $@
+
+valgrind:
+	cd test; rm -f log.[0-9]*; \
+	make check AWK="valgrind --log-file=log ../gawk"; \
+	make valgrind-scan
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/NEWS b/NEWS
index 673a9cce..a0ba8dbf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,87 @@
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
+   
+   Copying and distribution of this file, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.
+ 
+Changes from 3.1.5 to 3.1.6
+---------------------------
+
+1. `gawk 'program' /non/existant/file' no longer core dumps.
+
+2. Too many people the world over have complained about gawk's use of the
+   locale's decimal point for parsing input data instead of the traditional
+   period.  So, even though gawk was being nicely standards-compliant, in
+   a Triumph For The Users, gawk now only uses the locale's decimal point
+   if --posix is supplied or if POSIXLY_CORRECT is set.  It is the sincere
+   hope that this change will eliminate this FAQ from being asked.
+
+3. `gawk -v BINMODE=1 ...' works again.
+
+4. Internal file names like `/dev/user' now work again. (Note that these
+   file names are obsolete and will go away eventually.)
+
+5. Problems with wide strings in non "C" locales have been straightened
+   out everywhere.  (At least, we think so.)
+
+6. Use of `ansi2knr' is no longer supported. Please use an ANSI C compiler.
+
+7. Updated to Autoconf 2.61, Automake 1.10, and Gettext 0.16.1.
+
+8. The getopt* and regex* files were synchronized with current GLIBC CVS.
+   See the ChangeLog for the versions and minor edits made.
+
+9. There are additional --lint-old warnings.
+
+10. Gawk now uses getaddrinfo(3) to look up names and IP addresses. This
+    allows the use of an IPv6 format address and paves the way for
+    eventual addition of `/inet6/...' and `/inet4/...' hostnames.
+
+11. We believe gawk to now be valgrind clean. At least when run against
+    the test suite.
+
+12. A number of issues dealing with the formatting and printing of very
+    large numbers in integer formats have been dealt with and fixed.
+
+13. Gawk now converts "+inf", "-inf", "+nan" and "-nan" into the corresponding
+    magic IEEE floating point values. Only those strings (case independent)
+    work.  With --posix, gawk calls the system strtod directly. You asked
+    for it, you got it, you deal with it.
+
+14. Defining YYDEBUG enables the -D command line option.
+
+15. Gawk should now work out of the box on Tandem NSK/OSS systems.
+
+16. Lint messages rationalized: many more of the messages are now printed
+    only once, instead of every time they are encountered.
+
+17. The strftime() function now accepts an optional third argument, which
+    if non-zero or non-null, indicates that the time should be formatted
+    as UTC instead of as local time.
+
+18. The precedence of concatenation and `| getline' (in something like
+    "echo " "date" | getline stuff) has been reverted to the earlier
+    behavior and now once again matches Unix awk.
+
+19. New configure time flag --disable-directories-fatal which causes
+    gawk to silently skip directories on the command line.  This behavior
+    is also enabled for --traditional, since it's what Unix awk does.
+
+20. A new option, --use-lc-numeric, forces use of the locale's decimal
+    point without the rest of the draconian restrictions imposed by
+    --posix. This softens somewhat the stance taken in item #2.
+
+21. Everything relevant has been updated to the GPL 3.
+
+22. Array growth should be faster now, at no cost in space.
+
+23. Lots more tests.
+
+24. One new translation.
+
+25. Various bugs fixed, see the ChangeLog for details.
+
 Changes from 3.1.4 to 3.1.5
 ---------------------------
 
diff --git a/POSIX.STD b/POSIX.STD
index 04d31fcf..e5e01836 100644
--- a/POSIX.STD
+++ b/POSIX.STD
@@ -1,3 +1,66 @@
+  Copyright (C) 1992, 1995, 1998, 2001, 2006, 2007
+  Free Software Foundation, Inc.
+  
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+--------------------------------------------------------------------------
+Mon May  7 14:38:32 IDT 2007
+============================
+
+Thanks to Andrew Schorr for some of the wording here.
+
+<quote>
+The Open Group awk specification says that a string value shall
+be converted to a numeric value using the ISO C standard atof()
+function.  The awk spec is here:
+
+	http://www.opengroup.org/onlinepubs/009695399/utilities/awk.html
+
+And the ISO C standard says that atof() shall work the same way
+as strtod(), and strtod() must recognize the IEEE special values
+for NaN (not-a-number) and Infinity.
+</quote>
+
+As a result, more than one gawk user has come to the conclusion that
+gawk is not standard compliant since it does not support converting
+these special values.
+
+Similar reasoning has led other users to conclude that gawk must also
+support input data in the format of C99-style hexadecimal floating point
+numbers.
+
+I, Arnold Robbins, the gawk maintainer, feel that while these interpretations
+of the standard can be made, they are _unintended_ side effects of the
+change in the POSIX standard to refer to the ISO C99 standard everywhere.
+
+With resepct to hexadecimal floating point, historically, AWK has always
+supported the input of only decimal numbers.  Adding such a facility is
+likely to break many programs, very badly, and is a very big departure
+from historical practice.
+
+With respect to "NaN" and "Inf" values, many people point out that Unix
+awk and mawk "support the standard" and print such values in their output.
+This is _accidental_ support, since these programs are relying on the
+system library version of strtod/atof to do the work.  If compiled on a
+system without such library support, those programs do NOT support the
+special IEEE values.
+
+These special interpretations introduce a large departure from existing
+practice:
+
+	# Thanks to Brian Kernighan for this great example
+	$ nawk 'BEGIN { print "Nancy Reagan" + 0 }'
+	nan
+
+This is just plain wrong. String values with no leading digits must
+continue to convert to numeric zero.
+
+The POSIX people have been asked to clarify these issues, and not recently,
+but have not, to my knowledge, done so.  Further discussion is provided
+in the node "POSIX Floating Point Problems" in the gawk manual.
+
+---------- Stuff below this line is of historical interest only ----------
 March 2001:
 
 It looks like the revised 1003.2 standard will actually follow the
diff --git a/PROBLEMS b/PROBLEMS
index 0a2f77d5..072d56e7 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -1,3 +1,9 @@
+  Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+  
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
 This is a list of known problems in gawk 3.1.
 I don't know when this will be fixed, if ever.  See also FUTURES
 and the gawk.texi doc for other things that need doing.
diff --git a/README b/README
index 84e515a4..12064292 100644
--- a/README
+++ b/README
@@ -1,17 +1,22 @@
+  Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+  
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
 README:
 
-This is GNU Awk 3.1.5. It is upwardly compatible with the Bell Labs
+This is GNU Awk 3.1.6. It is upwardly compatible with the Bell Labs
 research version of awk.  It is almost completely compliant with the
-1993 POSIX 1003.2 standard for awk. (See the note below about POSIX.)
+2004 POSIX 1003.1 standard for awk. (See the note below about POSIX.)
 
 This is a bug fix release. See NEWS and ChangeLog for details.
 
 Work to be done is described briefly in the FUTURES file.  Changes in this
 version are summarized in the NEWS file. Please read the LIMITATIONS file.
 
-Read the file POSIX.STD for a discussion of how the standard says
-comparisons should be done vs. how they really should be done and how
-gawk does them.
+Read the file POSIX.STD for a discussion of issues where the standard
+says one thing but gawk does something different.
 
 To format the documentation with TeX, use at least version 2000-10-27.17
 of texinfo.tex. There is a usable copy of texinfo.tex in the doc directory.
@@ -32,8 +37,8 @@ You might want to get a copy of bison from the FSF too.)
 If you have a Windows32, MS-DOS or OS/2 system, use the stuff in the `pc'
 directory.  Similarly, there is a separate directory for VMS.
 
-Ports for the Atari and Tandem are supplied, but they are unsupported.
-Thus, their code appears in the `unsupported' directory.
+Ports for the Atari and old Tandem systems are supplied, but they are
+unsupported.  Thus, their code appears in the `unsupported' directory.
 
 Appendix B of ``GAWK: Effective Awk Programming'' discusses configuration
 in detail. The configuration process is based on GNU Autoconf and
@@ -82,7 +87,7 @@ BeOS:
 
 MS-DOS:
 	Scott Deifik
-	scottd@amgen.com
+	scottd.mail@sbcglobal.net
 
 	Darrel Hankerson
 	hankedr@mail.auburn.edu
@@ -97,6 +102,11 @@ OS/2:
 Tandem:
 	Stephen Davies
 	scldad@sdc.com.au
+	(Original Tandem port)
+
+	Ralf Wildenhues
+	<Ralf.Wildenhues@gmx.de>
+	POSIX-compliant Tandem systems
 
 VMS:
 	Pat Rankin
diff --git a/README_d/README.FIRST b/README_d/OBSOLETE/README.FIRST
index ef527f20..4957cb32 100644
--- a/README_d/README.FIRST
+++ b/README_d/OBSOLETE/README.FIRST
@@ -18,4 +18,4 @@ If you send me email about this, without having read this
 file, I will yell at you.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
diff --git a/README_d/README.linux b/README_d/OBSOLETE/README.linux
index a4cdb69d..9ba15c51 100644
--- a/README_d/README.linux
+++ b/README_d/OBSOLETE/README.linux
@@ -10,7 +10,7 @@ Removing and redoing the symlinks fixes the problem.  It is fixed in
 post-4.1 RedHat Linux.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
 
 Sun Aug  3 15:07:06 EDT 1997
 
@@ -18,4 +18,4 @@ As of version 3.1 of gawk, this is no longer a problem, since gawk now
 completely interprets the special file names internally.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
diff --git a/README_d/README.sco b/README_d/OBSOLETE/README.sco
index 81307443..71494b77 100644
--- a/README_d/README.sco
+++ b/README_d/OBSOLETE/README.sco
@@ -19,13 +19,12 @@ If you complain to me about this, I will fuss at you for not having
 done your homework.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
 
 ---------------------------
 Date: 14 Oct 1997 12:17 +0000
 From: Leigh Hebblethwaite <LHebblethwaite@transoft.com>
 To: bug-gnu-utils@prep.ai.mit.edu
-To: arnold@gnu.org
 
 I've just built gawk 3.0.3 on my system and have experienced a problem 
 with the routine pipeio2.awk in the test suite. However the problem 
diff --git a/README_d/README.sony b/README_d/OBSOLETE/README.sony
index 61f1be8e..29ba875e 100644
--- a/README_d/README.sony
+++ b/README_d/OBSOLETE/README.sony
@@ -9,4 +9,4 @@ This system has the same problem with the test/tweakfld case that Ultrix MIPS
 has. See the README.ultrix file for details.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
diff --git a/README_d/README.ultrix b/README_d/OBSOLETE/README.ultrix
index 917f02f5..917f02f5 100644
--- a/README_d/README.ultrix
+++ b/README_d/OBSOLETE/README.ultrix
diff --git a/README_d/README.yacc b/README_d/OBSOLETE/README.yacc
index e198c070..6332986b 100644
--- a/README_d/README.yacc
+++ b/README_d/OBSOLETE/README.yacc
@@ -7,4 +7,4 @@ nested control structures, such as those in `awf'.
 The problem goes away if you use either bison or Berkeley yacc.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
diff --git a/README_d/README.macos b/README_d/README.macos
index 46a68621..684e0281 100644
--- a/README_d/README.macos
+++ b/README_d/README.macos
@@ -1,3 +1,8 @@
+Mon Jun 11 05:37:03 IDT 2007
+============================
+
+The notes below no longer seem to apply.
+
 Mon Jul  4 09:55:22 IDT 2005
 ============================
 
@@ -10,7 +15,6 @@ All the other tests pass.
 Happily, the default is for the multibyte support to be enabled, so all
 the tests pass by defualt.
 
-The notes below no longer seem to apply.
 
 Sun Dec  3 18:11:09 IST 2000
 ============================
@@ -25,4 +29,4 @@ If you ask me about either of these I will fuss at you for not having
 done your homework.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
diff --git a/README_d/README.pc b/README_d/README.pc
index 37ad6679..9ee2f12f 100644
--- a/README_d/README.pc
+++ b/README_d/README.pc
@@ -364,7 +364,7 @@ Visual C++ target, and for additional help on changes for Windows32.
 If you have any problems with the DOS or OS/2 versions of Gawk, 
 please send bug reports (along with the version and compiler used) to 
 
-   Scott Deifik, scottd@amgen.com (DOS versions)
+   Scott Deifik, scottd.mail@sbcglobal.net (DOS versions)
 or
    gawk-maintainer@unixos2.org (OS/2 version)
    Darrel Hankerson, hankedr@mail.auburn.edu
diff --git a/README_d/README.sgi b/README_d/README.sgi
index ef22dfa6..5d754a81 100644
--- a/README_d/README.sgi
+++ b/README_d/README.sgi
@@ -17,4 +17,4 @@ If you ask me about this, I will fuss at you for not having done
 your homework!
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
diff --git a/README_d/README.solaris b/README_d/README.solaris
index 499ea4d8..4b5affd4 100644
--- a/README_d/README.solaris
+++ b/README_d/README.solaris
@@ -37,7 +37,7 @@ Tue Oct 20 21:25:11 IST 1998
 This has been fixed in 3.1.0 with the bisonfix.sed script.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
 
 Solaris Problem #2:
 ===================
@@ -51,7 +51,7 @@ less than 256 (see fdopen(3)).
 IMHO this is Sun's problem, not mine.
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
 
 Solution (a) to Problem #2:
 ===========================
@@ -92,7 +92,7 @@ Aharon Robbins wrote to Paul Nevai:
 # 	IMHO this is Sun's problem, not mine.
 # 	
 # 	Arnold Robbins
-# 	arnold@gnu.org
+# 	arnold@skeeve.com
 # 
 # Double check your settings with ulimit; I suspect that this is
 # your problem.
diff --git a/README_d/README.sunos4 b/README_d/README.sunos4
index da3f0cb1..7cef0684 100644
--- a/README_d/README.sunos4
+++ b/README_d/README.sunos4
@@ -8,7 +8,7 @@ If you send me email about this without having read this file, I will
 fuss at you!
 
 Arnold Robbins
-arnold@gnu.org
+arnold@skeeve.com
 
 Tue Jan 30 07:01:39 EST 1996
 
diff --git a/README_d/README.tests b/README_d/README.tests
index 1c969d75..4b3d74b4 100644
--- a/README_d/README.tests
+++ b/README_d/README.tests
@@ -1,6 +1,5 @@
 Date: Sat, 22 Apr 2000 06:07:06 -0600 (MDT)
 From: "Nelson H. F. Beebe" <beebe@math.utah.edu>
-To: arnold@gnu.org
 Cc: beebe@math.utah.edu, sysstaff@math.utah.edu, othmer@math.utah.edu
 Subject: gawk-3.0.4 and a GNU/Linux gotcha
 
diff --git a/aclocal.m4 b/aclocal.m4
index 5e4b23e8..d3e9a04b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,12 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -21,14 +26,29 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -83,39 +103,16 @@ AC_PREREQ([2.50])dnl
 am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# This was merged into AC_PROG_CC in Autoconf.
-
-AU_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-AC_DIAGNOSE([obsolete], [$0:
-	your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
-	`ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
-	you adjust the code.  You can also remove the above call to
-	AC_PROG_CC if you already called it elsewhere.])
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-])
-AU_DEFUN([fp_PROG_CC_STDC])
-
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -124,8 +121,10 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -139,15 +138,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -175,6 +173,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -240,6 +239,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -292,7 +292,8 @@ if test "x$enable_dependency_tracking" != xno; then
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -317,8 +318,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -365,8 +367,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -389,16 +391,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -418,6 +424,9 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -453,6 +462,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -488,7 +501,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -566,14 +579,14 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -589,6 +602,7 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -599,7 +613,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -607,60 +621,23 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -695,14 +672,14 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 AC_DEFUN([AM_C_PROTOTYPES],
 [AC_REQUIRE([AC_C_PROTOTYPES])
@@ -713,9 +690,10 @@ else
 fi
 # Ensure some checks needed by ansi2knr itself.
 AC_REQUIRE([AC_HEADER_STDC])
-AC_CHECK_HEADERS(string.h)
-AC_SUBST(U)dnl
-AC_SUBST(ANSI2KNR)dnl
+AC_CHECK_HEADERS([string.h])
+AC_SUBST([U])dnl
+AC_SUBST([ANSI2KNR])dnl
+_AM_SUBST_NOTMAKE([ANSI2KNR])dnl
 ])
 
 AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
@@ -797,9 +775,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
@@ -897,10 +887,13 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([m4/arch.m4])
+m4_include([m4/codeset.m4])
 m4_include([m4/gettext.m4])
 m4_include([m4/iconv.m4])
 m4_include([m4/intmax_t.m4])
 m4_include([m4/inttypes_h.m4])
+m4_include([m4/isc-posix.m4])
+m4_include([m4/lcmessage.m4])
 m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
 m4_include([m4/lib-prefix.m4])
@@ -910,6 +903,5 @@ m4_include([m4/po.m4])
 m4_include([m4/progtest.m4])
 m4_include([m4/socket.m4])
 m4_include([m4/stdint_h.m4])
-m4_include([m4/strtod.m4])
 m4_include([m4/uintmax_t.m4])
 m4_include([m4/ulonglong.m4])
diff --git a/ansi2knr.1 b/ansi2knr.1
deleted file mode 100644
index f9ee5a63..00000000
--- a/ansi2knr.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH ANSI2KNR 1 "19 Jan 1996"
-.SH NAME
-ansi2knr \- convert ANSI C to Kernighan & Ritchie C
-.SH SYNOPSIS
-.I ansi2knr
-[--varargs] input_file [output_file]
-.SH DESCRIPTION
-If no output_file is supplied, output goes to stdout.
-.br
-There are no error messages.
-.sp
-.I ansi2knr
-recognizes function definitions by seeing a non-keyword identifier at the left
-margin, followed by a left parenthesis, with a right parenthesis as the last
-character on the line, and with a left brace as the first token on the
-following line (ignoring possible intervening comments).  It will recognize a
-multi-line header provided that no intervening line ends with a left or right
-brace or a semicolon.  These algorithms ignore whitespace and comments, except
-that the function name must be the first thing on the line.
-.sp
-The following constructs will confuse it:
-.br
-     - Any other construct that starts at the left margin and follows the
-above syntax (such as a macro or function call).
-.br
-     - Some macros that tinker with the syntax of the function header.
-.sp
-The --varargs switch is obsolete, and is recognized only for
-backwards compatibility.  The present version of
-.I ansi2knr
-will always attempt to convert a ... argument to va_alist and va_dcl.
-.SH AUTHOR
-L. Peter Deutsch <ghost@aladdin.com> wrote the original ansi2knr and
-continues to maintain the current version; most of the code in the current
-version is his work.  ansi2knr also includes contributions by Francois
-Pinard <pinard@iro.umontreal.ca> and Jim Avera <jima@netcom.com>.
diff --git a/ansi2knr.c b/ansi2knr.c
deleted file mode 100644
index a042674d..00000000
--- a/ansi2knr.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/* Copyright (C) 1989, 2000 Aladdin Enterprises.  All rights reserved. */
-
-/*$Id: ansi2knr.c,v 1.3 2000/04/13 03:41:48 lpd Exp $*/
-/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
-
-/*
-ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY.  No author or distributor accepts responsibility to anyone for the
-consequences of using it or for whether it serves any particular purpose or
-works at all, unless he says so in writing.  Refer to the GNU General Public
-License (the "GPL") for full details.
-
-Everyone is granted permission to copy, modify and redistribute ansi2knr,
-but only under the conditions described in the GPL.  A copy of this license
-is supposed to have been given to you along with ansi2knr so you can know
-your rights and responsibilities.  It should be in a file named COPYLEFT,
-or, if there is no file named COPYLEFT, a file named COPYING.  Among other
-things, the copyright notice and this notice must be preserved on all
-copies.
-
-We explicitly state here what we believe is already implied by the GPL: if
-the ansi2knr program is distributed as a separate set of sources and a
-separate executable file which are aggregated on a storage medium together
-with another program, this in itself does not bring the other program under
-the GPL, nor does the mere fact that such a program or the procedures for
-constructing it invoke the ansi2knr executable bring any other part of the
-program under the GPL.
-*/
-
-/*
- * Usage:
-	ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]
- * --filename provides the file name for the #line directive in the output,
- * overriding input_file (if present).
- * If no input_file is supplied, input is read from stdin.
- * If no output_file is supplied, output goes to stdout.
- * There are no error messages.
- *
- * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis, with a
- * right parenthesis as the last character on the line, and with a left
- * brace as the first token on the following line (ignoring possible
- * intervening comments and/or preprocessor directives), except that a line
- * consisting of only
- *	identifier1(identifier2)
- * will not be considered a function definition unless identifier2 is
- * the word "void", and a line consisting of
- *	identifier1(identifier2, <<arbitrary>>)
- * will not be considered a function definition.
- * ansi2knr will recognize a multi-line header provided that no intervening
- * line ends with a left or right brace or a semicolon.  These algorithms
- * ignore whitespace, comments, and preprocessor directives, except that
- * the function name must be the first thing on the line.  The following
- * constructs will confuse it:
- *	- Any other construct that starts at the left margin and
- *	    follows the above syntax (such as a macro or function call).
- *	- Some macros that tinker with the syntax of function headers.
- */
-
-/*
- * The original and principal author of ansi2knr is L. Peter Deutsch
- * <ghost@aladdin.com>.  Other authors are noted in the change history
- * that follows (in reverse chronological order):
-
-	lpd 2000-04-12 backs out Eggert's changes because of bugs:
-	- concatlits didn't declare the type of its bufend argument;
-	- concatlits didn't recognize when it was inside a comment;
-	- scanstring could scan backward past the beginning of the string; when
-	- the check for \ + newline in scanstring was unnecessary.
-
-	2000-03-05  Paul Eggert  <eggert@twinsun.com>
-
-	Add support for concatenated string literals.
-	* ansi2knr.c (concatlits): New decl.
-	(main): Invoke concatlits to concatenate string literals.
-	(scanstring): Handle backslash-newline correctly.  Work with
-	character constants.  Fix bug when scanning backwards through
-	backslash-quote.  Check for unterminated strings.
-	(convert1): Parse character constants, too.
-	(appendline, concatlits): New functions.
-	* ansi2knr.1: Document this.
-
-	lpd 1999-08-17 added code to allow preprocessor directives
-		wherever comments are allowed
-	lpd 1999-04-12 added minor fixes from Pavel Roskin
-		<pavel_roskin@geocities.com> for clean compilation with
-		gcc -W -Wall
-	lpd 1999-03-22 added hack to recognize lines consisting of
-		identifier1(identifier2, xxx) as *not* being procedures
-	lpd 1999-02-03 made indentation of preprocessor commands consistent
-	lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
-		endless loop; quoted strings within an argument list
-		confused the parser
-	lpd 1999-01-24 added a check for write errors on the output,
-		suggested by Jim Meyering <meyering@ascend.com>
-	lpd 1998-11-09 added further hack to recognize identifier(void)
-		as being a procedure
-	lpd 1998-10-23 added hack to recognize lines consisting of
-		identifier1(identifier2) as *not* being procedures
-	lpd 1997-12-08 made input_file optional; only closes input and/or
-		output file if not stdin or stdout respectively; prints
-		usage message on stderr rather than stdout; adds
-		--filename switch (changes suggested by
-		<ceder@lysator.liu.se>)
-	lpd 1996-01-21 added code to cope with not HAVE_CONFIG_H and with
-		compilers that don't understand void, as suggested by
-		Tom Lane
-	lpd 1996-01-15 changed to require that the first non-comment token
-		on the line following a function header be a left brace,
-		to reduce sensitivity to macros, as suggested by Tom Lane
-		<tgl@sss.pgh.pa.us>
-	lpd 1995-06-22 removed #ifndefs whose sole purpose was to define
-		undefined preprocessor symbols as 0; changed all #ifdefs
-		for configuration symbols to #ifs
-	lpd 1995-04-05 changed copyright notice to make it clear that
-		including ansi2knr in a program does not bring the entire
-		program under the GPL
-	lpd 1994-12-18 added conditionals for systems where ctype macros
-		don't handle 8-bit characters properly, suggested by
-		Francois Pinard <pinard@iro.umontreal.ca>;
-		removed --varargs switch (this is now the default)
-	lpd 1994-10-10 removed CONFIG_BROKETS conditional
-	lpd 1994-07-16 added some conditionals to help GNU `configure',
-		suggested by Francois Pinard <pinard@iro.umontreal.ca>;
-		properly erase prototype args in function parameters,
-		contributed by Jim Avera <jima@netcom.com>;
-		correct error in writeblanks (it shouldn't erase EOLs)
-	lpd 1989-xx-xx original version
- */
-
-/* Most of the conditionals here are to make ansi2knr work with */
-/* or without the GNU configure machinery. */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-#if HAVE_CONFIG_H
-
-/*
-   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
-   This will define HAVE_CONFIG_H and so, activate the following lines.
- */
-
-# if STDC_HEADERS || HAVE_STRING_H
-#  include <string.h>
-# else
-#  include <strings.h>
-# endif
-
-#else /* not HAVE_CONFIG_H */
-
-/* Otherwise do it the hard way */
-
-# ifdef BSD
-#  include <strings.h>
-# else
-#  ifdef VMS
-    extern int strlen(), strncmp();
-#  else
-#   include <string.h>
-#  endif
-# endif
-
-#endif /* not HAVE_CONFIG_H */
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
-/*
-   malloc and free should be declared in stdlib.h,
-   but if you've got a K&R compiler, they probably aren't.
- */
-# ifdef MSDOS
-#  include <malloc.h>
-# else
-#  ifdef VMS
-     extern char *malloc();
-     extern void free();
-#  else
-     extern char *malloc();
-     extern int free();
-#  endif
-# endif
-
-#endif
-
-/* Define NULL (for *very* old compilers). */
-#ifndef NULL
-# define NULL (0)
-#endif
-
-/*
- * The ctype macros don't always handle 8-bit characters correctly.
- * Compensate for this here.
- */
-#ifdef isascii
-# undef HAVE_ISASCII		/* just in case */
-# define HAVE_ISASCII 1
-#else
-#endif
-#if STDC_HEADERS || !HAVE_ISASCII
-# define is_ascii(c) 1
-#else
-# define is_ascii(c) isascii(c)
-#endif
-
-#define is_space(c) (is_ascii(c) && isspace(c))
-#define is_alpha(c) (is_ascii(c) && isalpha(c))
-#define is_alnum(c) (is_ascii(c) && isalnum(c))
-
-/* Scanning macros */
-#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
-#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
-
-/* Forward references */
-char *ppdirforward();
-char *ppdirbackward();
-char *skipspace();
-char *scanstring();
-int writeblanks();
-int test1();
-int convert1();
-
-/* The main program */
-int
-main(argc, argv)
-    int argc;
-    char *argv[];
-{	FILE *in = stdin;
-	FILE *out = stdout;
-	char *filename = 0;
-	char *program_name = argv[0];
-	char *output_name = 0;
-#define bufsize 5000			/* arbitrary size */
-	char *buf;
-	char *line;
-	char *more;
-	char *usage =
-	  "Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]\n";
-	/*
-	 * In previous versions, ansi2knr recognized a --varargs switch.
-	 * If this switch was supplied, ansi2knr would attempt to convert
-	 * a ... argument to va_alist and va_dcl; if this switch was not
-	 * supplied, ansi2knr would simply drop any such arguments.
-	 * Now, ansi2knr always does this conversion, and we only
-	 * check for this switch for backward compatibility.
-	 */
-	int convert_varargs = 1;
-	int output_error;
-
-	while ( argc > 1 && argv[1][0] == '-' ) {
-	  if ( !strcmp(argv[1], "--varargs") ) {
-	    convert_varargs = 1;
-	    argc--;
-	    argv++;
-	    continue;
-	  }
-	  if ( !strcmp(argv[1], "--filename") && argc > 2 ) {
-	    filename = argv[2];
-	    argc -= 2;
-	    argv += 2;
-	    continue;
-	  }
-	  fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
-		  argv[1]);
-	  fprintf(stderr, usage);
-	  exit(1);
-	}
-	switch ( argc )
-	   {
-	default:
-		fprintf(stderr, usage);
-		exit(0);
-	case 3:
-		output_name = argv[2];
-		out = fopen(output_name, "w");
-		if ( out == NULL ) {
-		  fprintf(stderr, "%s: Cannot open output file %s\n",
-			  program_name, output_name);
-		  exit(1);
-		}
-		/* falls through */
-	case 2:
-		in = fopen(argv[1], "r");
-		if ( in == NULL ) {
-		  fprintf(stderr, "%s: Cannot open input file %s\n",
-			  program_name, argv[1]);
-		  exit(1);
-		}
-		if ( filename == 0 )
-		  filename = argv[1];
-		/* falls through */
-	case 1:
-		break;
-	   }
-	if ( filename )
-	  fprintf(out, "#line 1 \"%s\"\n", filename);
-	buf = malloc(bufsize);
-	if ( buf == NULL )
-	   {
-		fprintf(stderr, "Unable to allocate read buffer!\n");
-		exit(1);
-	   }
-	line = buf;
-	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
-	   {
-test:		line += strlen(line);
-		switch ( test1(buf) )
-		   {
-		case 2:			/* a function header */
-			convert1(buf, out, 1, convert_varargs);
-			break;
-		case 1:			/* a function */
-			/* Check for a { at the start of the next line. */
-			more = ++line;
-f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
-			  goto wl;
-			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
-			  goto wl;
-			switch ( *skipspace(ppdirforward(more), 1) )
-			  {
-			  case '{':
-			    /* Definitely a function header. */
-			    convert1(buf, out, 0, convert_varargs);
-			    fputs(more, out);
-			    break;
-			  case 0:
-			    /* The next line was blank or a comment: */
-			    /* keep scanning for a non-comment. */
-			    line += strlen(line);
-			    goto f;
-			  default:
-			    /* buf isn't a function header, but */
-			    /* more might be. */
-			    fputs(buf, out);
-			    strcpy(buf, more);
-			    line = buf;
-			    goto test;
-			  }
-			break;
-		case -1:		/* maybe the start of a function */
-			if ( line != buf + (bufsize - 1) ) /* overflow check */
-			  continue;
-			/* falls through */
-		default:		/* not a function */
-wl:			fputs(buf, out);
-			break;
-		   }
-		line = buf;
-	   }
-	if ( line != buf )
-	  fputs(buf, out);
-	free(buf);
-	if ( output_name ) {
-	  output_error = ferror(out);
-	  output_error |= fclose(out);
-	} else {		/* out == stdout */
-	  fflush(out);
-	  output_error = ferror(out);
-	}
-	if ( output_error ) {
-	  fprintf(stderr, "%s: error writing to %s\n", program_name,
-		  (output_name ? output_name : "stdout"));
-	  exit(1);
-	}
-	if ( in != stdin )
-	  fclose(in);
-	return 0;
-}
-
-/*
- * Skip forward or backward over one or more preprocessor directives.
- */
-char *
-ppdirforward(p)
-    char *p;
-{
-    for (; *p == '#'; ++p) {
-	for (; *p != '\r' && *p != '\n'; ++p)
-	    if (*p == 0)
-		return p;
-	if (*p == '\r' && p[1] == '\n')
-	    ++p;
-    }
-    return p;
-}
-char *
-ppdirbackward(p, limit)
-    char *p;
-    char *limit;
-{
-    char *np = p;
-
-    for (;; p = --np) {
-	if (*np == '\n' && np[-1] == '\r')
-	    --np;
-	for (; np > limit && np[-1] != '\r' && np[-1] != '\n'; --np)
-	    if (np[-1] == 0)
-		return np;
-	if (*np != '#')
-	    return p;
-    }
-}
-
-/*
- * Skip over whitespace, comments, and preprocessor directives,
- * in either direction.
- */
-char *
-skipspace(p, dir)
-    char *p;
-    int dir;			/* 1 for forward, -1 for backward */
-{
-    for ( ; ; ) {
-	while ( is_space(*p) )
-	    p += dir;
-	if ( !(*p == '/' && p[dir] == '*') )
-	    break;
-	p += dir;  p += dir;
-	while ( !(*p == '*' && p[dir] == '/') ) {
-	    if ( *p == 0 )
-		return p;	/* multi-line comment?? */
-	    p += dir;
-	}
-	p += dir;  p += dir;
-    }
-    return p;
-}
-
-/* Scan over a quoted string, in either direction. */
-char *
-scanstring(p, dir)
-    char *p;
-    int dir;
-{
-    for (p += dir; ; p += dir)
-	if (*p == '"' && p[-dir] != '\\')
-	    return p + dir;
-}
-
-/*
- * Write blanks over part of a string.
- * Don't overwrite end-of-line characters.
- */
-int
-writeblanks(start, end)
-    char *start;
-    char *end;
-{	char *p;
-	for ( p = start; p < end; p++ )
-	  if ( *p != '\r' && *p != '\n' )
-	    *p = ' ';
-	return 0;
-}
-
-/*
- * Test whether the string in buf is a function definition.
- * The string may contain and/or end with a newline.
- * Return as follows:
- *	0 - definitely not a function definition;
- *	1 - definitely a function definition;
- *	2 - definitely a function prototype (NOT USED);
- *	-1 - may be the beginning of a function definition,
- *		append another line and look again.
- * The reason we don't attempt to convert function prototypes is that
- * Ghostscript's declaration-generating macros look too much like
- * prototypes, and confuse the algorithms.
- */
-int
-test1(buf)
-    char *buf;
-{	char *p = buf;
-	char *bend;
-	char *endfn;
-	int contin;
-
-	if ( !isidfirstchar(*p) )
-	  return 0;		/* no name at left margin */
-	bend = skipspace(ppdirbackward(buf + strlen(buf) - 1, buf), -1);
-	switch ( *bend )
-	   {
-	   case ';': contin = 0 /*2*/; break;
-	   case ')': contin = 1; break;
-	   case '{': return 0;		/* not a function */
-	   case '}': return 0;		/* not a function */
-	   default: contin = -1;
-	   }
-	while ( isidchar(*p) )
-	  p++;
-	endfn = p;
-	p = skipspace(p, 1);
-	if ( *p++ != '(' )
-	  return 0;		/* not a function */
-	p = skipspace(p, 1);
-	if ( *p == ')' )
-	  return 0;		/* no parameters */
-	/* Check that the apparent function name isn't a keyword. */
-	/* We only need to check for keywords that could be followed */
-	/* by a left parenthesis (which, unfortunately, is most of them). */
-	   {	static char *words[] =
-		   {	"asm", "auto", "case", "char", "const", "double",
-			"extern", "float", "for", "if", "int", "long",
-			"register", "return", "short", "signed", "sizeof",
-			"static", "switch", "typedef", "unsigned",
-			"void", "volatile", "while", 0
-		   };
-		char **key = words;
-		char *kp;
-		unsigned len = endfn - buf;
-
-		while ( (kp = *key) != 0 )
-		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
-			  return 0;	/* name is a keyword */
-			key++;
-		   }
-	   }
-	   {
-	       char *id = p;
-	       int len;
-	       /*
-		* Check for identifier1(identifier2) and not
-		* identifier1(void), or identifier1(identifier2, xxxx).
-		*/
-
-	       while ( isidchar(*p) )
-		   p++;
-	       len = p - id;
-	       p = skipspace(p, 1);
-	       if (*p == ',' ||
-		   (*p == ')' && (len != 4 || strncmp(id, "void", 4)))
-		   )
-		   return 0;	/* not a function */
-	   }
-	/*
-	 * If the last significant character was a ), we need to count
-	 * parentheses, because it might be part of a formal parameter
-	 * that is a procedure.
-	 */
-	if (contin > 0) {
-	    int level = 0;
-
-	    for (p = skipspace(buf, 1); *p; p = skipspace(p + 1, 1))
-		level += (*p == '(' ? 1 : *p == ')' ? -1 : 0);
-	    if (level > 0)
-		contin = -1;
-	}
-	return contin;
-}
-
-/* Convert a recognized function definition or header to K&R syntax. */
-int
-convert1(buf, out, header, convert_varargs)
-    char *buf;
-    FILE *out;
-    int header;			/* Boolean */
-    int convert_varargs;	/* Boolean */
-{	char *endfn;
-	char *p;
-	/*
-	 * The breaks table contains pointers to the beginning and end
-	 * of each argument.
-	 */
-	char **breaks;
-	unsigned num_breaks = 2;	/* for testing */
-	char **btop;
-	char **bp;
-	char **ap;
-	char *vararg = 0;
-
-	/* Pre-ANSI implementations don't agree on whether strchr */
-	/* is called strchr or index, so we open-code it here. */
-	for ( endfn = buf; *(endfn++) != '('; )
-	  ;
-top:	p = endfn;
-	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
-	if ( breaks == NULL )
-	   {	/* Couldn't allocate break table, give up */
-		fprintf(stderr, "Unable to allocate break table!\n");
-		fputs(buf, out);
-		return -1;
-	   }
-	btop = breaks + num_breaks * 2 - 2;
-	bp = breaks;
-	/* Parse the argument list */
-	do
-	   {	int level = 0;
-		char *lp = NULL;
-		char *rp = NULL;
-		char *end = NULL;
-
-		if ( bp >= btop )
-		   {	/* Filled up break table. */
-			/* Allocate a bigger one and start over. */
-			free((char *)breaks);
-			num_breaks <<= 1;
-			goto top;
-		   }
-		*bp++ = p;
-		/* Find the end of the argument */
-		for ( ; end == NULL; p++ )
-		   {	switch(*p)
-			   {
-			   case ',':
-				if ( !level ) end = p;
-				break;
-			   case '(':
-				if ( !level ) lp = p;
-				level++;
-				break;
-			   case ')':
-				if ( --level < 0 ) end = p;
-				else rp = p;
-				break;
-			   case '/':
-				if (p[1] == '*')
-				    p = skipspace(p, 1) - 1;
-				break;
-			   case '"':
-			       p = scanstring(p, 1) - 1;
-			       break;
-			   default:
-				;
-			   }
-		   }
-		/* Erase any embedded prototype parameters. */
-		if ( lp && rp )
-		  writeblanks(lp + 1, rp);
-		p--;			/* back up over terminator */
-		/* Find the name being declared. */
-		/* This is complicated because of procedure and */
-		/* array modifiers. */
-		for ( ; ; )
-		   {	p = skipspace(p - 1, -1);
-			switch ( *p )
-			   {
-			   case ']':	/* skip array dimension(s) */
-			   case ')':	/* skip procedure args OR name */
-			   {	int level = 1;
-				while ( level )
-				 switch ( *--p )
-				   {
-				   case ']': case ')':
-				       level++;
-				       break;
-				   case '[': case '(':
-				       level--;
-				       break;
-				   case '/':
-				       if (p > buf && p[-1] == '*')
-					   p = skipspace(p, -1) + 1;
-				       break;
-				   case '"':
-				       p = scanstring(p, -1) + 1;
-				       break;
-				   default: ;
-				   }
-			   }
-				if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
-				   {	/* We found the name being declared */
-					while ( !isidfirstchar(*p) )
-					  p = skipspace(p, 1) + 1;
-					goto found;
-				   }
-				break;
-			   default:
-				goto found;
-			   }
-		   }
-found:		if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
-		  {	if ( convert_varargs )
-			  {	*bp++ = "va_alist";
-				vararg = p-2;
-			  }
-			else
-			  {	p++;
-				if ( bp == breaks + 1 )	/* sole argument */
-				  writeblanks(breaks[0], p);
-				else
-				  writeblanks(bp[-1] - 1, p);
-				bp--;
-			  }
-		   }
-		else
-		   {	while ( isidchar(*p) ) p--;
-			*bp++ = p+1;
-		   }
-		p = end;
-	   }
-	while ( *p++ == ',' );
-	*bp = p;
-	/* Make a special check for 'void' arglist */
-	if ( bp == breaks+2 )
-	   {	p = skipspace(breaks[0], 1);
-		if ( !strncmp(p, "void", 4) )
-		   {	p = skipspace(p+4, 1);
-			if ( p == breaks[2] - 1 )
-			   {	bp = breaks;	/* yup, pretend arglist is empty */
-				writeblanks(breaks[0], p + 1);
-			   }
-		   }
-	   }
-	/* Put out the function name and left parenthesis. */
-	p = buf;
-	while ( p != endfn ) putc(*p, out), p++;
-	/* Put out the declaration. */
-	if ( header )
-	  {	fputs(");", out);
-		for ( p = breaks[0]; *p; p++ )
-		  if ( *p == '\r' || *p == '\n' )
-		    putc(*p, out);
-	  }
-	else
-	  {	for ( ap = breaks+1; ap < bp; ap += 2 )
-		  {	p = *ap;
-			while ( isidchar(*p) )
-			  putc(*p, out), p++;
-			if ( ap < bp - 1 )
-			  fputs(", ", out);
-		  }
-		fputs(")  ", out);
-		/* Put out the argument declarations */
-		for ( ap = breaks+2; ap <= bp; ap += 2 )
-		  (*ap)[-1] = ';';
-		if ( vararg != 0 )
-		  {	*vararg = 0;
-			fputs(breaks[0], out);		/* any prior args */
-			fputs("va_dcl", out);		/* the final arg */
-			fputs(bp[0], out);
-		  }
-		else
-		  fputs(breaks[0], out);
-	  }
-	free((char *)breaks);
-	return 0;
-}
diff --git a/array.c b/array.c
index 012f32f4..85b06f39 100644
--- a/array.c
+++ b/array.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -45,11 +45,11 @@ static int AVG_CHAIN_MAX = 2;	/* 11/2002: Modern machines are bigger, cut this d
 static NODE *assoc_find P((NODE *symbol, NODE *subs, unsigned long hash1));
 static void grow_table P((NODE *symbol));
 
-static unsigned long gst_hash_string P((const char *str, size_t len, unsigned long hsize));
+static unsigned long gst_hash_string P((const char *str, size_t len, unsigned long hsize, size_t *code));
 static unsigned long scramble P((unsigned long x));
-static unsigned long awk_hash P((const char *s, size_t len, unsigned long hsize));
+static unsigned long awk_hash P((const char *s, size_t len, unsigned long hsize, size_t *code));
 
-unsigned long (*hash)P((const char *s, size_t len, unsigned long hsize)) = awk_hash;
+unsigned long (*hash)P((const char *s, size_t len, unsigned long hsize, size_t *code)) = awk_hash;
 
 /* array_init --- possibly temporary function for experimentation purposes */
 
@@ -326,10 +326,10 @@ assoc_clear(NODE *symbol)
 	symbol->flags &= ~ARRAYMAXED;
 }
 
-/* hash --- calculate the hash function of the string in subs */
+/* awk_hash --- calculate the hash function of the string in subs */
 
 static unsigned long
-awk_hash(register const char *s, register size_t len, unsigned long hsize)
+awk_hash(register const char *s, register size_t len, unsigned long hsize, size_t *code)
 {
 	register unsigned long h = 0;
 
@@ -407,6 +407,8 @@ awk_hash(register const char *s, register size_t len, unsigned long hsize)
 		}
 	}
 #endif /* ! VAXC */
+	if (code != NULL)
+		*code = h;
 
 	if (h >= hsize)
 		h %= hsize;
@@ -462,7 +464,7 @@ in_array(NODE *symbol, NODE *subs)
 		free_temp(subs);
 		return NULL;
 	}
-	hash1 = hash(subs->stptr, subs->stlen, (unsigned long) symbol->array_size);
+	hash1 = hash(subs->stptr, subs->stlen, (unsigned long) symbol->array_size, NULL);
 	ret = assoc_find(symbol, subs, hash1);
 	free_temp(subs);
 	if (ret)
@@ -485,6 +487,7 @@ assoc_lookup(NODE *symbol, NODE *subs, int reference)
 {
 	register unsigned long hash1;
 	register NODE *bucket;
+	size_t code;
 
 	assert(symbol->type == Node_var_array);
 
@@ -495,10 +498,10 @@ assoc_lookup(NODE *symbol, NODE *subs, int reference)
 		symbol->flags &= ~ARRAYMAXED;
 		grow_table(symbol);
 		hash1 = hash(subs->stptr, subs->stlen,
-				(unsigned long) symbol->array_size);
+				(unsigned long) symbol->array_size, & code);
 	} else {
 		hash1 = hash(subs->stptr, subs->stlen,
-				(unsigned long) symbol->array_size);
+				(unsigned long) symbol->array_size, & code);
 		bucket = assoc_find(symbol, subs, hash1);
 		if (bucket != NULL) {
 			free_temp(subs);
@@ -523,8 +526,7 @@ assoc_lookup(NODE *symbol, NODE *subs, int reference)
 	    && (symbol->table_size / symbol->array_size) > AVG_CHAIN_MAX) {
 		grow_table(symbol);
 		/* have to recompute hash value for new size */
-		hash1 = hash(subs->stptr, subs->stlen,
-				(unsigned long) symbol->array_size);
+		hash1 = code % (unsigned long) symbol->array_size;
 	}
 
 	getnode(bucket);
@@ -557,6 +559,7 @@ assoc_lookup(NODE *symbol, NODE *subs, int reference)
 
 	bucket->ahvalue = Nnull_string;
 	bucket->ahnext = symbol->var_array[hash1];
+	bucket->ahcode = code;
 	symbol->var_array[hash1] = bucket;
 	return &(bucket->ahvalue);
 }
@@ -591,7 +594,7 @@ do_delete(NODE *sym, NODE *tree)
 
 	if (symbol->var_array != NULL) {
 		hash1 = hash(subs->stptr, subs->stlen,
-				(unsigned long) symbol->array_size);
+				(unsigned long) symbol->array_size, NULL);
 		last = NULL;
 		for (bucket = symbol->var_array[hash1]; bucket != NULL;
 				last = bucket, bucket = bucket->ahnext) {
@@ -739,8 +742,7 @@ grow_table(NODE *symbol)
 
 		for (chain = old[k]; chain != NULL; chain = next) {
 			next = chain->ahnext;
-			hash1 = hash(chain->ahname_str,
-					chain->ahname_len, newsize);
+			hash1 = chain->ahcode % newsize;
 
 			/* remove from old list, add to new */
 			chain->ahnext = new[hash1];
@@ -992,6 +994,8 @@ assoc_from_list(NODE *symbol, NODE *list)
 	char buf[100];
 
 	for (; list != NULL; list = next) {
+		size_t code;
+
 		next = list->ahnext;
 
 		/* make an int out of i++ */
@@ -1005,7 +1009,8 @@ assoc_from_list(NODE *symbol, NODE *list)
 
 		/* find the bucket where it belongs */
 		hash1 = hash(list->ahname_str, list->ahname_len,
-				symbol->array_size);
+				symbol->array_size, & code);
+		list->ahcode = code;
 
 		/* link the node into the chain at that bucket */
 		list->ahnext = symbol->var_array[hash1];
@@ -1173,7 +1178,7 @@ Paolo
  */
 
 static unsigned long
-gst_hash_string(const char *str, size_t len, unsigned long hsize)
+gst_hash_string(const char *str, size_t len, unsigned long hsize, size_t *code)
 {
 	unsigned long hashVal = 1497032417;    /* arbitrary value */
 	unsigned long ret;
@@ -1185,6 +1190,10 @@ gst_hash_string(const char *str, size_t len, unsigned long hsize)
 	}
 
 	ret = scramble(hashVal);
+
+	if (code != NULL)
+		*code = ret;
+
 	if (ret >= hsize)
 		ret %= hsize;
 
diff --git a/awk.h b/awk.h
index 1f1e34a6..d48d77f4 100644
--- a/awk.h
+++ b/awk.h
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -41,6 +41,10 @@
 #define _GNU_SOURCE	1	/* enable GNU extensions */
 #endif /* _GNU_SOURCE */
 
+#if defined(_TANDEM_SOURCE) && ! defined(_SCO_DS)
+#define _XOPEN_SOURCE_EXTENDED 1
+#endif
+
 #include <stdio.h>
 #include <assert.h>
 #ifdef HAVE_LIMITS_H
@@ -60,6 +64,7 @@
 #endif
 
 #if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#define CAN_USE_STDARG_H 1
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -88,6 +93,20 @@ extern int errno;
 #include <float.h>
 #endif
 
+#undef CHARBITS
+#undef INTBITS
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
+ 
+#if defined(_MSC_VER)
+/* for read()/close() in use replace.c */
+#include <io.h>
+#endif
+
 /* ----------------- System dependencies (with more includes) -----------*/
 
 /* This section is the messiest one in the file, not a lot that can be done */
@@ -193,6 +212,14 @@ extern int errno;
 #include <unistd.h>
 #endif	/* HAVE_UNISTD_H */
 
+#ifdef VMS
+#include "vms/redirect.h"
+#endif  /*VMS*/
+
+#ifdef atarist
+#include "unsupported/atari/redirect.h"
+#endif
+
 #ifndef HAVE_VPRINTF
 /* if you don't have vprintf, try this and cross your fingers. */
 #ifdef	HAVE_DOPRNT
@@ -203,6 +230,11 @@ lose
 #endif	/* not HAVE_DOPRNT */
 #endif	/* HAVE_VPRINTF */
 
+#ifndef HAVE_SNPRINTF
+/* will use replacement version */
+extern int snprintf P((char *restrict buf, size_t len, const char *restrict fmt, ...));
+#endif
+
 #ifndef HAVE_SETLOCALE
 #define setlocale(locale, val)	/* nothing */
 #endif /* HAVE_SETLOCALE */
@@ -211,14 +243,6 @@ lose
    this is a hack but it gives us the right semantics */
 #define lintwarn (*(set_loc(__FILE__, __LINE__),lintfunc))
 
-#ifdef VMS
-#include "vms/redirect.h"
-#endif  /*VMS*/
-
-#ifdef atarist
-#include "unsupported/atari/redirect.h"
-#endif
-
 #define	GNU_REGEX
 #ifdef GNU_REGEX
 #include "regex.h"
@@ -241,7 +265,7 @@ typedef struct Regexp {
 #define RE_NO_BOL	2	/* for RS, not allowed to match ^ in regexp */
 
 /* Stuff for losing systems. */
-#ifdef STRTOD_NOT_C89
+#if !defined(HAVE_STRTOD)
 extern double gawk_strtod();
 #define strtod gawk_strtod
 #endif
@@ -509,6 +533,7 @@ typedef struct exp_node {
 			size_t length;
 			struct exp_node *value;
 			long ref;
+			size_t code;
 		} hash;
 #define	hnext	sub.hash.next
 #define	hname	sub.hash.name
@@ -520,6 +545,7 @@ typedef struct exp_node {
 #define ahname_len	sub.hash.length
 #define	ahvalue	sub.hash.value
 #define ahname_ref	sub.hash.ref
+#define	ahcode	sub.hash.code
 	} sub;
 	NODETYPE type;
 	unsigned short flags;
@@ -741,6 +767,7 @@ extern int do_intl;
 extern int do_non_decimal_data;
 extern int do_dump_vars;
 extern int do_tidy_mem;
+extern int use_lc_numeric;
 extern int in_begin_rule;
 extern int in_end_rule;
 extern int whiny_users;
@@ -962,7 +989,7 @@ extern NODE *assoc_dump P((NODE *symbol));
 extern NODE *do_adump P((NODE *tree));
 extern NODE *do_asort P((NODE *tree));
 extern NODE *do_asorti P((NODE *tree));
-extern unsigned long (*hash)P((const char *s, size_t len, unsigned long hsize));
+extern unsigned long (*hash)P((const char *s, size_t len, unsigned long hsize, size_t *code));
 /* awkgram.c */
 extern char *tokexpand P((void));
 extern NODE *node P((NODE *left, NODETYPE op, NODE *right));
@@ -1084,12 +1111,16 @@ extern void os_restore_mode P((int fd));
 extern size_t optimal_bufsize P((int fd, struct stat *sbuf));
 extern int ispath P((const char *file));
 extern int isdirpunct P((int c));
-#if defined(_MSC_VER) && !defined(_WIN32)
+
+#if HAVE_MEMCPY_ULONG
 extern char *memcpy_ulong P((char *dest, const char *src, unsigned long l));
-extern void *memset_ulong P((void *dest, int val, unsigned long l));
 #define memcpy memcpy_ulong
+#endif
+#if HAVE_MEMSET_ULONG
+extern void *memset_ulong P((void *dest, int val, unsigned long l));
 #define memset memset_ulong
 #endif
+
 /* io.c */
 extern void register_open_hook P((void *(*open_func)(IOBUF *)));
 extern void set_FNR P((void));
@@ -1166,6 +1197,9 @@ extern NODE *str2wstr P((NODE *n, size_t **ptr));
 #define force_wstring(n)	str2wstr(n, NULL)
 extern const wchar_t *wstrstr P((const wchar_t *haystack, size_t hs_len, const wchar_t *needle, size_t needle_len));
 extern const wchar_t *wcasestrstr P((const wchar_t *haystack, size_t hs_len, const wchar_t *needle, size_t needle_len));
+extern void free_wstr P((NODE *n));
+#else
+#define free_wstr(NODE)	/* empty */
 #endif
 /* re.c */
 extern Regexp *make_regexp P((const char *s, size_t len, int ignorecase, int dfa));
@@ -1181,6 +1215,20 @@ extern int reisstring P((const char *text, size_t len, Regexp *re, const char *b
 extern int remaybelong P((const char *text, size_t len));
 extern int isnondecimal P((const char *str, int use_locale));
 
+/* floatcomp.c */
+#ifdef VMS	/* VMS linker weirdness? */
+#define Ceil	gawk_ceil
+#define Floor	gawk_floor
+#endif
+
+extern AWKNUM Floor P((AWKNUM n));
+extern AWKNUM Ceil P((AWKNUM n));
+#ifdef HAVE_UINTMAX_T
+extern uintmax_t adjust_uint P((uintmax_t n));
+#else
+#define adjust_uint(n) (n)
+#endif
+
 /* strncasecmp.c */
 #ifndef BROKEN_STRNCASECMP
 extern int strcasecmp P((const char *s1, const char *s2));
diff --git a/awkgram.c b/awkgram.c
index ba2ed5e7..28759f6e 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -156,10 +156,14 @@
 
 #include "awk.h"
 
+#if defined(__STDC__) && __STDC__ < 1	/* VMS weirdness, maybe elsewhere */
+#define signed /**/
+#endif
+
 #define CAN_FREE	TRUE
 #define DONT_FREE	FALSE
 
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 static void yyerror(const char *m, ...) ATTRIBUTE_PRINTF_1;
 #else
 static void yyerror(); /* va_alist */
@@ -190,6 +194,9 @@ enum defref { FUNC_DEFINE, FUNC_USE };
 static void func_use P((const char *name, enum defref how));
 static void check_funcs P((void));
 
+static ssize_t read_one_line P((int fd, void *buffer, size_t count));
+static int one_line_close P((int fd));
+
 static int want_regexp;		/* lexical scanning kludge */
 static int can_return;		/* parsing kludge */
 static int begin_or_end_rule = FALSE;	/* parsing kludge */
@@ -247,7 +254,7 @@ static char builtin_func[] = "@builtin";
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 110 "awkgram.y"
+#line 117 "awkgram.y"
 typedef union YYSTYPE {
 	long lval;
 	AWKNUM fval;
@@ -256,8 +263,8 @@ typedef union YYSTYPE {
 	char *sval;
 	NODE *(*ptrval) P((void));
 } YYSTYPE;
-/* Line 190 of yacc.c.  */
-#line 261 "y.tab.c"
+/* Line 185 of yacc.c.  */
+#line 268 "y.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -269,7 +276,7 @@ typedef union YYSTYPE {
 
 
 /* Line 213 of yacc.c.  */
-#line 273 "y.tab.c"
+#line 280 "y.tab.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
@@ -369,16 +376,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  5
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1008
+#define YYLAST   1088
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  67
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  53
+#define YYNNTS  56
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  155
+#define YYNRULES  165
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  293
+#define YYNSTATES  308
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -439,11 +446,12 @@ static const unsigned short int yyprhs[] =
      274,   275,   278,   279,   281,   283,   287,   289,   292,   296,
      297,   299,   300,   302,   304,   308,   310,   313,   317,   321,
      325,   329,   333,   337,   341,   345,   351,   353,   355,   357,
-     360,   362,   364,   366,   368,   370,   373,   379,   381,   384,
-     386,   390,   394,   398,   402,   406,   410,   414,   419,   422,
-     425,   428,   432,   437,   442,   444,   449,   451,   454,   457,
-     459,   461,   464,   467,   468,   470,   472,   477,   480,   483,
-     486,   488,   489,   491,   493,   495
+     360,   362,   364,   366,   368,   370,   372,   375,   377,   381,
+     385,   389,   393,   397,   401,   405,   408,   411,   417,   422,
+     426,   430,   434,   438,   442,   446,   448,   451,   455,   460,
+     465,   467,   472,   474,   477,   480,   482,   484,   487,   490,
+     491,   493,   495,   500,   502,   506,   508,   510,   511,   514,
+     517,   519,   520,   522,   524,   526
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -452,74 +460,78 @@ static const yysigned_char yyrhs[] =
       68,     0,    -1,    97,    69,    97,    -1,    -1,    69,    70,
       -1,    69,     1,    -1,    71,    72,    -1,    71,    81,    -1,
       75,    72,    -1,    -1,   104,    -1,   104,    48,   104,    -1,
-      16,    -1,    17,    -1,   113,    80,   114,   116,    97,    -1,
+      16,    -1,    17,    -1,   116,    80,   117,   119,    97,    -1,
        4,    -1,     3,    -1,    74,    -1,    42,    -1,    43,    -1,
-      -1,    34,    76,    73,    60,    99,   115,    97,    -1,    -1,
+      -1,    34,    76,    73,    60,    99,   118,    97,    -1,    -1,
       79,    78,     5,    -1,    54,    -1,    45,    -1,    -1,    80,
-      82,    -1,    80,     1,    -1,    96,    -1,   117,    97,    -1,
-     117,    97,    -1,   113,    80,   114,    -1,    95,    -1,    22,
-      60,   104,   115,    97,   113,    87,    97,   114,    -1,    25,
-      60,   104,   115,    97,    82,    -1,    26,    97,    82,    25,
-      60,   104,   115,    97,    -1,    27,    60,     4,    37,     4,
-     115,    97,    82,    -1,    27,    60,    86,   117,    97,   104,
-     117,    97,    86,   115,    97,    82,    -1,    27,    60,    86,
-     117,    97,   117,    97,    86,   115,    97,    82,    -1,    28,
+      82,    -1,    80,     1,    -1,    96,    -1,   120,    97,    -1,
+     120,    97,    -1,   116,    80,   117,    -1,    95,    -1,    22,
+      60,   104,   118,    97,   116,    87,    97,   117,    -1,    25,
+      60,   104,   118,    97,    82,    -1,    26,    97,    82,    25,
+      60,   104,   118,    97,    -1,    27,    60,     4,    37,     4,
+     118,    97,    82,    -1,    27,    60,    86,   120,    97,   104,
+     120,    97,    86,   118,    97,    82,    -1,    27,    60,    86,
+     120,    97,   120,    97,    86,   118,    97,    82,    -1,    28,
       81,    -1,    29,    81,    -1,    32,    81,    -1,    36,    81,
       -1,    33,   101,    81,    -1,    -1,    20,    83,   101,    81,
       -1,    84,    81,    -1,    -1,    91,    85,    92,    93,    -1,
       21,     4,    62,   103,    63,    -1,    21,     4,    -1,    21,
       60,     4,    61,    -1,   104,    -1,    -1,    84,    -1,    88,
       -1,    -1,    88,    89,    -1,    88,     1,    -1,    23,    90,
-     118,    97,    80,    -1,    24,   118,    97,    80,    -1,     7,
+     121,    97,    80,    -1,    24,   121,    97,    80,    -1,     7,
       -1,    52,     7,    -1,    51,     7,    -1,     8,    -1,    77,
-      -1,    30,    -1,    31,    -1,   102,    -1,    60,   104,   119,
-     103,   115,    -1,    -1,    -1,    10,    94,   108,    -1,    18,
-      60,   104,   115,    97,    82,    -1,    18,    60,   104,   115,
+      -1,    30,    -1,    31,    -1,   102,    -1,    60,   104,   122,
+     103,   118,    -1,    -1,    -1,    10,    94,   108,    -1,    18,
+      60,   104,   118,    97,    82,    -1,    18,    60,   104,   118,
       97,    82,    19,    97,    82,    -1,    44,    -1,    96,    44,
       -1,    -1,    96,    -1,    -1,    49,   109,    -1,    -1,   100,
-      -1,     4,    -1,   100,   119,     4,    -1,     1,    -1,   100,
-       1,    -1,   100,   119,     1,    -1,    -1,   104,    -1,    -1,
-     103,    -1,   104,    -1,   103,   119,   104,    -1,     1,    -1,
-     103,     1,    -1,   103,     1,   104,    -1,   103,   119,     1,
-      -1,   112,   105,   104,    -1,   104,    38,   104,    -1,   104,
+      -1,     4,    -1,   100,   122,     4,    -1,     1,    -1,   100,
+       1,    -1,   100,   122,     1,    -1,    -1,   104,    -1,    -1,
+     103,    -1,   104,    -1,   103,   122,   104,    -1,     1,    -1,
+     103,     1,    -1,   103,     1,   104,    -1,   103,   122,     1,
+      -1,   113,   105,   104,    -1,   104,    38,   104,    -1,   104,
       39,   104,    -1,   104,    14,   104,    -1,   104,    37,     4,
       -1,   104,   107,   104,    -1,   104,    46,   104,    47,   104,
       -1,   108,    -1,    13,    -1,    12,    -1,    45,    13,    -1,
-       9,    -1,    49,    -1,   106,    -1,    50,    -1,    77,    -1,
-      56,    77,    -1,    60,   103,   115,    37,     4,    -1,   109,
-      -1,   108,   109,    -1,   110,    -1,   109,    58,   109,    -1,
-     109,    53,   109,    -1,   109,    54,   109,    -1,   109,    55,
-     109,    -1,   109,    51,   109,    -1,   109,    52,   109,    -1,
-      35,   111,    98,    -1,   109,    11,    35,   111,    -1,   112,
-      40,    -1,   112,    41,    -1,    56,   109,    -1,    60,   104,
-     115,    -1,    42,    60,   102,   115,    -1,    43,    60,   102,
-     115,    -1,    43,    -1,     3,    60,   102,   115,    -1,   112,
-      -1,    40,   112,    -1,    41,   112,    -1,     7,    -1,     8,
-      -1,    52,   109,    -1,    51,   109,    -1,    -1,   112,    -1,
-       4,    -1,     4,    62,   103,    63,    -1,    59,   110,    -1,
-      64,    97,    -1,    65,    97,    -1,    61,    -1,    -1,   117,
-      -1,    66,    -1,    47,    -1,    48,    97,    -1
+       9,    -1,    49,    -1,   106,    -1,    50,    -1,   109,    -1,
+     110,    -1,   108,   109,    -1,   111,    -1,   109,    58,   109,
+      -1,   109,    53,   109,    -1,   109,    54,   109,    -1,   109,
+      55,   109,    -1,   109,    51,   109,    -1,   109,    52,   109,
+      -1,    35,   112,    98,    -1,   113,    40,    -1,   113,    41,
+      -1,    60,   103,   118,    37,     4,    -1,   108,    11,    35,
+     112,    -1,   110,    58,   109,    -1,   110,    53,   109,    -1,
+     110,    54,   109,    -1,   110,    55,   109,    -1,   110,    51,
+     109,    -1,   110,    52,   109,    -1,    77,    -1,    56,   109,
+      -1,    60,   104,   118,    -1,    42,    60,   102,   118,    -1,
+      43,    60,   102,   118,    -1,    43,    -1,     3,    60,   102,
+     118,    -1,   113,    -1,    40,   113,    -1,    41,   113,    -1,
+       7,    -1,     8,    -1,    52,   109,    -1,    51,   109,    -1,
+      -1,   113,    -1,     4,    -1,     4,    62,   103,    63,    -1,
+     114,    -1,    59,   111,   115,    -1,    40,    -1,    41,    -1,
+      -1,    64,    97,    -1,    65,    97,    -1,    61,    -1,    -1,
+     120,    -1,    66,    -1,    47,    -1,    48,    97,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   171,   171,   177,   179,   184,   196,   200,   215,   226,
-     229,   233,   243,   248,   256,   261,   263,   265,   276,   277,
-     282,   281,   305,   304,   330,   331,   336,   337,   355,   360,
-     361,   365,   367,   369,   371,   373,   375,   377,   421,   425,
-     430,   433,   436,   445,   465,   468,   467,   477,   489,   489,
-     520,   522,   536,   551,   557,   558,   563,   616,   617,   634,
-     639,   641,   646,   648,   653,   655,   657,   662,   663,   671,
-     672,   678,   683,   683,   695,   700,   707,   708,   711,   713,
-     718,   719,   725,   726,   731,   733,   735,   737,   739,   746,
-     747,   753,   754,   759,   761,   767,   769,   771,   773,   778,
-     797,   799,   801,   807,   809,   815,   817,   822,   824,   826,
-     831,   833,   837,   838,   843,   845,   853,   855,   857,   862,
-     864,   866,   868,   870,   872,   874,   876,   882,   887,   889,
-     894,   896,   898,   901,   903,   911,   919,   920,   922,   924,
-     926,   929,   937,   949,   950,   955,   957,   971,   982,   986,
-     990,   993,   995,   999,  1003,  1006
+       0,   178,   178,   184,   186,   191,   203,   207,   222,   233,
+     236,   240,   250,   259,   271,   276,   278,   280,   291,   292,
+     297,   296,   320,   319,   345,   346,   351,   352,   370,   375,
+     376,   380,   382,   384,   386,   388,   390,   392,   436,   440,
+     445,   448,   451,   460,   484,   487,   486,   496,   508,   508,
+     539,   541,   559,   581,   587,   588,   593,   646,   647,   664,
+     669,   671,   676,   678,   683,   685,   687,   692,   693,   701,
+     702,   708,   713,   713,   725,   730,   737,   738,   741,   743,
+     748,   749,   755,   756,   761,   763,   765,   767,   769,   776,
+     777,   783,   784,   789,   791,   797,   799,   801,   803,   808,
+     827,   829,   831,   837,   843,   849,   851,   856,   858,   860,
+     865,   867,   871,   872,   877,   879,   881,   886,   888,   890,
+     892,   894,   896,   898,   900,   906,   908,   910,   923,   928,
+     930,   932,   934,   936,   938,   943,   945,   947,   949,   952,
+     954,   968,   976,   977,   979,   981,   983,   986,   994,  1006,
+    1007,  1012,  1014,  1029,  1039,  1054,  1055,  1056,  1060,  1064,
+    1068,  1071,  1073,  1077,  1081,  1084
 };
 #endif
 
@@ -546,9 +558,10 @@ static const char *const yytname[] =
   "print_expression_list", "output_redir", "@5", "if_statement", "nls",
   "opt_nls", "input_redir", "opt_param_list", "param_list", "opt_exp",
   "opt_expression_list", "expression_list", "exp", "assign_operator",
-  "relop_or_less", "a_relop", "common_exp", "simp_exp",
-  "non_post_simp_exp", "opt_variable", "variable", "l_brace", "r_brace",
-  "r_paren", "opt_semi", "semi", "colon", "comma", 0
+  "relop_or_less", "a_relop", "common_exp", "simp_exp", "simp_exp_nc",
+  "non_post_simp_exp", "opt_variable", "variable", "field_spec",
+  "opt_incdec", "l_brace", "r_brace", "r_paren", "opt_semi", "semi",
+  "colon", "comma", 0
 };
 #endif
 
@@ -581,11 +594,12 @@ static const unsigned char yyr1[] =
       98,    98,    99,    99,   100,   100,   100,   100,   100,   101,
      101,   102,   102,   103,   103,   103,   103,   103,   103,   104,
      104,   104,   104,   104,   104,   104,   104,   105,   105,   105,
-     106,   106,   107,   107,   108,   108,   108,   108,   108,   109,
-     109,   109,   109,   109,   109,   109,   109,   109,   109,   109,
-     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
-     110,   110,   110,   111,   111,   112,   112,   112,   113,   114,
-     115,   116,   116,   117,   118,   119
+     106,   106,   107,   107,   108,   108,   108,   109,   109,   109,
+     109,   109,   109,   109,   109,   109,   109,   109,   110,   110,
+     110,   110,   110,   110,   110,   111,   111,   111,   111,   111,
+     111,   111,   111,   111,   111,   111,   111,   111,   111,   112,
+     112,   113,   113,   113,   114,   115,   115,   115,   116,   117,
+     118,   119,   119,   120,   121,   122
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -602,10 +616,11 @@ static const unsigned char yyr2[] =
        0,     2,     0,     1,     1,     3,     1,     2,     3,     0,
        1,     0,     1,     1,     3,     1,     2,     3,     3,     3,
        3,     3,     3,     3,     3,     5,     1,     1,     1,     2,
-       1,     1,     1,     1,     1,     2,     5,     1,     2,     1,
-       3,     3,     3,     3,     3,     3,     3,     4,     2,     2,
-       2,     3,     4,     4,     1,     4,     1,     2,     2,     1,
-       1,     2,     2,     0,     1,     1,     4,     2,     2,     2,
+       1,     1,     1,     1,     1,     1,     2,     1,     3,     3,
+       3,     3,     3,     3,     3,     2,     2,     5,     4,     3,
+       3,     3,     3,     3,     3,     1,     2,     3,     4,     4,
+       1,     4,     1,     2,     2,     1,     1,     2,     2,     0,
+       1,     1,     4,     1,     3,     1,     1,     0,     2,     2,
        1,     0,     1,     1,     1,     2
 };
 
@@ -615,94 +630,96 @@ static const unsigned char yyr2[] =
 static const unsigned char yydefact[] =
 {
       78,    76,     0,    79,     3,     1,    77,     0,     5,     0,
-     145,   139,   140,    12,    13,    20,   143,     0,     0,     0,
-     134,    25,     0,     0,    24,     0,     0,     0,     4,     0,
-       0,   114,    22,     2,    10,   106,   117,   119,   136,     0,
-       0,     0,    80,   144,   137,   138,     0,     0,     0,     0,
-     142,   136,   141,   115,   130,   147,   136,    95,     0,    93,
-      78,   153,     6,     7,    29,    26,    78,     8,     0,   110,
+     151,   145,   146,    12,    13,    20,   149,     0,     0,     0,
+     140,    25,     0,     0,    24,     0,     0,     0,     4,     0,
+       0,   135,    22,     2,    10,   106,   114,   115,   117,   142,
+     153,     0,     0,     0,    80,   150,   143,   144,     0,     0,
+     148,   142,   147,   136,     0,   157,   142,    95,     0,    93,
+      78,   163,     6,     7,    29,    26,    78,     8,     0,   110,
        0,     0,     0,     0,     0,     0,   111,   113,   112,     0,
-     118,     0,     0,     0,     0,     0,     0,     0,   108,   107,
-     128,   129,     0,     0,     0,     0,    93,     0,    16,    15,
-      18,    19,     0,    17,     0,   126,     0,     0,     0,    96,
-      78,   150,     0,     0,   131,   148,     0,    30,    23,   102,
-     103,   100,   101,     0,    11,   104,   143,   124,   125,   121,
-     122,   123,   120,   109,    99,   135,   146,     0,    81,   132,
-     133,    97,   155,     0,    98,    94,    28,     0,    45,     0,
-       0,     0,    78,     0,     0,     0,    67,    68,     0,    89,
-       0,    78,    27,     0,    48,    33,    53,    26,   151,    78,
-       0,   127,    86,    84,     0,     0,   116,     0,    89,    51,
-       0,     0,     0,     0,    54,    40,    41,    42,     0,    90,
-      43,   149,    47,     0,     0,    78,   152,    31,   105,    78,
-      87,     0,     0,     0,     0,     0,     0,     0,     0,   145,
-      55,     0,    44,     0,    71,    69,    32,    14,    21,    88,
-      85,    78,    46,     0,    52,    78,    78,     0,     0,    78,
-      93,    72,    49,     0,    50,     0,     0,     0,     0,     0,
-       0,     0,    74,    57,    35,     0,    78,     0,    78,     0,
-      73,    78,    78,     0,    78,     0,    78,    54,    70,     0,
-       0,    59,     0,     0,    58,    36,    37,    54,     0,    75,
-      34,    62,    65,     0,     0,    66,     0,   154,    78,     0,
-      78,    64,    63,    78,    26,    78,     0,    26,     0,     0,
-      39,     0,    38
+       0,   116,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   108,   107,   125,   126,     0,     0,
+       0,     0,    93,     0,    16,    15,    18,    19,     0,    17,
+       0,   124,     0,     0,     0,   155,   156,   154,    96,    78,
+     160,     0,     0,   137,   158,     0,    30,    23,   102,   103,
+     100,   101,     0,    11,   104,   149,   122,   123,   119,   120,
+     121,   118,   133,   134,   130,   131,   132,   129,   109,    99,
+     141,   152,     0,    81,   138,   139,    97,   165,     0,    98,
+      94,    28,     0,    45,     0,     0,     0,    78,     0,     0,
+       0,    67,    68,     0,    89,     0,    78,    27,     0,    48,
+      33,    53,    26,   161,    78,     0,   128,    86,    84,     0,
+       0,   127,     0,    89,    51,     0,     0,     0,     0,    54,
+      40,    41,    42,     0,    90,    43,   159,    47,     0,     0,
+      78,   162,    31,   105,    78,    87,     0,     0,     0,     0,
+       0,     0,     0,     0,   151,    55,     0,    44,     0,    71,
+      69,    32,    14,    21,    88,    85,    78,    46,     0,    52,
+      78,    78,     0,     0,    78,    93,    72,    49,     0,    50,
+       0,     0,     0,     0,     0,     0,     0,    74,    57,    35,
+       0,    78,     0,    78,     0,    73,    78,    78,     0,    78,
+       0,    78,    54,    70,     0,     0,    59,     0,     0,    58,
+      36,    37,    54,     0,    75,    34,    62,    65,     0,     0,
+      66,     0,   164,    78,     0,    78,    64,    63,    78,    26,
+      78,     0,    26,     0,     0,    39,     0,    38
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,     2,     7,    28,    29,    62,   102,   103,    30,    41,
-      31,    68,    32,   116,    63,   162,   178,   163,   193,   211,
-     252,   253,   264,   276,   164,   214,   232,   241,   165,     3,
-       4,   105,   174,   175,   188,    94,    95,   166,    93,    78,
-      79,    35,    36,    37,    42,    38,   167,   168,   114,   195,
-     169,   278,   113
+      -1,     2,     7,    28,    29,    62,   108,   109,    30,    43,
+      31,    68,    32,   125,    63,   177,   193,   178,   208,   226,
+     267,   268,   279,   291,   179,   229,   247,   256,   180,     3,
+       4,   111,   189,   190,   203,   100,   101,   181,    99,    78,
+      79,    35,    36,    37,    38,    44,    39,    40,   117,   182,
+     183,   123,   210,   184,   293,   122
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -236
+#define YYPACT_NINF -221
 static const short int yypact[] =
 {
-     -15,  -236,    31,    -3,  -236,  -236,  -236,   292,  -236,    -8,
-      -2,  -236,  -236,  -236,  -236,  -236,    26,    26,    26,     4,
-       6,  -236,   934,   934,  -236,   876,   262,   717,  -236,   -16,
-       3,  -236,  -236,  -236,   769,   934,   480,  -236,   554,   656,
-     717,    33,    49,  -236,  -236,  -236,   656,   656,   934,   905,
-      41,    -1,    41,  -236,    41,  -236,  -236,  -236,   117,   695,
-     -15,  -236,  -236,  -236,    -3,  -236,   -15,  -236,   101,  -236,
-     905,   103,   905,   905,   905,   905,  -236,  -236,  -236,   905,
-     480,    74,   934,   934,   934,   934,   934,   934,  -236,  -236,
-    -236,  -236,   100,   905,    54,    17,   958,    32,  -236,  -236,
-    -236,  -236,    56,  -236,   934,  -236,    54,    54,   695,   905,
-     -15,  -236,    86,   739,  -236,  -236,   454,  -236,  -236,   133,
-    -236,   184,   166,   823,   958,     7,    26,   136,   136,    41,
-      41,    41,    41,  -236,   958,  -236,  -236,    43,   538,  -236,
-    -236,   958,  -236,   121,  -236,   958,  -236,    68,  -236,     2,
-      69,    70,   -15,    71,    61,    61,  -236,  -236,    61,   905,
-      61,   -15,  -236,    61,  -236,  -236,   958,  -236,    73,   -15,
-     905,  -236,  -236,  -236,    54,   123,  -236,   905,   905,    81,
-     131,   905,   905,   580,   793,  -236,  -236,  -236,    61,   958,
-    -236,  -236,  -236,   520,   454,   -15,  -236,  -236,   958,   -15,
-    -236,    45,   695,    61,   717,    83,   695,   695,   130,   -11,
-    -236,    73,  -236,   717,   147,  -236,  -236,  -236,  -236,  -236,
-    -236,   -15,  -236,    34,  -236,   -15,   -15,   108,   169,   -15,
-     508,  -236,  -236,   580,  -236,     3,   580,   905,    54,   634,
-     717,   905,   155,  -236,  -236,   695,   -15,   502,   -15,   117,
-     934,   -15,   -15,    19,   -15,   580,   -15,   847,  -236,   580,
-     111,  -236,   201,   132,  -236,  -236,  -236,   847,    54,  -236,
-    -236,  -236,  -236,   178,   179,  -236,   132,  -236,   -15,    54,
-     -15,  -236,  -236,   -15,  -236,   -15,   580,  -236,   346,   580,
-    -236,   400,  -236
+     -32,  -221,    35,    -3,  -221,  -221,  -221,   343,  -221,   -13,
+      -4,  -221,  -221,  -221,  -221,  -221,    32,    32,    32,    -6,
+      -5,  -221,   974,   974,  -221,   974,  1028,   768,  -221,   -26,
+       2,  -221,  -221,  -221,   820,   952,   392,   446,  -221,   125,
+    -221,   707,   768,   185,    11,  -221,  -221,  -221,   707,   707,
+       3,    -8,     3,     3,   974,    76,  -221,  -221,    42,   148,
+     -32,  -221,  -221,  -221,    -3,  -221,   -32,  -221,    87,  -221,
+     974,    93,   974,   974,   974,   974,  -221,  -221,  -221,   974,
+      69,   392,   974,   974,   974,   974,   974,   974,   974,   974,
+     974,   974,   974,   974,  -221,  -221,  -221,  -221,    97,   974,
+      50,    41,   746,    36,  -221,  -221,  -221,  -221,    46,  -221,
+     974,  -221,    50,    50,   148,  -221,  -221,  -221,   974,   -32,
+    -221,    81,   790,  -221,  -221,   505,  -221,  -221,    14,  -221,
+     540,   317,   874,   746,     7,    32,    70,    70,     3,     3,
+       3,     3,    70,    70,     3,     3,     3,     3,  -221,   746,
+    -221,  -221,    20,   392,  -221,  -221,   746,  -221,   115,  -221,
+     746,  -221,    80,  -221,    27,    82,    84,   -32,    89,   -18,
+     -18,  -221,  -221,   -18,   974,   -18,   -32,  -221,   -18,  -221,
+    -221,   746,  -221,    67,   -32,   974,  -221,  -221,  -221,    50,
+      48,  -221,   974,   974,    79,   150,   974,   974,   631,   844,
+    -221,  -221,  -221,   -18,   746,  -221,  -221,  -221,   571,   505,
+     -32,  -221,  -221,   746,   -32,  -221,    26,   148,   -18,   768,
+      98,   148,   148,   133,   -12,  -221,    67,  -221,   768,   151,
+    -221,  -221,  -221,  -221,  -221,  -221,   -32,  -221,    45,  -221,
+     -32,   -32,   111,   172,   -32,   546,  -221,  -221,   631,  -221,
+       2,   631,   974,    50,   685,   768,   974,   162,  -221,  -221,
+     148,   -32,   325,   -32,    42,   952,   -32,   -32,    21,   -32,
+     631,   -32,   898,  -221,   631,   117,  -221,   194,   137,  -221,
+    -221,  -221,   898,    50,  -221,  -221,  -221,  -221,   183,   186,
+    -221,   137,  -221,   -32,    50,   -32,  -221,  -221,   -32,  -221,
+     -32,   631,  -221,   397,   631,  -221,   451,  -221
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -236,  -236,  -236,  -236,  -236,   165,  -236,  -236,  -236,  -236,
-     -24,  -236,  -236,  -150,   152,  -178,  -236,  -165,  -236,  -235,
-    -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,  -236,   -22,
-      -7,  -236,  -236,  -236,    21,   -32,   -17,    47,  -236,  -236,
-    -236,   -41,    66,   175,    76,   -14,    -5,  -181,    52,  -236,
-       9,   -71,  -130
+    -221,  -221,  -221,  -221,  -221,   169,  -221,  -221,  -221,  -221,
+     -85,  -221,  -221,  -173,   -39,  -169,  -221,  -184,  -221,  -220,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,     5,
+      -7,  -221,  -221,  -221,    13,   -35,   -23,    73,  -221,  -221,
+    -221,   -56,   128,  -221,   178,    90,   -15,  -221,  -221,   -24,
+    -192,    55,  -221,   127,   -69,  -151
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -712,212 +729,228 @@ static const short int yypgoto[] =
 #define YYTABLE_NINF -93
 static const short int yytable[] =
 {
-      33,    53,    43,    44,    45,   208,   179,    64,    51,    51,
-      58,    51,    56,   216,   106,   107,   -93,   194,   109,   210,
-     261,    51,   268,    97,    65,    65,   228,   -92,     1,     1,
-      10,     5,   279,   109,    51,   109,    98,    99,    66,    90,
-      91,     6,   262,   263,   172,   201,   219,   173,    60,   220,
-      61,    40,    39,   115,    34,   242,   -93,   -93,   244,   117,
-      40,   -92,   180,   -56,    46,   110,    47,    60,    51,    51,
-      51,    51,    51,    51,    59,   100,   101,   266,   -92,   270,
-     110,   269,   110,   -92,   -56,    26,    96,    96,    50,    52,
-      51,    54,   210,    96,    96,   136,   108,   234,   104,    87,
-     240,    80,   210,   142,   -82,     1,   118,   120,   290,   126,
-     112,   292,    43,   133,    54,   111,   137,   119,   109,   121,
-     122,   123,   124,   143,   200,   176,   125,    61,   177,   181,
-     182,   184,    64,    64,   288,   205,    64,   291,    64,    61,
-     134,    64,    69,   204,   224,   183,   135,   -93,   127,   128,
-     129,   130,   131,   132,   191,   227,   141,   231,   139,   140,
-     145,   215,   197,    66,    66,   110,    64,    66,   237,    66,
-     138,   110,    66,   238,   251,    69,   161,   196,   111,   277,
-      70,    64,    76,    77,   -83,   281,   282,   223,   217,    84,
-      85,    86,   218,    69,    87,    67,    58,    66,    70,   203,
-     250,    55,   171,    71,    72,   283,   189,     0,   271,   272,
-       0,     0,    66,     0,   233,    76,    77,   198,   235,   236,
-     229,    71,   239,   249,   202,   189,   199,    51,   206,   207,
-     243,     0,     0,    76,    77,     0,    51,     0,   275,   255,
-      96,   257,     0,     0,   259,   260,    21,   265,   248,   267,
-       0,    96,   273,   274,   221,    24,   256,     0,   225,   226,
-     230,     0,     0,     0,     0,     9,    10,     0,     0,    11,
-      12,   284,     0,   286,     0,     0,   287,     0,   289,     0,
-       0,     0,     0,     0,   245,     0,   247,    96,     0,     0,
-     246,     0,   -78,     8,     0,     9,    10,   254,     0,    11,
-      12,   258,    17,    18,    19,    20,   185,   186,    13,    14,
-     187,     0,   190,    22,    23,   192,    80,     0,    48,     0,
-     280,    26,    49,     0,     0,     0,    15,    16,     0,     0,
-       0,   285,    17,    18,    19,    20,     1,    21,     0,     0,
-     212,     0,     0,    22,    23,     0,    24,   146,    25,     9,
-      10,    26,    27,    11,    12,   222,    -9,     0,    -9,     0,
-       0,     0,     0,     0,   147,     0,   148,   149,   150,   -61,
-     -61,   151,   152,   153,   154,   155,   156,   157,   158,   159,
-       0,    16,   160,     0,     0,     0,    17,    18,    19,    20,
-     -61,    21,     0,     0,     0,     0,     0,    22,    23,     0,
-      24,   146,    25,     9,    10,    26,    27,    11,    12,     0,
-      60,   -61,    61,     0,     0,     0,     0,     0,   147,     0,
-     148,   149,   150,   -60,   -60,   151,   152,   153,   154,   155,
-     156,   157,   158,   159,     0,    16,   160,     0,     0,     0,
-      17,    18,    19,    20,   -60,    21,     0,     0,     0,     0,
-       0,    22,    23,     0,    24,   146,    25,     9,    10,    26,
-      27,    11,    12,     0,    60,   -60,    61,     0,     0,     0,
-       0,     0,   147,     0,   148,   149,   150,     0,     0,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,     0,    16,
-     160,    81,     0,     0,    17,    18,    19,    20,     0,    21,
-       0,     0,     0,     0,     0,    22,    23,     0,    24,     0,
-      25,    69,     0,    26,    27,     0,    70,    69,    60,   161,
-      61,    57,    70,     9,    10,     0,     0,    11,    12,     0,
-     -91,    82,    83,    84,    85,    86,     0,     0,    87,    71,
-      72,    73,     0,     0,     0,    71,    72,    73,    74,   -93,
-       0,    76,    77,     0,    74,    16,   110,    76,    77,     0,
-      17,    18,    19,    20,   -91,    21,    88,    89,    61,   111,
-       0,    22,    23,     0,    24,     0,    25,     0,     0,    26,
-     213,   -91,     0,     9,    10,     0,   -91,    11,    12,    82,
-      83,    84,    85,    86,    90,    91,    87,     0,   147,    92,
-     148,   149,   150,     0,     0,   151,   152,   153,   154,   155,
-     156,   157,   158,   159,     0,    16,   160,     0,     0,     0,
-      17,    18,    19,    20,     0,    21,     0,     0,     0,     0,
-       0,    22,    23,     0,    24,     0,    25,     9,    10,    26,
-      27,    11,    12,     0,    60,     0,    61,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    57,     0,     9,
-      10,     0,     0,    11,    12,     0,     0,     0,     0,    16,
-       0,     0,     0,     0,    17,    18,    19,    20,     0,    21,
-       0,     0,     0,     0,     0,    22,    23,     0,    24,     0,
-      25,    16,     0,    26,    27,     0,    17,    18,    19,    20,
-      61,    21,     0,     0,    69,     0,     0,    22,    23,    70,
-      24,     0,    25,     0,     0,    26,    27,   -91,    57,     0,
+      33,    45,    46,    47,    58,    65,    65,    51,    51,   209,
+      51,    56,     1,   112,   113,   225,   -93,   231,     1,   103,
+      51,   187,   276,    69,   188,   243,     1,   234,   -93,   223,
+     235,   194,    96,    97,    64,     5,    10,   118,    60,   216,
+      61,     6,   118,   118,   277,   278,   118,    41,    61,   215,
+      42,   -92,   283,   124,    48,    49,   -93,   -93,    42,   126,
+     110,    87,   294,    76,    77,   -56,    60,    51,    51,    51,
+      51,    51,    51,    51,    51,    51,    51,    51,    51,   257,
+      34,   -82,   259,   285,   119,   -92,   -56,   195,   225,   119,
+     119,    26,   127,   119,   255,    51,   119,   129,   225,   151,
+      59,   281,   -92,   120,   135,   284,   152,   -92,   249,   -83,
+     148,   120,   157,   121,   102,   102,   115,   116,   158,   191,
+      45,   102,   102,    84,    85,    86,   303,   114,    87,   306,
+     200,   201,   305,    61,   202,   307,   205,    94,    95,   207,
+     192,   219,   196,   128,   197,   130,   131,   132,   133,   199,
+      50,    52,   134,    53,   220,   150,    66,    69,   242,   239,
+     198,   246,    70,    81,   227,    96,    97,   154,   155,   206,
+      98,   252,   149,   230,    64,    64,   253,   212,    64,   237,
+      64,   266,   176,    64,   292,    71,    72,    73,   104,   105,
+     296,   156,   290,   297,    74,   160,   238,    76,    77,    67,
+     265,   286,   287,   232,    55,    58,   218,   233,    64,   120,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   298,    64,     0,   186,   258,   106,   107,   248,
+       0,     0,   264,   250,   251,     0,     0,   254,   153,    21,
+       0,    51,     0,     0,   214,   288,   289,   204,    24,     0,
+      51,     0,     0,     0,   270,     0,   272,     0,   213,   274,
+     275,     0,   280,     0,   282,   217,   204,     0,     0,   221,
+     222,     0,   236,     0,     0,     0,   240,   241,     0,     0,
+       0,   102,     0,     0,     0,     0,   299,     0,   301,     0,
+       0,   302,   102,   304,     0,     0,    66,    66,     0,     0,
+      66,   245,    66,     0,     0,    66,     0,     0,   261,     0,
+     211,     0,     0,     0,     0,   269,     0,     0,     0,   273,
+       0,     0,     0,     0,     0,   260,    69,   262,   102,     0,
+      66,    70,     0,     0,    69,     0,     0,     0,   295,    70,
+       0,     0,     0,   -78,     8,    66,     9,    10,     0,   300,
+      11,    12,     0,   244,    71,    72,     0,     0,     0,    13,
+      14,     0,    71,    72,    73,     0,    76,    77,     0,     0,
+       0,    74,     0,     0,    76,    77,     0,    15,    16,     0,
+       0,   263,     0,    17,    18,    19,    20,     1,    21,   271,
+       0,    61,     0,    81,    22,    23,     0,    24,   161,    25,
+       9,    10,    26,    27,    11,    12,     0,    -9,     0,    -9,
+       0,     0,     0,     0,     0,   162,     0,   163,   164,   165,
+     -61,   -61,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,     0,    16,   175,     0,     0,     0,    17,    18,    19,
+      20,   -61,    21,    82,    83,    84,    85,    86,    22,    23,
+      87,    24,   161,    25,     9,    10,    26,    27,    11,    12,
+       0,    60,   -61,    61,     0,     0,     0,     0,     0,   162,
+       0,   163,   164,   165,   -60,   -60,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,     0,    16,   175,     0,     0,
+       0,    17,    18,    19,    20,   -60,    21,    88,    89,    90,
+      91,    92,    22,    23,    93,    24,   161,    25,     9,    10,
+      26,    27,    11,    12,     0,    60,   -60,    61,     0,     0,
+       0,     0,     0,   162,     0,   163,   164,   165,     0,     0,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,     0,
+      16,   175,     0,     0,     0,    17,    18,    19,    20,    69,
+      21,     0,     0,     0,    70,    69,    22,    23,     0,    24,
+      70,    25,     0,     0,    26,    27,     0,     0,     0,    60,
+     176,    61,    57,     0,     9,    10,     0,    71,    11,    12,
+       0,   -91,     0,    71,    72,    73,     0,     0,     0,    76,
+      77,     0,    74,     0,   119,    76,    77,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    16,   120,     0,     0,
+       0,    17,    18,    19,    20,   -91,    21,     0,     0,     0,
+       0,     0,    22,    23,     0,    24,     0,    25,     0,     0,
+      26,   228,   -91,     0,     9,    10,     0,   -91,    11,    12,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   162,
+       0,   163,   164,   165,     0,     0,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,     0,    16,   175,     0,     0,
+       0,    17,    18,    19,    20,     0,    21,     0,     0,     0,
+       0,     0,    22,    23,     0,    24,     0,    25,     9,    10,
+      26,    27,    11,    12,     0,    60,     0,    61,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    57,     0,
        9,    10,     0,     0,    11,    12,     0,     0,     0,     0,
-       0,     0,    71,    72,    73,     0,     0,     0,     0,     0,
-     144,    74,     9,    10,    76,    77,    11,    12,     0,     0,
-       0,     0,    16,     0,     0,     0,   111,    17,    18,    19,
-      20,     0,    21,     0,     0,     0,     0,     0,    22,    23,
-       0,    24,     0,    25,    16,     0,    26,    27,    69,    17,
-      18,    19,    20,    70,    21,     0,     0,     0,     0,     0,
-      22,    23,     0,    24,     0,    25,     9,   209,    26,    27,
-      11,    12,     0,     0,     0,     0,    71,    72,    73,     0,
-       0,     0,     0,     0,   149,    74,     0,    75,    76,    77,
-       0,     0,     0,   156,   157,     0,     0,     0,    16,     0,
-       0,     0,    69,    17,    18,    19,    20,    70,    21,     0,
-       0,     0,     0,     0,    22,    23,     0,    24,     0,    25,
-       9,    10,    26,    27,    11,    12,     0,     0,     0,     0,
-      71,    72,    73,     0,     0,     0,     0,     0,   149,    74,
-     170,     0,    76,    77,     0,     0,     0,   156,   157,     9,
-      10,     0,    16,    11,    12,     0,     0,    17,    18,    19,
-      20,     0,    21,     0,     0,     0,     0,     0,    22,    23,
-       0,    24,     0,    25,     0,     0,    26,    27,     9,    10,
-       0,    16,    11,    12,     0,     0,    17,    18,    19,    20,
-       0,    21,     0,     0,     0,     0,     0,    22,    23,     0,
-      24,     0,    48,     0,     0,    26,    49,     9,    10,     0,
-      16,    11,    12,     0,     0,    17,    18,    19,    20,     0,
+      16,     0,     0,     0,     0,    17,    18,    19,    20,     0,
       21,     0,     0,     0,     0,     0,    22,    23,     0,    24,
-       0,    25,     0,     0,    26,    27,     0,    69,     0,    16,
-       0,     0,    70,     0,    17,    18,    19,    20,     0,     0,
-       0,     0,     0,     0,     0,    22,    23,     0,     0,     0,
-      48,     0,     0,    26,    49,    71,    72,    73,     0,     0,
-       0,     0,     0,     0,    74,     0,     0,    76,    77
+       0,    25,    16,     0,    26,    27,     0,    17,    18,    19,
+      20,    61,    21,     0,     0,    69,     0,     0,    22,    23,
+      70,    24,     0,    25,     0,     0,    26,    27,   -91,    57,
+       0,     9,    10,     0,     0,    11,    12,     0,     0,     0,
+       0,     0,     0,    71,    72,    73,     0,     0,     0,     0,
+       0,   159,    74,     9,    10,    76,    77,    11,    12,     0,
+       0,     0,     0,    16,     0,     0,     0,     0,    17,    18,
+      19,    20,     0,    21,     0,     0,     0,     0,     0,    22,
+      23,     0,    24,     0,    25,    16,     0,    26,    27,    69,
+      17,    18,    19,    20,    70,    21,     0,     0,     0,     0,
+       0,    22,    23,     0,    24,     0,    25,     9,   224,    26,
+      27,    11,    12,     0,     0,     0,     0,    71,    72,    73,
+       0,     0,     0,     0,     0,   164,    74,     0,    75,    76,
+      77,     0,     0,     0,   171,   172,     0,     0,     0,    16,
+       0,     0,     0,    69,    17,    18,    19,    20,    70,    21,
+       0,     0,     0,     0,     0,    22,    23,     0,    24,     0,
+      25,     9,    10,    26,    27,    11,    12,     0,     0,     0,
+       0,    71,    72,    73,     0,     0,     0,     0,     0,   164,
+      74,   185,     0,    76,    77,     0,     0,     0,   171,   172,
+       0,     0,     0,    16,     0,     0,     0,     0,    17,    18,
+      19,    20,     0,    21,     0,     0,     0,     0,     0,    22,
+      23,     0,    24,     0,    25,     9,    10,    26,    27,    11,
+      12,     0,     0,    80,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     9,    10,     0,
+       0,    11,    12,     0,     0,     0,     0,    16,     0,     0,
+       0,     0,    17,    18,    19,    20,     0,    21,     0,     0,
+       0,     0,     0,    22,    23,     0,    24,     0,    25,    16,
+       0,    26,    27,     0,    17,    18,    19,    20,     0,    21,
+       0,     0,     0,     0,     0,    22,    23,     0,    24,     0,
+      25,     9,    10,    26,    27,    11,    12,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    17,    18,
+      19,    20,     0,    21,     0,     0,     0,     0,     0,    22,
+      23,     0,    24,     0,    25,     0,     0,    26,    54
 };
 
 static const short int yycheck[] =
 {
-       7,    25,    16,    17,    18,   183,     4,    29,    22,    23,
-      27,    25,    26,   194,    46,    47,     9,   167,     1,   184,
-       1,    35,   257,    40,    29,    30,    37,    10,    44,    44,
-       4,     0,   267,     1,    48,     1,     3,     4,    29,    40,
-      41,    44,    23,    24,     1,   175,     1,     4,    64,     4,
-      66,    62,    60,    60,     7,   233,    49,    50,   236,    66,
-      62,    44,    60,    44,    60,    48,    60,    64,    82,    83,
-      84,    85,    86,    87,    27,    42,    43,   255,    61,   260,
-      48,   259,    48,    66,    65,    59,    39,    40,    22,    23,
-     104,    25,   257,    46,    47,    63,    49,    63,    49,    58,
-     230,    35,   267,   110,    61,    44,     5,     4,   286,    35,
-      58,   289,   126,    13,    48,    61,    60,    70,     1,    72,
-      73,    74,    75,    37,     1,     4,    79,    66,    60,    60,
-      60,    60,   154,   155,   284,     4,   158,   287,   160,    66,
-      93,   163,     9,    62,    61,   152,    94,    14,    82,    83,
-      84,    85,    86,    87,   161,    25,   109,    10,   106,   107,
-     113,   193,   169,   154,   155,    48,   188,   158,    60,   160,
-     104,    48,   163,     4,    19,     9,    65,   168,    61,    47,
-      14,   203,    49,    50,    61,     7,     7,   204,   195,    53,
-      54,    55,   199,     9,    58,    30,   213,   188,    14,   178,
-     241,    26,   126,    37,    38,   276,   159,    -1,     7,     8,
-      -1,    -1,   203,    -1,   221,    49,    50,   170,   225,   226,
-     211,    37,   229,   240,   177,   178,   174,   241,   181,   182,
-     235,    -1,    -1,    49,    50,    -1,   250,    -1,   262,   246,
-     193,   248,    -1,    -1,   251,   252,    45,   254,   239,   256,
-      -1,   204,    51,    52,   202,    54,   247,    -1,   206,   207,
-     213,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
-       8,   278,    -1,   280,    -1,    -1,   283,    -1,   285,    -1,
-      -1,    -1,    -1,    -1,   237,    -1,   239,   240,    -1,    -1,
-     238,    -1,     0,     1,    -1,     3,     4,   245,    -1,     7,
-       8,   249,    40,    41,    42,    43,   154,   155,    16,    17,
-     158,    -1,   160,    51,    52,   163,   250,    -1,    56,    -1,
-     268,    59,    60,    -1,    -1,    -1,    34,    35,    -1,    -1,
-      -1,   279,    40,    41,    42,    43,    44,    45,    -1,    -1,
-     188,    -1,    -1,    51,    52,    -1,    54,     1,    56,     3,
-       4,    59,    60,     7,     8,   203,    64,    -1,    66,    -1,
-      -1,    -1,    -1,    -1,    18,    -1,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      -1,    35,    36,    -1,    -1,    -1,    40,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,
-      54,     1,    56,     3,     4,    59,    60,     7,     8,    -1,
-      64,    65,    66,    -1,    -1,    -1,    -1,    -1,    18,    -1,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    -1,    35,    36,    -1,    -1,    -1,
-      40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    -1,
-      -1,    51,    52,    -1,    54,     1,    56,     3,     4,    59,
-      60,     7,     8,    -1,    64,    65,    66,    -1,    -1,    -1,
-      -1,    -1,    18,    -1,    20,    21,    22,    -1,    -1,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    -1,    35,
-      36,    11,    -1,    -1,    40,    41,    42,    43,    -1,    45,
-      -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    54,    -1,
-      56,     9,    -1,    59,    60,    -1,    14,     9,    64,    65,
-      66,     1,    14,     3,     4,    -1,    -1,     7,     8,    -1,
-      10,    51,    52,    53,    54,    55,    -1,    -1,    58,    37,
-      38,    39,    -1,    -1,    -1,    37,    38,    39,    46,    11,
-      -1,    49,    50,    -1,    46,    35,    48,    49,    50,    -1,
-      40,    41,    42,    43,    44,    45,    12,    13,    66,    61,
-      -1,    51,    52,    -1,    54,    -1,    56,    -1,    -1,    59,
-      60,    61,    -1,     3,     4,    -1,    66,     7,     8,    51,
-      52,    53,    54,    55,    40,    41,    58,    -1,    18,    45,
-      20,    21,    22,    -1,    -1,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    -1,    35,    36,    -1,    -1,    -1,
-      40,    41,    42,    43,    -1,    45,    -1,    -1,    -1,    -1,
-      -1,    51,    52,    -1,    54,    -1,    56,     3,     4,    59,
-      60,     7,     8,    -1,    64,    -1,    66,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     1,    -1,     3,
-       4,    -1,    -1,     7,     8,    -1,    -1,    -1,    -1,    35,
-      -1,    -1,    -1,    -1,    40,    41,    42,    43,    -1,    45,
-      -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    54,    -1,
-      56,    35,    -1,    59,    60,    -1,    40,    41,    42,    43,
-      66,    45,    -1,    -1,     9,    -1,    -1,    51,    52,    14,
-      54,    -1,    56,    -1,    -1,    59,    60,    61,     1,    -1,
+       7,    16,    17,    18,    27,    29,    30,    22,    23,   182,
+      25,    26,    44,    48,    49,   199,     9,   209,    44,    42,
+      35,     1,     1,     9,     4,    37,    44,     1,    14,   198,
+       4,     4,    40,    41,    29,     0,     4,     1,    64,   190,
+      66,    44,     1,     1,    23,    24,     1,    60,    66,     1,
+      62,    10,   272,    60,    60,    60,    49,    50,    62,    66,
+      49,    58,   282,    49,    50,    44,    64,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,   248,
+       7,    61,   251,   275,    48,    44,    65,    60,   272,    48,
+      48,    59,     5,    48,   245,   110,    48,     4,   282,    63,
+      27,   270,    61,    61,    35,   274,    60,    66,    63,    61,
+      13,    61,   119,    58,    41,    42,    40,    41,    37,     4,
+     135,    48,    49,    53,    54,    55,   299,    54,    58,   302,
+     169,   170,   301,    66,   173,   304,   175,    12,    13,   178,
+      60,    62,    60,    70,    60,    72,    73,    74,    75,    60,
+      22,    23,    79,    25,     4,   100,    29,     9,    25,    61,
+     167,    10,    14,    35,   203,    40,    41,   112,   113,   176,
+      45,    60,    99,   208,   169,   170,     4,   184,   173,   218,
+     175,    19,    65,   178,    47,    37,    38,    39,     3,     4,
+       7,   118,   277,     7,    46,   122,   219,    49,    50,    30,
+     256,     7,     8,   210,    26,   228,   193,   214,   203,    61,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,   291,   218,    -1,   135,   250,    42,    43,   236,
+      -1,    -1,   255,   240,   241,    -1,    -1,   244,   110,    45,
+      -1,   256,    -1,    -1,   189,    51,    52,   174,    54,    -1,
+     265,    -1,    -1,    -1,   261,    -1,   263,    -1,   185,   266,
+     267,    -1,   269,    -1,   271,   192,   193,    -1,    -1,   196,
+     197,    -1,   217,    -1,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   208,    -1,    -1,    -1,    -1,   293,    -1,   295,    -1,
+      -1,   298,   219,   300,    -1,    -1,   169,   170,    -1,    -1,
+     173,   228,   175,    -1,    -1,   178,    -1,    -1,   253,    -1,
+     183,    -1,    -1,    -1,    -1,   260,    -1,    -1,    -1,   264,
+      -1,    -1,    -1,    -1,    -1,   252,     9,   254,   255,    -1,
+     203,    14,    -1,    -1,     9,    -1,    -1,    -1,   283,    14,
+      -1,    -1,    -1,     0,     1,   218,     3,     4,    -1,   294,
+       7,     8,    -1,   226,    37,    38,    -1,    -1,    -1,    16,
+      17,    -1,    37,    38,    39,    -1,    49,    50,    -1,    -1,
+      -1,    46,    -1,    -1,    49,    50,    -1,    34,    35,    -1,
+      -1,   254,    -1,    40,    41,    42,    43,    44,    45,   262,
+      -1,    66,    -1,   265,    51,    52,    -1,    54,     1,    56,
+       3,     4,    59,    60,     7,     8,    -1,    64,    -1,    66,
+      -1,    -1,    -1,    -1,    -1,    18,    -1,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    -1,    35,    36,    -1,    -1,    -1,    40,    41,    42,
+      43,    44,    45,    51,    52,    53,    54,    55,    51,    52,
+      58,    54,     1,    56,     3,     4,    59,    60,     7,     8,
+      -1,    64,    65,    66,    -1,    -1,    -1,    -1,    -1,    18,
+      -1,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    -1,    35,    36,    -1,    -1,
+      -1,    40,    41,    42,    43,    44,    45,    51,    52,    53,
+      54,    55,    51,    52,    58,    54,     1,    56,     3,     4,
+      59,    60,     7,     8,    -1,    64,    65,    66,    -1,    -1,
+      -1,    -1,    -1,    18,    -1,    20,    21,    22,    -1,    -1,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    -1,
+      35,    36,    -1,    -1,    -1,    40,    41,    42,    43,     9,
+      45,    -1,    -1,    -1,    14,     9,    51,    52,    -1,    54,
+      14,    56,    -1,    -1,    59,    60,    -1,    -1,    -1,    64,
+      65,    66,     1,    -1,     3,     4,    -1,    37,     7,     8,
+      -1,    10,    -1,    37,    38,    39,    -1,    -1,    -1,    49,
+      50,    -1,    46,    -1,    48,    49,    50,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    35,    61,    -1,    -1,
+      -1,    40,    41,    42,    43,    44,    45,    -1,    -1,    -1,
+      -1,    -1,    51,    52,    -1,    54,    -1,    56,    -1,    -1,
+      59,    60,    61,    -1,     3,     4,    -1,    66,     7,     8,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,
+      -1,    20,    21,    22,    -1,    -1,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    -1,    35,    36,    -1,    -1,
+      -1,    40,    41,    42,    43,    -1,    45,    -1,    -1,    -1,
+      -1,    -1,    51,    52,    -1,    54,    -1,    56,     3,     4,
+      59,    60,     7,     8,    -1,    64,    -1,    66,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     1,    -1,
        3,     4,    -1,    -1,     7,     8,    -1,    -1,    -1,    -1,
-      -1,    -1,    37,    38,    39,    -1,    -1,    -1,    -1,    -1,
-       1,    46,     3,     4,    49,    50,     7,     8,    -1,    -1,
-      -1,    -1,    35,    -1,    -1,    -1,    61,    40,    41,    42,
-      43,    -1,    45,    -1,    -1,    -1,    -1,    -1,    51,    52,
-      -1,    54,    -1,    56,    35,    -1,    59,    60,     9,    40,
-      41,    42,    43,    14,    45,    -1,    -1,    -1,    -1,    -1,
-      51,    52,    -1,    54,    -1,    56,     3,     4,    59,    60,
-       7,     8,    -1,    -1,    -1,    -1,    37,    38,    39,    -1,
-      -1,    -1,    -1,    -1,    21,    46,    -1,    48,    49,    50,
-      -1,    -1,    -1,    30,    31,    -1,    -1,    -1,    35,    -1,
-      -1,    -1,     9,    40,    41,    42,    43,    14,    45,    -1,
-      -1,    -1,    -1,    -1,    51,    52,    -1,    54,    -1,    56,
-       3,     4,    59,    60,     7,     8,    -1,    -1,    -1,    -1,
-      37,    38,    39,    -1,    -1,    -1,    -1,    -1,    21,    46,
-      47,    -1,    49,    50,    -1,    -1,    -1,    30,    31,     3,
-       4,    -1,    35,     7,     8,    -1,    -1,    40,    41,    42,
-      43,    -1,    45,    -1,    -1,    -1,    -1,    -1,    51,    52,
-      -1,    54,    -1,    56,    -1,    -1,    59,    60,     3,     4,
-      -1,    35,     7,     8,    -1,    -1,    40,    41,    42,    43,
-      -1,    45,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,
-      54,    -1,    56,    -1,    -1,    59,    60,     3,     4,    -1,
-      35,     7,     8,    -1,    -1,    40,    41,    42,    43,    -1,
+      35,    -1,    -1,    -1,    -1,    40,    41,    42,    43,    -1,
       45,    -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    54,
-      -1,    56,    -1,    -1,    59,    60,    -1,     9,    -1,    35,
-      -1,    -1,    14,    -1,    40,    41,    42,    43,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    -1,    -1,
-      56,    -1,    -1,    59,    60,    37,    38,    39,    -1,    -1,
-      -1,    -1,    -1,    -1,    46,    -1,    -1,    49,    50
+      -1,    56,    35,    -1,    59,    60,    -1,    40,    41,    42,
+      43,    66,    45,    -1,    -1,     9,    -1,    -1,    51,    52,
+      14,    54,    -1,    56,    -1,    -1,    59,    60,    61,     1,
+      -1,     3,     4,    -1,    -1,     7,     8,    -1,    -1,    -1,
+      -1,    -1,    -1,    37,    38,    39,    -1,    -1,    -1,    -1,
+      -1,     1,    46,     3,     4,    49,    50,     7,     8,    -1,
+      -1,    -1,    -1,    35,    -1,    -1,    -1,    -1,    40,    41,
+      42,    43,    -1,    45,    -1,    -1,    -1,    -1,    -1,    51,
+      52,    -1,    54,    -1,    56,    35,    -1,    59,    60,     9,
+      40,    41,    42,    43,    14,    45,    -1,    -1,    -1,    -1,
+      -1,    51,    52,    -1,    54,    -1,    56,     3,     4,    59,
+      60,     7,     8,    -1,    -1,    -1,    -1,    37,    38,    39,
+      -1,    -1,    -1,    -1,    -1,    21,    46,    -1,    48,    49,
+      50,    -1,    -1,    -1,    30,    31,    -1,    -1,    -1,    35,
+      -1,    -1,    -1,     9,    40,    41,    42,    43,    14,    45,
+      -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    54,    -1,
+      56,     3,     4,    59,    60,     7,     8,    -1,    -1,    -1,
+      -1,    37,    38,    39,    -1,    -1,    -1,    -1,    -1,    21,
+      46,    47,    -1,    49,    50,    -1,    -1,    -1,    30,    31,
+      -1,    -1,    -1,    35,    -1,    -1,    -1,    -1,    40,    41,
+      42,    43,    -1,    45,    -1,    -1,    -1,    -1,    -1,    51,
+      52,    -1,    54,    -1,    56,     3,     4,    59,    60,     7,
+       8,    -1,    -1,    11,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,     8,    -1,    -1,    -1,    -1,    35,    -1,    -1,
+      -1,    -1,    40,    41,    42,    43,    -1,    45,    -1,    -1,
+      -1,    -1,    -1,    51,    52,    -1,    54,    -1,    56,    35,
+      -1,    59,    60,    -1,    40,    41,    42,    43,    -1,    45,
+      -1,    -1,    -1,    -1,    -1,    51,    52,    -1,    54,    -1,
+      56,     3,     4,    59,    60,     7,     8,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    41,
+      42,    43,    -1,    45,    -1,    -1,    -1,    -1,    -1,    51,
+      52,    -1,    54,    -1,    56,    -1,    -1,    59,    60
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -927,33 +960,34 @@ static const unsigned char yystos[] =
        0,    44,    68,    96,    97,     0,    44,    69,     1,     3,
        4,     7,     8,    16,    17,    34,    35,    40,    41,    42,
       43,    45,    51,    52,    54,    56,    59,    60,    70,    71,
-      75,    77,    79,    97,   104,   108,   109,   110,   112,    60,
-      62,    76,   111,   112,   112,   112,    60,    60,    56,    60,
-     109,   112,   109,    77,   109,   110,   112,     1,   103,   104,
-      64,    66,    72,    81,    96,   113,   117,    72,    78,     9,
+      75,    77,    79,    97,   104,   108,   109,   110,   111,   113,
+     114,    60,    62,    76,   112,   113,   113,   113,    60,    60,
+     109,   113,   109,   109,    60,   111,   113,     1,   103,   104,
+      64,    66,    72,    81,    96,   116,   120,    72,    78,     9,
       14,    37,    38,    39,    46,    48,    49,    50,   106,   107,
-     109,    11,    51,    52,    53,    54,    55,    58,    12,    13,
-      40,    41,    45,   105,   102,   103,   104,   103,     3,     4,
-      42,    43,    73,    74,    49,    98,   102,   102,   104,     1,
-      48,    61,   115,   119,   115,    97,    80,    97,     5,   104,
-       4,   104,   104,   104,   104,   104,    35,   109,   109,   109,
-     109,   109,   109,    13,   104,   115,    63,    60,   109,   115,
-     115,   104,    97,    37,     1,   104,     1,    18,    20,    21,
-      22,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      36,    65,    82,    84,    91,    95,   104,   113,   114,   117,
-      47,   111,     1,     4,    99,   100,     4,    60,    83,     4,
-      60,    60,    60,    97,    60,    81,    81,    81,   101,   104,
-      81,    97,    81,    85,    80,   116,   117,    97,   104,   115,
-       1,   119,   104,   101,    62,     4,   104,   104,    82,     4,
-      84,    86,    81,    60,    92,   102,   114,    97,    97,     1,
-       4,   115,    81,   103,    61,   115,   115,    25,    37,   117,
-     104,    10,    93,    97,    63,    97,    97,    60,     4,    97,
-     119,    94,    82,   113,    82,   104,   115,   104,   117,   103,
-     108,    19,    87,    88,   115,    97,   117,    97,   115,    97,
-      97,     1,    23,    24,    89,    97,    82,    97,    86,    82,
-     114,     7,     8,    51,    52,    77,    90,    47,   118,    86,
-     115,     7,     7,   118,    97,   115,    97,    97,    80,    97,
-      82,    80,    82
+      11,   109,    51,    52,    53,    54,    55,    58,    51,    52,
+      53,    54,    55,    58,    12,    13,    40,    41,    45,   105,
+     102,   103,   104,   103,     3,     4,    42,    43,    73,    74,
+      49,    98,   102,   102,   104,    40,    41,   115,     1,    48,
+      61,   118,   122,   118,    97,    80,    97,     5,   104,     4,
+     104,   104,   104,   104,   104,    35,   109,   109,   109,   109,
+     109,   109,   109,   109,   109,   109,   109,   109,    13,   104,
+     118,    63,    60,   109,   118,   118,   104,    97,    37,     1,
+     104,     1,    18,    20,    21,    22,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    36,    65,    82,    84,    91,
+      95,   104,   116,   117,   120,    47,   112,     1,     4,    99,
+     100,     4,    60,    83,     4,    60,    60,    60,    97,    60,
+      81,    81,    81,   101,   104,    81,    97,    81,    85,    80,
+     119,   120,    97,   104,   118,     1,   122,   104,   101,    62,
+       4,   104,   104,    82,     4,    84,    86,    81,    60,    92,
+     102,   117,    97,    97,     1,     4,   118,    81,   103,    61,
+     118,   118,    25,    37,   120,   104,    10,    93,    97,    63,
+      97,    97,    60,     4,    97,   122,    94,    82,   116,    82,
+     104,   118,   104,   120,   103,   108,    19,    87,    88,   118,
+      97,   120,    97,   118,    97,    97,     1,    23,    24,    89,
+      97,    82,    97,    86,    82,   117,     7,     8,    51,    52,
+      77,    90,    47,   121,    86,   118,     7,     7,   121,    97,
+     118,    97,    97,    80,    97,    82,    80,    82
 };
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -1594,14 +1628,14 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 172 "awkgram.y"
+#line 179 "awkgram.y"
     {
 			check_funcs();
 		}
     break;
 
   case 4:
-#line 180 "awkgram.y"
+#line 187 "awkgram.y"
     {
 		begin_or_end_rule = parsing_end_rule = FALSE;
 		yyerrok;
@@ -1609,7 +1643,7 @@ yyreduce:
     break;
 
   case 5:
-#line 185 "awkgram.y"
+#line 192 "awkgram.y"
     {
 		begin_or_end_rule = parsing_end_rule = FALSE;
 		/*
@@ -1621,14 +1655,14 @@ yyreduce:
     break;
 
   case 6:
-#line 197 "awkgram.y"
+#line 204 "awkgram.y"
     {
 		(yyvsp[-1].nodeval)->rnode = (yyvsp[0].nodeval);
 	  }
     break;
 
   case 7:
-#line 201 "awkgram.y"
+#line 208 "awkgram.y"
     {
 		if ((yyvsp[-1].nodeval)->lnode != NULL) {
 			/* pattern rule with non-empty pattern */
@@ -1646,7 +1680,7 @@ yyreduce:
     break;
 
   case 8:
-#line 216 "awkgram.y"
+#line 223 "awkgram.y"
     {
 		can_return = FALSE;
 		if ((yyvsp[-1].nodeval))
@@ -1656,21 +1690,21 @@ yyreduce:
     break;
 
   case 9:
-#line 226 "awkgram.y"
+#line 233 "awkgram.y"
     {
 		(yyval.nodeval) = append_pattern(&expression_value, (NODE *) NULL);
 	  }
     break;
 
   case 10:
-#line 230 "awkgram.y"
+#line 237 "awkgram.y"
     {
 		(yyval.nodeval) = append_pattern(&expression_value, (yyvsp[0].nodeval));
 	  }
     break;
 
   case 11:
-#line 234 "awkgram.y"
+#line 241 "awkgram.y"
     {
 		NODE *r;
 
@@ -1683,38 +1717,46 @@ yyreduce:
     break;
 
   case 12:
-#line 244 "awkgram.y"
+#line 251 "awkgram.y"
     {
+		static int begin_seen = 0;
+		if (do_lint_old && ++begin_seen == 2)
+			warning(_("old awk does not support multiple `BEGIN' or `END' rules"));
+
 		begin_or_end_rule = TRUE;
 		(yyval.nodeval) = append_pattern(&begin_block, (NODE *) NULL);
 	  }
     break;
 
   case 13:
-#line 249 "awkgram.y"
+#line 260 "awkgram.y"
     {
+		static int end_seen = 0;
+		if (do_lint_old && ++end_seen == 2)
+			warning(_("old awk does not support multiple `BEGIN' or `END' rules"));
+
 		begin_or_end_rule = parsing_end_rule = TRUE;
 		(yyval.nodeval) = append_pattern(&end_block, (NODE *) NULL);
 	  }
     break;
 
   case 14:
-#line 257 "awkgram.y"
+#line 272 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[-3].nodeval); }
     break;
 
   case 15:
-#line 262 "awkgram.y"
+#line 277 "awkgram.y"
     { (yyval.sval) = (yyvsp[0].sval); }
     break;
 
   case 16:
-#line 264 "awkgram.y"
+#line 279 "awkgram.y"
     { (yyval.sval) = (yyvsp[0].sval); }
     break;
 
   case 17:
-#line 266 "awkgram.y"
+#line 281 "awkgram.y"
     {
 		yyerror(_("`%s' is a built-in function, it cannot be redefined"),
 			tokstart);
@@ -1725,14 +1767,14 @@ yyreduce:
     break;
 
   case 20:
-#line 282 "awkgram.y"
+#line 297 "awkgram.y"
     {
 			param_counter = 0;
 		}
     break;
 
   case 21:
-#line 286 "awkgram.y"
+#line 301 "awkgram.y"
     {
 			NODE *t;
 
@@ -1747,12 +1789,12 @@ yyreduce:
     break;
 
   case 22:
-#line 305 "awkgram.y"
+#line 320 "awkgram.y"
     { ++want_regexp; }
     break;
 
   case 23:
-#line 307 "awkgram.y"
+#line 322 "awkgram.y"
     {
 		  NODE *n;
 		  size_t len = strlen((yyvsp[0].sval));
@@ -1776,12 +1818,12 @@ yyreduce:
     break;
 
   case 26:
-#line 336 "awkgram.y"
+#line 351 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 27:
-#line 338 "awkgram.y"
+#line 353 "awkgram.y"
     {
 		if ((yyvsp[0].nodeval) == NULL)
 			(yyval.nodeval) = (yyvsp[-1].nodeval);
@@ -1802,42 +1844,42 @@ yyreduce:
     break;
 
   case 28:
-#line 356 "awkgram.y"
+#line 371 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 31:
-#line 366 "awkgram.y"
+#line 381 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 32:
-#line 368 "awkgram.y"
+#line 383 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[-1].nodeval); }
     break;
 
   case 33:
-#line 370 "awkgram.y"
+#line 385 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 34:
-#line 372 "awkgram.y"
+#line 387 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-6].nodeval), Node_K_switch, (yyvsp[-2].nodeval)); }
     break;
 
   case 35:
-#line 374 "awkgram.y"
+#line 389 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-3].nodeval), Node_K_while, (yyvsp[0].nodeval)); }
     break;
 
   case 36:
-#line 376 "awkgram.y"
+#line 391 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_K_do, (yyvsp[-5].nodeval)); }
     break;
 
   case 37:
-#line 378 "awkgram.y"
+#line 393 "awkgram.y"
     {
 		/*
 		 * Efficiency hack.  Recognize the special case of
@@ -1884,14 +1926,14 @@ yyreduce:
     break;
 
   case 38:
-#line 422 "awkgram.y"
+#line 437 "awkgram.y"
     {
 		(yyval.nodeval) = node((yyvsp[0].nodeval), Node_K_for, (NODE *) make_for_loop((yyvsp[-9].nodeval), (yyvsp[-6].nodeval), (yyvsp[-3].nodeval)));
 	  }
     break;
 
   case 39:
-#line 426 "awkgram.y"
+#line 441 "awkgram.y"
     {
 		(yyval.nodeval) = node((yyvsp[0].nodeval), Node_K_for,
 			(NODE *) make_for_loop((yyvsp[-8].nodeval), (NODE *) NULL, (yyvsp[-3].nodeval)));
@@ -1899,17 +1941,17 @@ yyreduce:
     break;
 
   case 40:
-#line 432 "awkgram.y"
+#line 447 "awkgram.y"
     { (yyval.nodeval) = node((NODE *) NULL, Node_K_break, (NODE *) NULL); }
     break;
 
   case 41:
-#line 435 "awkgram.y"
+#line 450 "awkgram.y"
     { (yyval.nodeval) = node((NODE *) NULL, Node_K_continue, (NODE *) NULL); }
     break;
 
   case 42:
-#line 437 "awkgram.y"
+#line 452 "awkgram.y"
     { NODETYPE type;
 
 		  if (begin_or_end_rule)
@@ -1921,8 +1963,10 @@ yyreduce:
     break;
 
   case 43:
-#line 446 "awkgram.y"
+#line 461 "awkgram.y"
     {
+		  static short warned = FALSE;
+
 		  if (do_traditional) {
 			/*
 			 * can't use yyerror, since may have overshot
@@ -1931,8 +1975,10 @@ yyreduce:
 			errcount++;
 			error(_("`nextfile' is a gawk extension"));
 		  }
-		  if (do_lint)
+		  if (do_lint && ! warned) {
+		  	warned = TRUE;
 			lintwarn(_("`nextfile' is a gawk extension"));
+		  }
 		  if (begin_or_end_rule) {
 			/* same thing */
 			errcount++;
@@ -1944,12 +1990,12 @@ yyreduce:
     break;
 
   case 44:
-#line 466 "awkgram.y"
+#line 485 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-1].nodeval), Node_K_exit, (NODE *) NULL); }
     break;
 
   case 45:
-#line 468 "awkgram.y"
+#line 487 "awkgram.y"
     {
 		  if (! can_return)
 			yyerror(_("`return' used outside function context"));
@@ -1957,7 +2003,7 @@ yyreduce:
     break;
 
   case 46:
-#line 473 "awkgram.y"
+#line 492 "awkgram.y"
     {
 		  (yyval.nodeval) = node((yyvsp[-1].nodeval) == NULL ? Nnull_string : (yyvsp[-1].nodeval),
 			Node_K_return, (NODE *) NULL);
@@ -1965,12 +2011,12 @@ yyreduce:
     break;
 
   case 48:
-#line 489 "awkgram.y"
+#line 508 "awkgram.y"
     { in_print = TRUE; in_parens = 0; }
     break;
 
   case 49:
-#line 490 "awkgram.y"
+#line 509 "awkgram.y"
     {
 		/*
 		 * Optimization: plain `print' has no expression list, so $3 is null.
@@ -1986,7 +2032,7 @@ yyreduce:
 			&& (yyvsp[-1].nodeval)->lnode->lnode->type == Node_val
 			&& (yyvsp[-1].nodeval)->lnode->lnode->numbr == 0.0))
 		) {
-			static int warned = FALSE;
+			static short warned = FALSE;
 
 			(yyval.nodeval) = node(NULL, Node_K_print_rec, (yyvsp[0].nodeval));
 
@@ -2004,15 +2050,19 @@ yyreduce:
     break;
 
   case 50:
-#line 521 "awkgram.y"
+#line 540 "awkgram.y"
     { (yyval.nodeval) = node(variable((yyvsp[-3].sval), CAN_FREE, Node_var_array), Node_K_delete, (yyvsp[-1].nodeval)); }
     break;
 
   case 51:
-#line 523 "awkgram.y"
+#line 542 "awkgram.y"
     {
-		  if (do_lint)
+		  static short warned = FALSE;
+
+		  if (do_lint && ! warned) {
+			warned = TRUE;
 			lintwarn(_("`delete array' is a gawk extension"));
+		  }
 		  if (do_traditional) {
 			/*
 			 * can't use yyerror, since may have overshot
@@ -2026,11 +2076,18 @@ yyreduce:
     break;
 
   case 52:
-#line 537 "awkgram.y"
+#line 560 "awkgram.y"
     {
-		  /* this is for tawk compatibility. maybe the warnings should always be done. */
-		  if (do_lint)
+		  /*
+		   * this is for tawk compatibility. maybe the warnings
+		   * should always be done.
+		   */
+		  static short warned = FALSE;
+
+		  if (do_lint && ! warned) {
+			warned = TRUE;
 			lintwarn(_("`delete(array)' is a non-portable tawk extension"));
+		  }
 		  if (do_traditional) {
 			/*
 			 * can't use yyerror, since may have overshot
@@ -2044,22 +2101,22 @@ yyreduce:
     break;
 
   case 53:
-#line 552 "awkgram.y"
+#line 582 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 54:
-#line 557 "awkgram.y"
+#line 587 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 55:
-#line 559 "awkgram.y"
+#line 589 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 56:
-#line 564 "awkgram.y"
+#line 594 "awkgram.y"
     {
 		if ((yyvsp[0].nodeval) == NULL) {
 			(yyval.nodeval) = NULL;
@@ -2111,12 +2168,12 @@ yyreduce:
     break;
 
   case 57:
-#line 616 "awkgram.y"
+#line 646 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 58:
-#line 618 "awkgram.y"
+#line 648 "awkgram.y"
     {
 		if ((yyvsp[0].nodeval) == NULL)
 			(yyval.nodeval) = (yyvsp[-1].nodeval);
@@ -2136,27 +2193,27 @@ yyreduce:
     break;
 
   case 59:
-#line 635 "awkgram.y"
+#line 665 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 60:
-#line 640 "awkgram.y"
+#line 670 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-3].nodeval), Node_K_case, (yyvsp[0].nodeval)); }
     break;
 
   case 61:
-#line 642 "awkgram.y"
+#line 672 "awkgram.y"
     { (yyval.nodeval) = node((NODE *) NULL, Node_K_default, (yyvsp[0].nodeval)); }
     break;
 
   case 62:
-#line 647 "awkgram.y"
+#line 677 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 63:
-#line 649 "awkgram.y"
+#line 679 "awkgram.y"
     {
 		(yyvsp[0].nodeval)->numbr = -(force_number((yyvsp[0].nodeval)));
 		(yyval.nodeval) = (yyvsp[0].nodeval);
@@ -2164,27 +2221,27 @@ yyreduce:
     break;
 
   case 64:
-#line 654 "awkgram.y"
+#line 684 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 65:
-#line 656 "awkgram.y"
+#line 686 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 66:
-#line 658 "awkgram.y"
+#line 688 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 70:
-#line 673 "awkgram.y"
+#line 703 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-3].nodeval), Node_expression_list, (yyvsp[-1].nodeval)); }
     break;
 
   case 71:
-#line 678 "awkgram.y"
+#line 708 "awkgram.y"
     {
 		in_print = FALSE;
 		in_parens = 0;
@@ -2193,12 +2250,12 @@ yyreduce:
     break;
 
   case 72:
-#line 683 "awkgram.y"
+#line 713 "awkgram.y"
     { in_print = FALSE; in_parens = 0; }
     break;
 
   case 73:
-#line 684 "awkgram.y"
+#line 714 "awkgram.y"
     {
 		(yyval.nodeval) = node((yyvsp[0].nodeval), (yyvsp[-2].nodetypeval), (NODE *) NULL);
 		if ((yyvsp[-2].nodetypeval) == Node_redirect_twoway
@@ -2210,7 +2267,7 @@ yyreduce:
     break;
 
   case 74:
-#line 696 "awkgram.y"
+#line 726 "awkgram.y"
     {
 		(yyval.nodeval) = node((yyvsp[-3].nodeval), Node_K_if, 
 			node((yyvsp[0].nodeval), Node_if_branches, (NODE *) NULL));
@@ -2218,83 +2275,83 @@ yyreduce:
     break;
 
   case 75:
-#line 702 "awkgram.y"
+#line 732 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-6].nodeval), Node_K_if,
 				node((yyvsp[-3].nodeval), Node_if_branches, (yyvsp[0].nodeval))); }
     break;
 
   case 80:
-#line 718 "awkgram.y"
+#line 748 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 81:
-#line 720 "awkgram.y"
+#line 750 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[0].nodeval), Node_redirect_input, (NODE *) NULL); }
     break;
 
   case 82:
-#line 725 "awkgram.y"
+#line 755 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 83:
-#line 727 "awkgram.y"
+#line 757 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 84:
-#line 732 "awkgram.y"
+#line 762 "awkgram.y"
     { (yyval.nodeval) = make_param((yyvsp[0].sval)); }
     break;
 
   case 85:
-#line 734 "awkgram.y"
+#line 764 "awkgram.y"
     { (yyval.nodeval) = append_right((yyvsp[-2].nodeval), make_param((yyvsp[0].sval))); yyerrok; }
     break;
 
   case 86:
-#line 736 "awkgram.y"
+#line 766 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 87:
-#line 738 "awkgram.y"
+#line 768 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 88:
-#line 740 "awkgram.y"
+#line 770 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 89:
-#line 746 "awkgram.y"
+#line 776 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 90:
-#line 748 "awkgram.y"
+#line 778 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 91:
-#line 753 "awkgram.y"
+#line 783 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 92:
-#line 755 "awkgram.y"
+#line 785 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 93:
-#line 760 "awkgram.y"
+#line 790 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[0].nodeval), Node_expression_list, (NODE *) NULL); }
     break;
 
   case 94:
-#line 762 "awkgram.y"
+#line 792 "awkgram.y"
     {
 			(yyval.nodeval) = append_right((yyvsp[-2].nodeval),
 				node((yyvsp[0].nodeval), Node_expression_list, (NODE *) NULL));
@@ -2303,27 +2360,27 @@ yyreduce:
     break;
 
   case 95:
-#line 768 "awkgram.y"
+#line 798 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 96:
-#line 770 "awkgram.y"
+#line 800 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 97:
-#line 772 "awkgram.y"
+#line 802 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 98:
-#line 774 "awkgram.y"
+#line 804 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
   case 99:
-#line 779 "awkgram.y"
+#line 809 "awkgram.y"
     {
 		  if (do_lint && (yyvsp[0].nodeval)->type == Node_regex)
 			lintwarn(_("regular expression on right of assignment"));
@@ -2345,17 +2402,17 @@ yyreduce:
     break;
 
   case 100:
-#line 798 "awkgram.y"
+#line 828 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_and, (yyvsp[0].nodeval)); }
     break;
 
   case 101:
-#line 800 "awkgram.y"
+#line 830 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_or, (yyvsp[0].nodeval)); }
     break;
 
   case 102:
-#line 802 "awkgram.y"
+#line 832 "awkgram.y"
     {
 		  if ((yyvsp[-2].nodeval)->type == Node_regex)
 			warning(_("regular expression on left of `~' or `!~' operator"));
@@ -2364,12 +2421,16 @@ yyreduce:
     break;
 
   case 103:
-#line 808 "awkgram.y"
-    { (yyval.nodeval) = node(variable((yyvsp[0].sval), CAN_FREE, Node_var_array), Node_in_array, (yyvsp[-2].nodeval)); }
+#line 838 "awkgram.y"
+    {
+		  if (do_lint_old)
+		    warning(_("old awk does not support the keyword `in' except after `for'"));
+		  (yyval.nodeval) = node(variable((yyvsp[0].sval), CAN_FREE, Node_var_array), Node_in_array, (yyvsp[-2].nodeval));
+		}
     break;
 
   case 104:
-#line 810 "awkgram.y"
+#line 844 "awkgram.y"
     {
 		  if (do_lint && (yyvsp[0].nodeval)->type == Node_regex)
 			lintwarn(_("regular expression on right of comparison"));
@@ -2378,108 +2439,92 @@ yyreduce:
     break;
 
   case 105:
-#line 816 "awkgram.y"
+#line 850 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-4].nodeval), Node_cond_exp, node((yyvsp[-2].nodeval), Node_if_branches, (yyvsp[0].nodeval)));}
     break;
 
   case 106:
-#line 818 "awkgram.y"
+#line 852 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 107:
-#line 823 "awkgram.y"
+#line 857 "awkgram.y"
     { (yyval.nodetypeval) = (yyvsp[0].nodetypeval); }
     break;
 
   case 108:
-#line 825 "awkgram.y"
+#line 859 "awkgram.y"
     { (yyval.nodetypeval) = (yyvsp[0].nodetypeval); }
     break;
 
   case 109:
-#line 827 "awkgram.y"
+#line 861 "awkgram.y"
     { (yyval.nodetypeval) = Node_assign_quotient; }
     break;
 
   case 110:
-#line 832 "awkgram.y"
+#line 866 "awkgram.y"
     { (yyval.nodetypeval) = (yyvsp[0].nodetypeval); }
     break;
 
   case 111:
-#line 834 "awkgram.y"
+#line 868 "awkgram.y"
     { (yyval.nodetypeval) = Node_less; }
     break;
 
   case 113:
-#line 839 "awkgram.y"
+#line 873 "awkgram.y"
     { (yyval.nodetypeval) = Node_greater; }
     break;
 
   case 114:
-#line 844 "awkgram.y"
+#line 878 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
   case 115:
-#line 846 "awkgram.y"
-    {
-		  (yyval.nodeval) = node(node(make_number(0.0),
-				 Node_field_spec,
-				 (NODE *) NULL),
-		            Node_nomatch,
-			    (yyvsp[0].nodeval));
-		}
-    break;
-
-  case 116:
-#line 854 "awkgram.y"
-    { (yyval.nodeval) = node(variable((yyvsp[0].sval), CAN_FREE, Node_var_array), Node_in_array, (yyvsp[-3].nodeval)); }
-    break;
-
-  case 117:
-#line 856 "awkgram.y"
+#line 880 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
-  case 118:
-#line 858 "awkgram.y"
+  case 116:
+#line 882 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-1].nodeval), Node_concat, (yyvsp[0].nodeval)); }
     break;
 
-  case 120:
-#line 865 "awkgram.y"
+  case 118:
+#line 889 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_exp, (yyvsp[0].nodeval)); }
     break;
 
-  case 121:
-#line 867 "awkgram.y"
+  case 119:
+#line 891 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_times, (yyvsp[0].nodeval)); }
     break;
 
-  case 122:
-#line 869 "awkgram.y"
+  case 120:
+#line 893 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_quotient, (yyvsp[0].nodeval)); }
     break;
 
-  case 123:
-#line 871 "awkgram.y"
+  case 121:
+#line 895 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_mod, (yyvsp[0].nodeval)); }
     break;
 
-  case 124:
-#line 873 "awkgram.y"
+  case 122:
+#line 897 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_plus, (yyvsp[0].nodeval)); }
     break;
 
-  case 125:
-#line 875 "awkgram.y"
+  case 123:
+#line 899 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_minus, (yyvsp[0].nodeval)); }
     break;
 
-  case 126:
-#line 877 "awkgram.y"
+  case 124:
+#line 901 "awkgram.y"
     {
 		  if (do_lint && parsing_end_rule && (yyvsp[0].nodeval) == NULL)
 			lintwarn(_("non-redirected `getline' undefined inside END action"));
@@ -2487,57 +2532,109 @@ yyreduce:
 		}
     break;
 
+  case 125:
+#line 907 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[-1].nodeval), Node_postincrement, (NODE *) NULL); }
+    break;
+
+  case 126:
+#line 909 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[-1].nodeval), Node_postdecrement, (NODE *) NULL); }
+    break;
+
   case 127:
-#line 883 "awkgram.y"
+#line 911 "awkgram.y"
     {
-		  (yyval.nodeval) = node((yyvsp[0].nodeval), Node_K_getline,
-			 node((yyvsp[-3].nodeval), (yyvsp[-2].nodetypeval), (NODE *) NULL));
+		  if (do_lint_old) {
+		    warning(_("old awk does not support the keyword `in' except after `for'"));
+		    warning(_("old awk does not support multidimensional arrays"));
+		  }
+		  (yyval.nodeval) = node(variable((yyvsp[0].sval), CAN_FREE, Node_var_array), Node_in_array, (yyvsp[-3].nodeval));
 		}
     break;
 
   case 128:
-#line 888 "awkgram.y"
-    { (yyval.nodeval) = node((yyvsp[-1].nodeval), Node_postincrement, (NODE *) NULL); }
+#line 924 "awkgram.y"
+    {
+		  (yyval.nodeval) = node((yyvsp[0].nodeval), Node_K_getline,
+			 node((yyvsp[-3].nodeval), (yyvsp[-2].nodetypeval), (NODE *) NULL));
+		}
     break;
 
   case 129:
-#line 890 "awkgram.y"
-    { (yyval.nodeval) = node((yyvsp[-1].nodeval), Node_postdecrement, (NODE *) NULL); }
+#line 929 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_exp, (yyvsp[0].nodeval)); }
     break;
 
   case 130:
-#line 895 "awkgram.y"
-    { (yyval.nodeval) = node((yyvsp[0].nodeval), Node_not, (NODE *) NULL); }
+#line 931 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_times, (yyvsp[0].nodeval)); }
     break;
 
   case 131:
-#line 897 "awkgram.y"
-    { (yyval.nodeval) = (yyvsp[-1].nodeval); }
+#line 933 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_quotient, (yyvsp[0].nodeval)); }
     break;
 
   case 132:
-#line 900 "awkgram.y"
-    { (yyval.nodeval) = snode((yyvsp[-1].nodeval), Node_builtin, (int) (yyvsp[-3].lval)); }
+#line 935 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_mod, (yyvsp[0].nodeval)); }
     break;
 
   case 133:
-#line 902 "awkgram.y"
-    { (yyval.nodeval) = snode((yyvsp[-1].nodeval), Node_builtin, (int) (yyvsp[-3].lval)); }
+#line 937 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_plus, (yyvsp[0].nodeval)); }
     break;
 
   case 134:
-#line 904 "awkgram.y"
+#line 939 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[-2].nodeval), Node_minus, (yyvsp[0].nodeval)); }
+    break;
+
+  case 135:
+#line 944 "awkgram.y"
+    { (yyval.nodeval) = (yyvsp[0].nodeval); }
+    break;
+
+  case 136:
+#line 946 "awkgram.y"
+    { (yyval.nodeval) = node((yyvsp[0].nodeval), Node_not, (NODE *) NULL); }
+    break;
+
+  case 137:
+#line 948 "awkgram.y"
+    { (yyval.nodeval) = (yyvsp[-1].nodeval); }
+    break;
+
+  case 138:
+#line 951 "awkgram.y"
+    { (yyval.nodeval) = snode((yyvsp[-1].nodeval), Node_builtin, (int) (yyvsp[-3].lval)); }
+    break;
+
+  case 139:
+#line 953 "awkgram.y"
+    { (yyval.nodeval) = snode((yyvsp[-1].nodeval), Node_builtin, (int) (yyvsp[-3].lval)); }
+    break;
+
+  case 140:
+#line 955 "awkgram.y"
     {
-		if (do_lint)
+		static short warned1 = FALSE, warned2 = FALSE;
+
+		if (do_lint && ! warned1) {
+			warned1 = TRUE;
 			lintwarn(_("call of `length' without parentheses is not portable"));
+		}
 		(yyval.nodeval) = snode((NODE *) NULL, Node_builtin, (int) (yyvsp[0].lval));
-		if (do_posix)
+		if (do_posix && ! warned2) {
+			warned2 = TRUE;
 			warning(_("call of `length' without parentheses is deprecated by POSIX"));
+		}
 	  }
     break;
 
-  case 135:
-#line 912 "awkgram.y"
+  case 141:
+#line 969 "awkgram.y"
     {
 		(yyval.nodeval) = node((yyvsp[-1].nodeval), Node_func_call, make_string((yyvsp[-3].sval), strlen((yyvsp[-3].sval))));
 		(yyval.nodeval)->funcbody = NULL;
@@ -2547,28 +2644,28 @@ yyreduce:
 	  }
     break;
 
-  case 137:
-#line 921 "awkgram.y"
+  case 143:
+#line 978 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[0].nodeval), Node_preincrement, (NODE *) NULL); }
     break;
 
-  case 138:
-#line 923 "awkgram.y"
+  case 144:
+#line 980 "awkgram.y"
     { (yyval.nodeval) = node((yyvsp[0].nodeval), Node_predecrement, (NODE *) NULL); }
     break;
 
-  case 139:
-#line 925 "awkgram.y"
+  case 145:
+#line 982 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
-  case 140:
-#line 927 "awkgram.y"
+  case 146:
+#line 984 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
-  case 141:
-#line 930 "awkgram.y"
+  case 147:
+#line 987 "awkgram.y"
     {
 		  if ((yyvsp[0].nodeval)->type == Node_val && ((yyvsp[0].nodeval)->flags & (STRCUR|STRING)) == 0) {
 			(yyvsp[0].nodeval)->numbr = -(force_number((yyvsp[0].nodeval)));
@@ -2578,8 +2675,8 @@ yyreduce:
 		}
     break;
 
-  case 142:
-#line 938 "awkgram.y"
+  case 148:
+#line 995 "awkgram.y"
     {
 		  /*
 		   * was: $$ = $2
@@ -2589,29 +2686,30 @@ yyreduce:
 		}
     break;
 
-  case 143:
-#line 949 "awkgram.y"
+  case 149:
+#line 1006 "awkgram.y"
     { (yyval.nodeval) = NULL; }
     break;
 
-  case 144:
-#line 951 "awkgram.y"
+  case 150:
+#line 1008 "awkgram.y"
     { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
-  case 145:
-#line 956 "awkgram.y"
+  case 151:
+#line 1013 "awkgram.y"
     { (yyval.nodeval) = variable((yyvsp[0].sval), CAN_FREE, Node_var_new); }
     break;
 
-  case 146:
-#line 958 "awkgram.y"
+  case 152:
+#line 1015 "awkgram.y"
     {
 		NODE *n;
 
-		if ((n = lookup((yyvsp[-3].sval))) != NULL && ! isarray(n))
+		if ((n = lookup((yyvsp[-3].sval))) != NULL && ! isarray(n)) {
 			yyerror(_("use of non-array as array"));
-		else if ((yyvsp[-1].nodeval) == NULL) {
+			(yyval.nodeval) = node(variable((yyvsp[-3].sval), CAN_FREE, Node_var_array), Node_subscript, (yyvsp[-1].nodeval));
+		} else if ((yyvsp[-1].nodeval) == NULL) {
 			fatal(_("invalid subscript expression"));
 		} else if ((yyvsp[-1].nodeval)->rnode == NULL) {
 			(yyval.nodeval) = node(variable((yyvsp[-3].sval), CAN_FREE, Node_var_array), Node_subscript, (yyvsp[-1].nodeval)->lnode);
@@ -2621,33 +2719,63 @@ yyreduce:
 	  }
     break;
 
-  case 147:
-#line 972 "awkgram.y"
-    { (yyval.nodeval) = node((yyvsp[0].nodeval), Node_field_spec, (NODE *) NULL); }
+  case 153:
+#line 1029 "awkgram.y"
+    { (yyval.nodeval) = (yyvsp[0].nodeval); }
     break;
 
-  case 149:
-#line 986 "awkgram.y"
+  case 154:
+#line 1040 "awkgram.y"
+    {
+		NODE *n = node((yyvsp[-1].nodeval), Node_field_spec, (NODE *) NULL);
+		if ((yyvsp[0].sval) != NULL) {
+			if ((yyvsp[0].sval)[0] == '+')
+				(yyval.nodeval) = node(n, Node_postincrement, (NODE *) NULL);
+			else
+				(yyval.nodeval) = node(n, Node_postdecrement, (NODE *) NULL);
+		} else {
+			(yyval.nodeval) = n;
+		}
+	  }
+    break;
+
+  case 155:
+#line 1054 "awkgram.y"
+    { (yyval.sval) = "+"; }
+    break;
+
+  case 156:
+#line 1055 "awkgram.y"
+    { (yyval.sval) = "-"; }
+    break;
+
+  case 157:
+#line 1056 "awkgram.y"
+    { (yyval.sval) = NULL; }
+    break;
+
+  case 159:
+#line 1064 "awkgram.y"
     { yyerrok; }
     break;
 
-  case 150:
-#line 990 "awkgram.y"
+  case 160:
+#line 1068 "awkgram.y"
     { yyerrok; }
     break;
 
-  case 153:
-#line 999 "awkgram.y"
+  case 163:
+#line 1077 "awkgram.y"
     { yyerrok; }
     break;
 
-  case 154:
-#line 1003 "awkgram.y"
+  case 164:
+#line 1081 "awkgram.y"
     { yyerrok; }
     break;
 
-  case 155:
-#line 1006 "awkgram.y"
+  case 165:
+#line 1084 "awkgram.y"
     { yyerrok; }
     break;
 
@@ -2655,7 +2783,7 @@ yyreduce:
     }
 
 /* Line 1037 of yacc.c.  */
-#line 2661 "y.tab.c"
+#line 2789 "y.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2883,7 +3011,7 @@ yyreturn:
 }
 
 
-#line 1009 "awkgram.y"
+#line 1087 "awkgram.y"
 
 
 struct token {
@@ -2966,7 +3094,7 @@ static const struct token tokentab[] = {
 #if defined(GAWKDEBUG) || defined(ARRAYDEBUG) /* || ... */
 {"stopme",	Node_builtin,    LEX_BUILTIN,	GAWKX|A(0),	stopme},
 #endif
-{"strftime",	Node_builtin,	 LEX_BUILTIN,	GAWKX|A(0)|A(1)|A(2), do_strftime},
+{"strftime",	Node_builtin,	 LEX_BUILTIN,	GAWKX|A(0)|A(1)|A(2)|A(3), do_strftime},
 {"strtonum",	Node_builtin,    LEX_BUILTIN,	GAWKX|A(1),	do_strtonum},
 {"sub",		Node_builtin,	 LEX_BUILTIN,	NOT_OLD|A(2)|A(3), do_sub},
 {"substr",	Node_builtin,	 LEX_BUILTIN,	A(2)|A(3),	do_substr},
@@ -3022,7 +3150,7 @@ getfname(register NODE *(*fptr)(NODE *))
  */
 
 static void
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
   yyerror(const char *m, ...)
 #else
 /* VARARGS0 */
@@ -3077,7 +3205,7 @@ static void
 
 	*bp = save;
 
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 	va_start(args, m);
 	if (mesg == NULL)
 		mesg = m;
@@ -3118,6 +3246,14 @@ get_src_buf()
 	static size_t buflen = 0;
 	static int fd;
 
+	/*
+	 * No argument prototype on readfunc on purpose,
+	 * avoids problems with some ancient systems where
+	 * the types of arguments to read() aren't up to date.
+	 */
+	static ssize_t (*readfunc)() = 0;
+	static int (*closefunc)P((int fd)) = NULL;
+
 	int n;
 	register char *scan;
 	int newfile;
@@ -3126,6 +3262,19 @@ get_src_buf()
 	int l;
 	char *readloc;
 
+	if (readfunc == NULL) {
+		char *cp = getenv("AWKREADFUNC");
+
+		/* If necessary, one day, test value for different functions.  */
+		if (cp == NULL) {
+			readfunc = read;
+			closefunc = close;
+		} else {
+			readfunc = read_one_line;
+			closefunc = one_line_close;
+		}
+	}
+
 again:
 	newfile = FALSE;
 	if (nextfile > numfiles)
@@ -3138,7 +3287,7 @@ again:
 			 *	gawk '' /path/name
 			 * Sigh.
 			 */
-			static int warned = FALSE;
+			static short warned = FALSE;
 
 			if (do_lint && ! warned) {
 				warned = TRUE;
@@ -3150,6 +3299,7 @@ again:
 		if (srcfiles[nextfile].val[l-1] == '\n') {
 			/* has terminating newline, can use it directly */
 			sourceline = 1;
+			source = NULL;
 			lexptr = lexptr_begin = srcfiles[nextfile].val;
 			/* fall through to pointer adjustment and return, below */
 		} else {
@@ -3171,6 +3321,8 @@ again:
 			buf[++l] = '\0';
 
 			/* set vars and return */
+			sourceline = 0;
+			source = NULL;
 			lexptr = lexptr_begin = buf;
 		}
 		lexend = lexptr + l;
@@ -3244,12 +3396,33 @@ again:
 			}
 		}
 
-		if (scan <= buf) {
+		/*
+		 * This condition can be read as follows: IF
+		 * 1. The beginning of the line is at the beginning of the
+		 *    buffer (no newline was found: scan <= buf)
+		 * AND:
+		 *    2. The start of valid lexical data is into the buffer
+		 *       (lexptr_begin > buf)
+		 *       OR:
+		 *       3. We have scanned past the end of the last data read
+		 *          (lexptr == lexend)
+		 *          AND:
+		 *          4. There's no room left in the buffer
+		 *             (lexptr_offset >= buflen - 2)
+		 *
+		 * If all that's true, grow the buffer to add more to
+		 * the current line.
+		 */
+
+		if (scan <= buf
+		    && (lexptr_begin > buf
+			|| (lexptr == lexend
+			    && lexptr_offset >= buflen - 2))) {
 			/* have to grow the buffer */
 			buflen *= 2;
 			erealloc(buf, char *, buflen, "get_src_buf");
-		} else {
-			/* shift things down */
+		} else if (scan > buf) {
+			/* Line starts in middle of the buffer, shift things down. */
 			memmove(buf, scan, lexend - scan);
 			/*
 			 * make offsets relative to start of line,
@@ -3270,13 +3443,13 @@ again:
 	}
 
 	/* add more data to buffer */
-	n = read(fd, readloc, readcount);
+	n = (*readfunc)(fd, readloc, readcount);
 	if (n == -1)
 		fatal(_("can't read sourcefile `%s' (%s)"),
 			source, strerror(errno));
 	if (n == 0) {
 		if (newfile) {
-			static int warned = FALSE;
+			static short warned = FALSE;
 
 			if (do_lint && ! warned) {
 				warned = TRUE;
@@ -3284,7 +3457,7 @@ again:
 			}
 		}
 		if (fd != fileno(stdin)) /* safety */
-			close(fd);
+			(*closefunc)(fd);
 		samefile = FALSE;
 		nextfile++;
 		goto again;
@@ -3463,7 +3636,8 @@ yylex(void)
 	int mid;
 	static int did_newline = FALSE;
 	char *tokkey;
-	static int lasttok = 0, eof_warned = FALSE;
+	static int lasttok = 0;
+	static short eof_warned = FALSE;
 	int inhex = FALSE;
 	int intlstr = FALSE;
 
@@ -3635,9 +3809,13 @@ retry:
 			while ((c = nextc()) == ' ' || c == '\t' || c == '\r')
 				continue;
 			if (c == '#') {
-				if (do_lint)
+				static short warned = FALSE;
+
+				if (do_lint && ! warned) {
+					warned = TRUE;
 					lintwarn(
 		_("use of `\\ #...' line continuation is not portable"));
+				}
 				while ((c = nextc()) != '\n')
 					if (c == EOF)
 						break;
@@ -4277,7 +4455,8 @@ snode(NODE *subn, NODETYPE op, int idx)
 	r->subnode = subn;
 	if (r->builtin == do_sprintf) {
 		count_args(r);
-		r->lnode->printf_count = r->printf_count; /* hack */
+		if (r->lnode != NULL)	/* r->lnode set from subn. guard against syntax errors & check it's valid */
+			r->lnode->printf_count = r->printf_count; /* hack */
 	}
 	return r;
 }
@@ -4397,7 +4576,7 @@ install(char *name, NODE *value)
 
 	var_count++;
 	len = strlen(name);
-	bucket = hash(name, len, (unsigned long) HASHSIZE);
+	bucket = hash(name, len, (unsigned long) HASHSIZE, NULL);
 	getnode(hp);
 	hp->type = Node_hashnode;
 	hp->hnext = variables[bucket];
@@ -4418,7 +4597,7 @@ lookup(const char *name)
 	register size_t len;
 
 	len = strlen(name);
-	for (bucket = variables[hash(name, len, (unsigned long) HASHSIZE)];
+	for (bucket = variables[hash(name, len, (unsigned long) HASHSIZE, NULL)];
 			bucket != NULL; bucket = bucket->hnext)
 		if (bucket->hlength == len && STREQN(bucket->hname, name, len))
 			return bucket->hvalue;
@@ -4799,7 +4978,7 @@ pop_var(NODE *np, int freeit)
 
 	name = np->param;
 	len = strlen(name);
-	save = &(variables[hash(name, len, (unsigned long) HASHSIZE)]);
+	save = &(variables[hash(name, len, (unsigned long) HASHSIZE, NULL)]);
 	for (bucket = *save; bucket != NULL; bucket = bucket->hnext) {
 		if (len == bucket->hlength && STREQN(bucket->hname, name, len)) {
 			var_count--;
@@ -4860,7 +5039,7 @@ func_use(const char *name, enum defref how)
 	int ind;
 
 	len = strlen(name);
-	ind = hash(name, len, HASHSIZE);
+	ind = hash(name, len, HASHSIZE, NULL);
 
 	for (fp = ftable[ind]; fp != NULL; fp = fp->next) {
 		if (strcmp(fp->name, name) == 0) {
@@ -5250,4 +5429,50 @@ check_special(const char *name)
 	return -1;
 }
 
+/*
+ * This provides a private version of functions that act like VMS's
+ * variable-length record filesystem, where there was a bug on
+ * certain source files.
+ */
+
+static FILE *fp = NULL;
+
+/* read_one_line --- return one input line at a time. mainly for debugging. */
+
+static ssize_t
+read_one_line(int fd, void *buffer, size_t count)
+{
+	char buf[BUFSIZ];
+
+	/* Minor potential memory leak here. Too bad. */
+	if (fp == NULL) {
+		fp = fdopen(fd, "r");
+		if (fp == NULL) {
+			fprintf(stderr, "ugh. fdopen: %s\n", strerror(errno));
+			exit(1);
+		}
+	}
+
+	if (fgets(buf, sizeof buf, fp) == NULL)
+		return 0;
+
+	memcpy(buffer, buf, strlen(buf));
+	return strlen(buf);
+}
+
+/* one_line_close --- close the open file being read with read_one_line() */
+
+static int
+one_line_close(int fd)
+{
+	int ret;
+
+	if (fp == NULL || fd != fileno(fp))
+		fatal("debugging read/close screwed up!");
+
+	ret = fclose(fp);
+	fp = NULL;
+	return ret;
+}
+
 
diff --git a/awkgram.y b/awkgram.y
index b222ddc1..2e6f4332 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -30,10 +30,14 @@
 
 #include "awk.h"
 
+#if defined(__STDC__) && __STDC__ < 1	/* VMS weirdness, maybe elsewhere */
+#define signed /**/
+#endif
+
 #define CAN_FREE	TRUE
 #define DONT_FREE	FALSE
 
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 static void yyerror(const char *m, ...) ATTRIBUTE_PRINTF_1;
 #else
 static void yyerror(); /* va_alist */
@@ -64,6 +68,9 @@ enum defref { FUNC_DEFINE, FUNC_USE };
 static void func_use P((const char *name, enum defref how));
 static void check_funcs P((void));
 
+static ssize_t read_one_line P((int fd, void *buffer, size_t count));
+static int one_line_close P((int fd));
+
 static int want_regexp;		/* lexical scanning kludge */
 static int can_return;		/* parsing kludge */
 static int begin_or_end_rule = FALSE;	/* parsing kludge */
@@ -118,15 +125,15 @@ static char builtin_func[] = "@builtin";
 
 %type <nodeval> function_prologue pattern action variable param_list
 %type <nodeval> exp common_exp
-%type <nodeval> simp_exp non_post_simp_exp
+%type <nodeval> simp_exp simp_exp_nc non_post_simp_exp
 %type <nodeval> expression_list opt_expression_list print_expression_list
 %type <nodeval> statements statement if_statement switch_body case_statements case_statement case_value opt_param_list 
 %type <nodeval> simple_stmt opt_simple_stmt
 %type <nodeval> opt_exp opt_variable regexp 
-%type <nodeval> input_redir output_redir
+%type <nodeval> input_redir output_redir field_spec
 %type <nodetypeval> print
 %type <nodetypeval> assign_operator a_relop relop_or_less
-%type <sval> func_name
+%type <sval> func_name opt_incdec
 %type <lval> lex_builtin
 
 %token <sval> FUNC_CALL NAME REGEXP
@@ -242,11 +249,19 @@ pattern
 	  }
 	| LEX_BEGIN
 	  {
+		static int begin_seen = 0;
+		if (do_lint_old && ++begin_seen == 2)
+			warning(_("old awk does not support multiple `BEGIN' or `END' rules"));
+
 		begin_or_end_rule = TRUE;
 		$$ = append_pattern(&begin_block, (NODE *) NULL);
 	  }
 	| LEX_END
 	  {
+		static int end_seen = 0;
+		if (do_lint_old && ++end_seen == 2)
+			warning(_("old awk does not support multiple `BEGIN' or `END' rules"));
+
 		begin_or_end_rule = parsing_end_rule = TRUE;
 		$$ = append_pattern(&end_block, (NODE *) NULL);
 	  }
@@ -444,6 +459,8 @@ statement
 		}
 	| LEX_NEXTFILE statement_term
 		{
+		  static short warned = FALSE;
+
 		  if (do_traditional) {
 			/*
 			 * can't use yyerror, since may have overshot
@@ -452,8 +469,10 @@ statement
 			errcount++;
 			error(_("`nextfile' is a gawk extension"));
 		  }
-		  if (do_lint)
+		  if (do_lint && ! warned) {
+		  	warned = TRUE;
 			lintwarn(_("`nextfile' is a gawk extension"));
+		  }
 		  if (begin_or_end_rule) {
 			/* same thing */
 			errcount++;
@@ -502,7 +521,7 @@ simple_stmt
 			&& $3->lnode->lnode->type == Node_val
 			&& $3->lnode->lnode->numbr == 0.0))
 		) {
-			static int warned = FALSE;
+			static short warned = FALSE;
 
 			$$ = node(NULL, Node_K_print_rec, $4);
 
@@ -521,8 +540,12 @@ simple_stmt
 		{ $$ = node(variable($2, CAN_FREE, Node_var_array), Node_K_delete, $4); }
 	| LEX_DELETE NAME
 		{
-		  if (do_lint)
+		  static short warned = FALSE;
+
+		  if (do_lint && ! warned) {
+			warned = TRUE;
 			lintwarn(_("`delete array' is a gawk extension"));
+		  }
 		  if (do_traditional) {
 			/*
 			 * can't use yyerror, since may have overshot
@@ -535,9 +558,16 @@ simple_stmt
 		}
 	| LEX_DELETE '(' NAME ')'
 		{
-		  /* this is for tawk compatibility. maybe the warnings should always be done. */
-		  if (do_lint)
+		  /*
+		   * this is for tawk compatibility. maybe the warnings
+		   * should always be done.
+		   */
+		  static short warned = FALSE;
+
+		  if (do_lint && ! warned) {
+			warned = TRUE;
 			lintwarn(_("`delete(array)' is a non-portable tawk extension"));
+		  }
 		  if (do_traditional) {
 			/*
 			 * can't use yyerror, since may have overshot
@@ -805,7 +835,11 @@ exp	: variable assign_operator exp %prec ASSIGNOP
 		  $$ = node($1, $2, mk_rexp($3));
 		}
 	| exp LEX_IN NAME
-		{ $$ = node(variable($3, CAN_FREE, Node_var_array), Node_in_array, $1); }
+		{
+		  if (do_lint_old)
+		    warning(_("old awk does not support the keyword `in' except after `for'"));
+		  $$ = node(variable($3, CAN_FREE, Node_var_array), Node_in_array, $1);
+		}
 	| exp a_relop exp %prec RELOP
 		{
 		  if (do_lint && $3->type == Node_regex)
@@ -840,19 +874,9 @@ a_relop
 	;
 
 common_exp
-	: regexp
+	: simp_exp
 		{ $$ = $1; }
-	| '!' regexp %prec UNARY
-		{
-		  $$ = node(node(make_number(0.0),
-				 Node_field_spec,
-				 (NODE *) NULL),
-		            Node_nomatch,
-			    $2);
-		}
-	| '(' expression_list r_paren LEX_IN NAME
-		{ $$ = node(variable($5, CAN_FREE, Node_var_array), Node_in_array, $2); }
-	| simp_exp
+	| simp_exp_nc
 		{ $$ = $1; }
 	| common_exp simp_exp %prec CONCAT_OP
 		{ $$ = node($1, Node_concat, $2); }
@@ -879,19 +903,46 @@ simp_exp
 			lintwarn(_("non-redirected `getline' undefined inside END action"));
 		  $$ = node($2, Node_K_getline, $3);
 		}
-	| simp_exp IO_IN LEX_GETLINE opt_variable
-		{
-		  $$ = node($4, Node_K_getline,
-			 node($1, $2, (NODE *) NULL));
-		}
 	| variable INCREMENT
 		{ $$ = node($1, Node_postincrement, (NODE *) NULL); }
 	| variable DECREMENT
 		{ $$ = node($1, Node_postdecrement, (NODE *) NULL); }
+	| '(' expression_list r_paren LEX_IN NAME
+		{
+		  if (do_lint_old) {
+		    warning(_("old awk does not support the keyword `in' except after `for'"));
+		    warning(_("old awk does not support multidimensional arrays"));
+		  }
+		  $$ = node(variable($5, CAN_FREE, Node_var_array), Node_in_array, $2);
+		}
+	;
+
+/* Expressions containing "| getline" lose the ability to be on the
+   right-hand side of a concatenation. */
+simp_exp_nc
+	: common_exp IO_IN LEX_GETLINE opt_variable
+		{
+		  $$ = node($4, Node_K_getline,
+			 node($1, $2, (NODE *) NULL));
+		}
+	| simp_exp_nc '^' simp_exp
+		{ $$ = node($1, Node_exp, $3); }
+	| simp_exp_nc '*' simp_exp
+		{ $$ = node($1, Node_times, $3); }
+	| simp_exp_nc '/' simp_exp
+		{ $$ = node($1, Node_quotient, $3); }
+	| simp_exp_nc '%' simp_exp
+		{ $$ = node($1, Node_mod, $3); }
+	| simp_exp_nc '+' simp_exp
+		{ $$ = node($1, Node_plus, $3); }
+	| simp_exp_nc '-' simp_exp
+		{ $$ = node($1, Node_minus, $3); }
 	;
 
 non_post_simp_exp
-	: '!' simp_exp %prec UNARY
+	: regexp
+		{ $$ = $1; }
+	| '!' simp_exp %prec UNARY
 		{ $$ = node($2, Node_not, (NODE *) NULL); }
 	| '(' exp r_paren
 		{ $$ = $2; }
@@ -902,11 +953,17 @@ non_post_simp_exp
 		{ $$ = snode($3, Node_builtin, (int) $1); }
 	| LEX_LENGTH
 	  {
-		if (do_lint)
+		static short warned1 = FALSE, warned2 = FALSE;
+
+		if (do_lint && ! warned1) {
+			warned1 = TRUE;
 			lintwarn(_("call of `length' without parentheses is not portable"));
+		}
 		$$ = snode((NODE *) NULL, Node_builtin, (int) $1);
-		if (do_posix)
+		if (do_posix && ! warned2) {
+			warned2 = TRUE;
 			warning(_("call of `length' without parentheses is deprecated by POSIX"));
+		}
 	  }
 	| FUNC_CALL '(' opt_expression_list r_paren
 	  {
@@ -958,9 +1015,10 @@ variable
 	  {
 		NODE *n;
 
-		if ((n = lookup($1)) != NULL && ! isarray(n))
+		if ((n = lookup($1)) != NULL && ! isarray(n)) {
 			yyerror(_("use of non-array as array"));
-		else if ($3 == NULL) {
+			$$ = node(variable($1, CAN_FREE, Node_var_array), Node_subscript, $3);
+		} else if ($3 == NULL) {
 			fatal(_("invalid subscript expression"));
 		} else if ($3->rnode == NULL) {
 			$$ = node(variable($1, CAN_FREE, Node_var_array), Node_subscript, $3->lnode);
@@ -968,8 +1026,7 @@ variable
 		} else
 			$$ = node(variable($1, CAN_FREE, Node_var_array), Node_subscript, $3);
 	  }
-	| '$' non_post_simp_exp
-		{ $$ = node($2, Node_field_spec, (NODE *) NULL); }
+	| field_spec { $$ = $1; }
 /*
 #if 0
 	| lex_builtin
@@ -978,6 +1035,27 @@ variable
 */
 	;
 
+field_spec
+	: '$' non_post_simp_exp opt_incdec
+	  {
+		NODE *n = node($2, Node_field_spec, (NODE *) NULL);
+		if ($3 != NULL) {
+			if ($3[0] == '+')
+				$$ = node(n, Node_postincrement, (NODE *) NULL);
+			else
+				$$ = node(n, Node_postdecrement, (NODE *) NULL);
+		} else {
+			$$ = n;
+		}
+	  }
+	;
+
+opt_incdec
+	: INCREMENT	{ $$ = "+"; }
+	| DECREMENT	{ $$ = "-"; }
+	| /* empty */	{ $$ = NULL; }
+	;
+
 l_brace
 	: '{' opt_nls
 	;
@@ -1088,7 +1166,7 @@ static const struct token tokentab[] = {
 #if defined(GAWKDEBUG) || defined(ARRAYDEBUG) /* || ... */
 {"stopme",	Node_builtin,    LEX_BUILTIN,	GAWKX|A(0),	stopme},
 #endif
-{"strftime",	Node_builtin,	 LEX_BUILTIN,	GAWKX|A(0)|A(1)|A(2), do_strftime},
+{"strftime",	Node_builtin,	 LEX_BUILTIN,	GAWKX|A(0)|A(1)|A(2)|A(3), do_strftime},
 {"strtonum",	Node_builtin,    LEX_BUILTIN,	GAWKX|A(1),	do_strtonum},
 {"sub",		Node_builtin,	 LEX_BUILTIN,	NOT_OLD|A(2)|A(3), do_sub},
 {"substr",	Node_builtin,	 LEX_BUILTIN,	A(2)|A(3),	do_substr},
@@ -1144,7 +1222,7 @@ getfname(register NODE *(*fptr)(NODE *))
  */
 
 static void
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
   yyerror(const char *m, ...)
 #else
 /* VARARGS0 */
@@ -1199,7 +1277,7 @@ static void
 
 	*bp = save;
 
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 	va_start(args, m);
 	if (mesg == NULL)
 		mesg = m;
@@ -1240,6 +1318,14 @@ get_src_buf()
 	static size_t buflen = 0;
 	static int fd;
 
+	/*
+	 * No argument prototype on readfunc on purpose,
+	 * avoids problems with some ancient systems where
+	 * the types of arguments to read() aren't up to date.
+	 */
+	static ssize_t (*readfunc)() = 0;
+	static int (*closefunc)P((int fd)) = NULL;
+
 	int n;
 	register char *scan;
 	int newfile;
@@ -1248,6 +1334,19 @@ get_src_buf()
 	int l;
 	char *readloc;
 
+	if (readfunc == NULL) {
+		char *cp = getenv("AWKREADFUNC");
+
+		/* If necessary, one day, test value for different functions.  */
+		if (cp == NULL) {
+			readfunc = read;
+			closefunc = close;
+		} else {
+			readfunc = read_one_line;
+			closefunc = one_line_close;
+		}
+	}
+
 again:
 	newfile = FALSE;
 	if (nextfile > numfiles)
@@ -1260,7 +1359,7 @@ again:
 			 *	gawk '' /path/name
 			 * Sigh.
 			 */
-			static int warned = FALSE;
+			static short warned = FALSE;
 
 			if (do_lint && ! warned) {
 				warned = TRUE;
@@ -1272,6 +1371,7 @@ again:
 		if (srcfiles[nextfile].val[l-1] == '\n') {
 			/* has terminating newline, can use it directly */
 			sourceline = 1;
+			source = NULL;
 			lexptr = lexptr_begin = srcfiles[nextfile].val;
 			/* fall through to pointer adjustment and return, below */
 		} else {
@@ -1293,6 +1393,8 @@ again:
 			buf[++l] = '\0';
 
 			/* set vars and return */
+			sourceline = 0;
+			source = NULL;
 			lexptr = lexptr_begin = buf;
 		}
 		lexend = lexptr + l;
@@ -1366,12 +1468,33 @@ again:
 			}
 		}
 
-		if (scan <= buf) {
+		/*
+		 * This condition can be read as follows: IF
+		 * 1. The beginning of the line is at the beginning of the
+		 *    buffer (no newline was found: scan <= buf)
+		 * AND:
+		 *    2. The start of valid lexical data is into the buffer
+		 *       (lexptr_begin > buf)
+		 *       OR:
+		 *       3. We have scanned past the end of the last data read
+		 *          (lexptr == lexend)
+		 *          AND:
+		 *          4. There's no room left in the buffer
+		 *             (lexptr_offset >= buflen - 2)
+		 *
+		 * If all that's true, grow the buffer to add more to
+		 * the current line.
+		 */
+
+		if (scan <= buf
+		    && (lexptr_begin > buf
+			|| (lexptr == lexend
+			    && lexptr_offset >= buflen - 2))) {
 			/* have to grow the buffer */
 			buflen *= 2;
 			erealloc(buf, char *, buflen, "get_src_buf");
-		} else {
-			/* shift things down */
+		} else if (scan > buf) {
+			/* Line starts in middle of the buffer, shift things down. */
 			memmove(buf, scan, lexend - scan);
 			/*
 			 * make offsets relative to start of line,
@@ -1392,13 +1515,13 @@ again:
 	}
 
 	/* add more data to buffer */
-	n = read(fd, readloc, readcount);
+	n = (*readfunc)(fd, readloc, readcount);
 	if (n == -1)
 		fatal(_("can't read sourcefile `%s' (%s)"),
 			source, strerror(errno));
 	if (n == 0) {
 		if (newfile) {
-			static int warned = FALSE;
+			static short warned = FALSE;
 
 			if (do_lint && ! warned) {
 				warned = TRUE;
@@ -1406,7 +1529,7 @@ again:
 			}
 		}
 		if (fd != fileno(stdin)) /* safety */
-			close(fd);
+			(*closefunc)(fd);
 		samefile = FALSE;
 		nextfile++;
 		goto again;
@@ -1585,7 +1708,8 @@ yylex(void)
 	int mid;
 	static int did_newline = FALSE;
 	char *tokkey;
-	static int lasttok = 0, eof_warned = FALSE;
+	static int lasttok = 0;
+	static short eof_warned = FALSE;
 	int inhex = FALSE;
 	int intlstr = FALSE;
 
@@ -1757,9 +1881,13 @@ retry:
 			while ((c = nextc()) == ' ' || c == '\t' || c == '\r')
 				continue;
 			if (c == '#') {
-				if (do_lint)
+				static short warned = FALSE;
+
+				if (do_lint && ! warned) {
+					warned = TRUE;
 					lintwarn(
 		_("use of `\\ #...' line continuation is not portable"));
+				}
 				while ((c = nextc()) != '\n')
 					if (c == EOF)
 						break;
@@ -2399,7 +2527,8 @@ snode(NODE *subn, NODETYPE op, int idx)
 	r->subnode = subn;
 	if (r->builtin == do_sprintf) {
 		count_args(r);
-		r->lnode->printf_count = r->printf_count; /* hack */
+		if (r->lnode != NULL)	/* r->lnode set from subn. guard against syntax errors & check it's valid */
+			r->lnode->printf_count = r->printf_count; /* hack */
 	}
 	return r;
 }
@@ -2519,7 +2648,7 @@ install(char *name, NODE *value)
 
 	var_count++;
 	len = strlen(name);
-	bucket = hash(name, len, (unsigned long) HASHSIZE);
+	bucket = hash(name, len, (unsigned long) HASHSIZE, NULL);
 	getnode(hp);
 	hp->type = Node_hashnode;
 	hp->hnext = variables[bucket];
@@ -2540,7 +2669,7 @@ lookup(const char *name)
 	register size_t len;
 
 	len = strlen(name);
-	for (bucket = variables[hash(name, len, (unsigned long) HASHSIZE)];
+	for (bucket = variables[hash(name, len, (unsigned long) HASHSIZE, NULL)];
 			bucket != NULL; bucket = bucket->hnext)
 		if (bucket->hlength == len && STREQN(bucket->hname, name, len))
 			return bucket->hvalue;
@@ -2921,7 +3050,7 @@ pop_var(NODE *np, int freeit)
 
 	name = np->param;
 	len = strlen(name);
-	save = &(variables[hash(name, len, (unsigned long) HASHSIZE)]);
+	save = &(variables[hash(name, len, (unsigned long) HASHSIZE, NULL)]);
 	for (bucket = *save; bucket != NULL; bucket = bucket->hnext) {
 		if (len == bucket->hlength && STREQN(bucket->hname, name, len)) {
 			var_count--;
@@ -2982,7 +3111,7 @@ func_use(const char *name, enum defref how)
 	int ind;
 
 	len = strlen(name);
-	ind = hash(name, len, HASHSIZE);
+	ind = hash(name, len, HASHSIZE, NULL);
 
 	for (fp = ftable[ind]; fp != NULL; fp = fp->next) {
 		if (strcmp(fp->name, name) == 0) {
@@ -3371,3 +3500,49 @@ check_special(const char *name)
 	}
 	return -1;
 }
+
+/*
+ * This provides a private version of functions that act like VMS's
+ * variable-length record filesystem, where there was a bug on
+ * certain source files.
+ */
+
+static FILE *fp = NULL;
+
+/* read_one_line --- return one input line at a time. mainly for debugging. */
+
+static ssize_t
+read_one_line(int fd, void *buffer, size_t count)
+{
+	char buf[BUFSIZ];
+
+	/* Minor potential memory leak here. Too bad. */
+	if (fp == NULL) {
+		fp = fdopen(fd, "r");
+		if (fp == NULL) {
+			fprintf(stderr, "ugh. fdopen: %s\n", strerror(errno));
+			exit(1);
+		}
+	}
+
+	if (fgets(buf, sizeof buf, fp) == NULL)
+		return 0;
+
+	memcpy(buffer, buf, strlen(buf));
+	return strlen(buf);
+}
+
+/* one_line_close --- close the open file being read with read_one_line() */
+
+static int
+one_line_close(int fd)
+{
+	int ret;
+
+	if (fp == NULL || fd != fileno(fp))
+		fatal("debugging read/close screwed up!");
+
+	ret = fclose(fp);
+	fp = NULL;
+	return ret;
+}
diff --git a/awklib/ChangeLog b/awklib/ChangeLog
index b328453a..62b9e7dc 100644
--- a/awklib/ChangeLog
+++ b/awklib/ChangeLog
@@ -1,3 +1,24 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+2007-05-25  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.am: Add missing dependencies on stamp-eg.
+
+Wed Mar 14 13:22:52 2007  Andrew J. Schorr  <ajschorr@users.sourceforge.net>
+
+	* Makefile.am (AWKPROG): New macro to set locale sanely.
+	(stamp-eg): Use it instead of $AWK to do the extractions.
+
+Wed Mar 14 13:16:28 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (clean-local): Remove `eg.old' also.
+
+Sat Jan 13 21:17:33 2007  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (stamp-eg): Allow rebuilding from a VPATH build.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/awklib/Makefile.am b/awklib/Makefile.am
index 810e5596..149656ff 100644
--- a/awklib/Makefile.am
+++ b/awklib/Makefile.am
@@ -1,14 +1,14 @@
 #
 # awklib/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 1995-2005 the Free Software Foundation, Inc.
+# Copyright (C) 1995-2006 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 #
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GAWK is distributed in the hope that it will be useful,
@@ -23,7 +23,10 @@
 
 ## process this file with automake to produce Makefile.in
 
-EXTRA_DIST = ChangeLog extract.awk eg stamp-eg
+EXTRA_DIST = ChangeLog extract.awk eg $(srcdir)/stamp-eg
+# With some locales, the script extract.awk fails.
+# So we fix the locale to some sensible value.
+AWKPROG = LC_ALL=C LANG=C ../gawk$(EXEEXT)
 
 # Get config.h from the build directory and custom.h from the source directory.
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
@@ -37,7 +40,7 @@ AUXAWK = passwd.awk group.awk
 nodist_grcat_SOURCES = grcat.c
 nodist_pwcat_SOURCES = pwcat.c
 
-all: stamp-eg $(AUXPROGS) igawk $(AUXAWK)
+all: $(srcdir)/stamp-eg $(AUXPROGS) igawk $(AUXAWK)
 
 install-exec-hook: $(AUXAWK)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@@ -53,12 +56,27 @@ uninstall-local:
 
 clean-local:
 	rm -f $(AUXAWK) igawk *.exe
+	rm -fr eg.old
 
-stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
-	rm -fr eg stamp-eg
-	$(AWK) -f $(srcdir)/extract.awk $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
-	@echo 'some makes are stupid and will not check a directory' > stamp-eg
-	@echo 'against a file, so this file is a place holder. gack.' >> stamp-eg
+$(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
+	cd $(srcdir) && \
+	mv eg eg.old && \
+	rm -fr  stamp-eg && \
+	$(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
+	@echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg
+	@echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg
+	cd $(srcdir) && \
+	if [ -d eg.old ] && [ -d eg.old/CVS ] ; then \
+	mv eg.old/CVS eg ; \
+	mv eg.old/data/CVS eg/data ; \
+	mv eg.old/lib/CVS eg/lib ; \
+	mv eg.old/misc/CVS eg/misc ; \
+	mv eg.old/network/CVS eg/network ; \
+	mv eg.old/prog/CVS eg/prog ; \
+	rm -fr eg.old ; fi
+
+$(srcdir)/eg/lib/pwcat.c $(srcdir)/eg/lib/grcat.c $(srcdir)/eg/prog/igawk.sh \
+$(srcdir)/eg/lib/passwdawk.in $(srcdir)/eg/lib/groupawk.in: stamp-eg; @:
 
 pwcat$(EXEEXT): $(srcdir)/eg/lib/pwcat.c
 	$(COMPILE) $(srcdir)/eg/lib/pwcat.c $(LDFLAGS) -o $@
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index d21c9055..e1aadc0c 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,14 +17,14 @@
 #
 # awklib/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 1995-2005 the Free Software Foundation, Inc.
+# Copyright (C) 1995-2006 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 #
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GAWK is distributed in the hope that it will be useful,
@@ -38,16 +38,10 @@
 #
 
 
-SOURCES = $(nodist_grcat_SOURCES) $(nodist_pwcat_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -66,13 +60,14 @@ subdir = awklib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/socket.m4 \
-	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intmax_t.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/stdint_h.m4 \
 	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -91,7 +86,7 @@ pwcat_OBJECTS = $(nodist_pwcat_OBJECTS)
 pwcat_LDADD = $(LDADD)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -105,8 +100,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = $(datadir)/awk
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -126,6 +119,9 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -142,8 +138,9 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -163,12 +160,14 @@ U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -180,29 +179,43 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-EXTRA_DIST = ChangeLog extract.awk eg stamp-eg
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = ChangeLog extract.awk eg $(srcdir)/stamp-eg
+# With some locales, the script extract.awk fails.
+# So we fix the locale to some sensible value.
+AWKPROG = LC_ALL=C LANG=C ../gawk$(EXEEXT)
 
 # Get config.h from the build directory and custom.h from the source directory.
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
@@ -246,7 +259,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkglibexecdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibexecdir)"
+	test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
 	@list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -269,7 +282,7 @@ clean-pkglibexecPROGRAMS:
 	-test -z "$(pkglibexec_PROGRAMS)" || rm -f $(pkglibexec_PROGRAMS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -297,19 +310,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwcat.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -360,22 +372,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -391,7 +402,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS)
 installdirs:
 	for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -440,14 +451,22 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binSCRIPTS install-pkglibexecPROGRAMS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -467,24 +486,28 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-local \
+uninstall-am: uninstall-binSCRIPTS uninstall-local \
 	uninstall-pkglibexecPROGRAMS
 
+.MAKE: install-am install-exec-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-local clean-pkglibexecPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binSCRIPTS install-data install-data-am install-exec \
-	install-exec-am install-exec-hook install-info install-info-am \
-	install-man install-pkglibexecPROGRAMS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binSCRIPTS uninstall-info-am \
+	install-binSCRIPTS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am \
+	install-pkglibexecPROGRAMS install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binSCRIPTS \
 	uninstall-local uninstall-pkglibexecPROGRAMS
 
 
-all: stamp-eg $(AUXPROGS) igawk $(AUXAWK)
+all: $(srcdir)/stamp-eg $(AUXPROGS) igawk $(AUXAWK)
 
 install-exec-hook: $(AUXAWK)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@@ -500,12 +523,27 @@ uninstall-local:
 
 clean-local:
 	rm -f $(AUXAWK) igawk *.exe
-
-stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
-	rm -fr eg stamp-eg
-	$(AWK) -f $(srcdir)/extract.awk $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
-	@echo 'some makes are stupid and will not check a directory' > stamp-eg
-	@echo 'against a file, so this file is a place holder. gack.' >> stamp-eg
+	rm -fr eg.old
+
+$(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
+	cd $(srcdir) && \
+	mv eg eg.old && \
+	rm -fr  stamp-eg && \
+	$(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
+	@echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg
+	@echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg
+	cd $(srcdir) && \
+	if [ -d eg.old ] && [ -d eg.old/CVS ] ; then \
+	mv eg.old/CVS eg ; \
+	mv eg.old/data/CVS eg/data ; \
+	mv eg.old/lib/CVS eg/lib ; \
+	mv eg.old/misc/CVS eg/misc ; \
+	mv eg.old/network/CVS eg/network ; \
+	mv eg.old/prog/CVS eg/prog ; \
+	rm -fr eg.old ; fi
+
+$(srcdir)/eg/lib/pwcat.c $(srcdir)/eg/lib/grcat.c $(srcdir)/eg/prog/igawk.sh \
+$(srcdir)/eg/lib/passwdawk.in $(srcdir)/eg/lib/groupawk.in: stamp-eg; @:
 
 pwcat$(EXEEXT): $(srcdir)/eg/lib/pwcat.c
 	$(COMPILE) $(srcdir)/eg/lib/pwcat.c $(LDFLAGS) -o $@
diff --git a/awklib/eg/lib/assert.awk b/awklib/eg/lib/assert.awk
index bbfc0669..75fd8853 100644
--- a/awklib/eg/lib/assert.awk
+++ b/awklib/eg/lib/assert.awk
@@ -1,7 +1,7 @@
 # assert --- assert that a condition is true. Otherwise exit.
 
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May, 1993
 
 function assert(condition, string)
diff --git a/awklib/eg/lib/cliff_rand.awk b/awklib/eg/lib/cliff_rand.awk
index 345447ec..e6a793aa 100644
--- a/awklib/eg/lib/cliff_rand.awk
+++ b/awklib/eg/lib/cliff_rand.awk
@@ -1,6 +1,6 @@
 # cliff_rand.awk --- generate Cliff random numbers
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # December 2000
 
 BEGIN { _cliff_seed = 0.1 }
diff --git a/awklib/eg/lib/ftrans.awk b/awklib/eg/lib/ftrans.awk
index b0743e28..1709ac82 100644
--- a/awklib/eg/lib/ftrans.awk
+++ b/awklib/eg/lib/ftrans.awk
@@ -2,7 +2,7 @@
 #
 # user supplies beginfile() and endfile() functions
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # November 1992
 
 FNR == 1 {
diff --git a/awklib/eg/lib/getopt.awk b/awklib/eg/lib/getopt.awk
index 4f2686d6..0e3421a9 100644
--- a/awklib/eg/lib/getopt.awk
+++ b/awklib/eg/lib/getopt.awk
@@ -1,6 +1,6 @@
 # getopt.awk --- do C library getopt(3) function in awk
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 #
 # Initial version: March, 1991
 # Revised: May, 1993
diff --git a/awklib/eg/lib/gettime.awk b/awklib/eg/lib/gettime.awk
index c425123c..d79b8f40 100644
--- a/awklib/eg/lib/gettime.awk
+++ b/awklib/eg/lib/gettime.awk
@@ -1,6 +1,6 @@
 # gettimeofday.awk --- get the time of day in a usable format
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain, May 1993
+# Arnold Robbins, arnold@skeeve.com, Public Domain, May 1993
 #
 
 # Returns a string in the format of output of date(1)
diff --git a/awklib/eg/lib/grcat.c b/awklib/eg/lib/grcat.c
index 83567142..fd35c832 100644
--- a/awklib/eg/lib/grcat.c
+++ b/awklib/eg/lib/grcat.c
@@ -4,7 +4,7 @@
  * Generate a printable version of the group database
  */
 /*
- * Arnold Robbins, arnold@gnu.org, May 1993
+ * Arnold Robbins, arnold@skeeve.com, May 1993
  * Public Domain
  */
 
diff --git a/awklib/eg/lib/groupawk.in b/awklib/eg/lib/groupawk.in
index 9d8b4021..899656bd 100644
--- a/awklib/eg/lib/groupawk.in
+++ b/awklib/eg/lib/groupawk.in
@@ -1,6 +1,6 @@
 # group.awk --- functions for dealing with the group file
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 # Revised October 2000
 
diff --git a/awklib/eg/lib/join.awk b/awklib/eg/lib/join.awk
index e17b4270..4a4ac927 100644
--- a/awklib/eg/lib/join.awk
+++ b/awklib/eg/lib/join.awk
@@ -1,6 +1,6 @@
 # join.awk --- join an array into a string
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
 function join(array, start, end, sep,    result, i)
diff --git a/awklib/eg/lib/nextfile.awk b/awklib/eg/lib/nextfile.awk
index caedf0e4..33f5af36 100644
--- a/awklib/eg/lib/nextfile.awk
+++ b/awklib/eg/lib/nextfile.awk
@@ -1,7 +1,7 @@
 # nextfile --- skip remaining records in current file
 # correctly handle successive occurrences of the same file
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May, 1993
 
 # this should be read in before the "main" awk program
diff --git a/awklib/eg/lib/noassign.awk b/awklib/eg/lib/noassign.awk
index d6d176e4..2ad1f378 100644
--- a/awklib/eg/lib/noassign.awk
+++ b/awklib/eg/lib/noassign.awk
@@ -1,7 +1,7 @@
 # noassign.awk --- library file to avoid the need for a
 # special option that disables command-line assignments
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # October 1999
 
 function disable_assigns(argc, argv,    i)
diff --git a/awklib/eg/lib/ord.awk b/awklib/eg/lib/ord.awk
index 3eacbcc5..be47e15d 100644
--- a/awklib/eg/lib/ord.awk
+++ b/awklib/eg/lib/ord.awk
@@ -4,7 +4,7 @@
 #    _ord_:        numerical values indexed by characters
 #    _ord_init:    function to initialize _ord_
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # 16 January, 1992
 # 20 July, 1992, revised
 
diff --git a/awklib/eg/lib/passwdawk.in b/awklib/eg/lib/passwdawk.in
index 5f6f9e26..47798ded 100644
--- a/awklib/eg/lib/passwdawk.in
+++ b/awklib/eg/lib/passwdawk.in
@@ -1,6 +1,6 @@
 # passwd.awk --- access password file information
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 # Revised October 2000
 
diff --git a/awklib/eg/lib/pwcat.c b/awklib/eg/lib/pwcat.c
index d6ad0b64..09457148 100644
--- a/awklib/eg/lib/pwcat.c
+++ b/awklib/eg/lib/pwcat.c
@@ -4,7 +4,7 @@
  * Generate a printable version of the password database
  */
 /*
- * Arnold Robbins, arnold@gnu.org, May 1993
+ * Arnold Robbins, arnold@skeeve.com, May 1993
  * Public Domain
  */
 
diff --git a/awklib/eg/lib/readable.awk b/awklib/eg/lib/readable.awk
index 51705aea..dbbab578 100644
--- a/awklib/eg/lib/readable.awk
+++ b/awklib/eg/lib/readable.awk
@@ -1,6 +1,6 @@
 # readable.awk --- library file to skip over unreadable files
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # October 2000
 
 BEGIN {
diff --git a/awklib/eg/lib/rewind.awk b/awklib/eg/lib/rewind.awk
index 33286611..a646eac2 100644
--- a/awklib/eg/lib/rewind.awk
+++ b/awklib/eg/lib/rewind.awk
@@ -1,6 +1,6 @@
 # rewind.awk --- rewind the current file and start over
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # September 2000
 
 function rewind(    i)
diff --git a/awklib/eg/lib/round.awk b/awklib/eg/lib/round.awk
index 55ef7dc2..c5e993f1 100644
--- a/awklib/eg/lib/round.awk
+++ b/awklib/eg/lib/round.awk
@@ -1,6 +1,6 @@
 # round.awk --- do normal rounding
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # August, 1996
 
 function round(x,   ival, aval, fraction)
@@ -27,6 +27,3 @@ function round(x,   ival, aval, fraction)
          return ival
    }
 }
-
-# test harness
-{ print $0, round($0) }
diff --git a/awklib/eg/lib/zerofile.awk b/awklib/eg/lib/zerofile.awk
index 01926fdd..8ea549ca 100644
--- a/awklib/eg/lib/zerofile.awk
+++ b/awklib/eg/lib/zerofile.awk
@@ -1,6 +1,6 @@
 # zerofile.awk --- library file to process empty input files
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # June 2003
 
 BEGIN { Argind = 0 }
diff --git a/awklib/eg/prog/alarm.awk b/awklib/eg/prog/alarm.awk
index 26252fa1..52fae393 100644
--- a/awklib/eg/prog/alarm.awk
+++ b/awklib/eg/prog/alarm.awk
@@ -2,7 +2,7 @@
 #
 # Requires gettimeofday library function
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
 # usage: alarm time [ "message" [ count [ delay ] ] ]
diff --git a/awklib/eg/prog/awksed.awk b/awklib/eg/prog/awksed.awk
index 4b188c64..d9f17717 100644
--- a/awklib/eg/prog/awksed.awk
+++ b/awklib/eg/prog/awksed.awk
@@ -1,7 +1,7 @@
 # awksed.awk --- do s/foo/bar/g using just print
 #    Thanks to Michael Brennan for the idea
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # August 1995
 
 function usage()
diff --git a/awklib/eg/prog/cut.awk b/awklib/eg/prog/cut.awk
index d9c6c9b9..d9866b82 100644
--- a/awklib/eg/prog/cut.awk
+++ b/awklib/eg/prog/cut.awk
@@ -1,6 +1,6 @@
 # cut.awk --- implement cut in awk
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
 # Options:
diff --git a/awklib/eg/prog/dupword.awk b/awklib/eg/prog/dupword.awk
index a2cc7d2b..047b99f5 100644
--- a/awklib/eg/prog/dupword.awk
+++ b/awklib/eg/prog/dupword.awk
@@ -1,6 +1,6 @@
 # dupword.awk --- find duplicate words in text
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # December 1991
 # Revised October 2000
 
diff --git a/awklib/eg/prog/egrep.awk b/awklib/eg/prog/egrep.awk
index 73f175ca..b34241f8 100644
--- a/awklib/eg/prog/egrep.awk
+++ b/awklib/eg/prog/egrep.awk
@@ -1,6 +1,6 @@
 # egrep.awk --- simulate egrep in awk
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
 # Options:
diff --git a/awklib/eg/prog/extract.awk b/awklib/eg/prog/extract.awk
index 5cb191ae..6f27a707 100644
--- a/awklib/eg/prog/extract.awk
+++ b/awklib/eg/prog/extract.awk
@@ -1,7 +1,7 @@
 # extract.awk --- extract files and run programs
 #                 from texinfo files
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 # Revised September 2000
 
diff --git a/awklib/eg/prog/histsort.awk b/awklib/eg/prog/histsort.awk
index c0a9165a..b156f67d 100644
--- a/awklib/eg/prog/histsort.awk
+++ b/awklib/eg/prog/histsort.awk
@@ -1,7 +1,7 @@
 # histsort.awk --- compact a shell history file
 # Thanks to Byron Rakitzis for the general idea
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
 {
diff --git a/awklib/eg/prog/id.awk b/awklib/eg/prog/id.awk
index af78f760..8b60a245 100644
--- a/awklib/eg/prog/id.awk
+++ b/awklib/eg/prog/id.awk
@@ -2,7 +2,7 @@
 #
 # Requires user and group library functions
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 # Revised February 1996
 
diff --git a/awklib/eg/prog/igawk.sh b/awklib/eg/prog/igawk.sh
index 9fce9a50..e40568ed 100644
--- a/awklib/eg/prog/igawk.sh
+++ b/awklib/eg/prog/igawk.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # igawk --- like gawk but do @include processing
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # July 1993
 
 if [ "$1" = debug ]
@@ -10,7 +10,7 @@ then
     shift
 fi
 
-# A literal newline, so that program text is formmatted correctly
+# A literal newline, so that program text is formatted correctly
 n='
 '
 
diff --git a/awklib/eg/prog/labels.awk b/awklib/eg/prog/labels.awk
index fa9c4dab..eaab49fc 100644
--- a/awklib/eg/prog/labels.awk
+++ b/awklib/eg/prog/labels.awk
@@ -1,6 +1,6 @@
 # labels.awk --- print mailing labels
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # June 1992
 
 # Each label is 5 lines of data that may have blank lines.
diff --git a/awklib/eg/prog/split.awk b/awklib/eg/prog/split.awk
index 2906a853..723d7a6a 100644
--- a/awklib/eg/prog/split.awk
+++ b/awklib/eg/prog/split.awk
@@ -2,7 +2,7 @@
 #
 # Requires ord and chr library functions
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
 # usage: split [-num] [file] [outname]
diff --git a/awklib/eg/prog/tee.awk b/awklib/eg/prog/tee.awk
index eafc4b9a..82e80865 100644
--- a/awklib/eg/prog/tee.awk
+++ b/awklib/eg/prog/tee.awk
@@ -1,6 +1,6 @@
 # tee.awk --- tee in awk
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 # Revised December 1995
 
diff --git a/awklib/eg/prog/translate.awk b/awklib/eg/prog/translate.awk
index 803700c4..0db239ad 100644
--- a/awklib/eg/prog/translate.awk
+++ b/awklib/eg/prog/translate.awk
@@ -1,6 +1,6 @@
 # translate.awk --- do tr-like stuff
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # August 1989
 
 # Bugs: does not handle things like: tr A-Z a-z, it has
diff --git a/awklib/eg/prog/uniq.awk b/awklib/eg/prog/uniq.awk
index cfb50c79..0b2afa88 100644
--- a/awklib/eg/prog/uniq.awk
+++ b/awklib/eg/prog/uniq.awk
@@ -2,7 +2,7 @@
 #
 # Requires getopt and join library functions
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
 function usage(    e)
diff --git a/awklib/eg/prog/wc.awk b/awklib/eg/prog/wc.awk
index f46616b9..8fb48164 100644
--- a/awklib/eg/prog/wc.awk
+++ b/awklib/eg/prog/wc.awk
@@ -1,6 +1,6 @@
 # wc.awk --- count lines, words, characters
 #
-# Arnold Robbins, arnold@gnu.org, Public Domain
+# Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
 # Options:
diff --git a/bisonfix.awk b/bisonfix.awk
index 5a45f18d..80c00dc0 100644
--- a/bisonfix.awk
+++ b/bisonfix.awk
@@ -7,7 +7,7 @@
 # 
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GAWK is distributed in the hope that it will be useful,
diff --git a/builtin.c b/builtin.c
index 78f16569..2f98a821 100644
--- a/builtin.c
+++ b/builtin.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -28,14 +28,6 @@
 #if defined(HAVE_FCNTL_H)
 #include <fcntl.h>
 #endif
-#undef CHARBITS
-#undef INTBITS
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
 #include <math.h>
 #include "random.h"
 
@@ -73,22 +65,7 @@ extern int output_is_tty;
 
 static NODE *sub_common P((NODE *tree, long how_many, int backdigs));
 
-/* Assume IEEE-754 arithmetic on pre-C89 hosts.  */
-#ifndef FLT_RADIX
-#define FLT_RADIX 2
-#endif
-#ifndef FLT_MANT_DIG
-#define FLT_MANT_DIG 24
-#endif
-#ifndef DBL_MANT_DIG
-#define DBL_MANT_DIG 53
-#endif
-
 #ifdef _CRAY
-/* Work around a problem in conversion of doubles to exact integers. */
-#define Floor(n) floor((n) * (1.0 + DBL_EPSILON))
-#define Ceil(n) ceil((n) * (1.0 + DBL_EPSILON))
-
 /* Force the standard C compiler to use the library math functions. */
 extern double exp(double);
 double (*Exp)() = exp;
@@ -96,9 +73,6 @@ double (*Exp)() = exp;
 extern double log(double);
 double (*Log)() = log;
 #define log(x) (*Log)(x)
-#else
-#define Floor(n) floor(n)
-#define Ceil(n) ceil(n)
 #endif
 
 #define DEFAULT_G_PRECISION 6
@@ -464,12 +438,15 @@ do_length(NODE *tree)
 	if (tree->lnode->type == Node_var_array
 	    || tree->lnode->type == Node_array_ref) {
 		NODE *array_var = tree->lnode;
+		static short warned = FALSE;
 
 		if (array_var->type == Node_array_ref)
 			array_var = array_var->orig_array;
 
-		if (do_lint)
+		if (do_lint && ! warned) {
+			warned = TRUE;
 			lintwarn(_("`length(array)' is a gawk extension"));
+		}
 		if (do_posix)
 			goto normal;	/* will die as fatal error */
 
@@ -558,12 +535,13 @@ format_tree(
 }
 
 /* Is there space for something L big in the buffer? */
-#define chksize(l)  if ((l) > ofre) { \
+#define chksize(l)  if ((l) >= ofre) { \
 	size_t olen = obufout - obuf; \
-	erealloc(obuf, char *, osiz * 2, "format_tree"); \
+	size_t delta = osiz+l-ofre; \
+	erealloc(obuf, char *, osiz + delta, "format_tree"); \
 	obufout = obuf + olen; \
-	ofre += osiz; \
-	osiz *= 2; \
+	ofre += delta; \
+	osiz += delta; \
 }
 
 	static NODE **the_args = 0;
@@ -593,8 +571,21 @@ format_tree(
 	uintmax_t uval;
 	int sgn;
 	int base = 0;
-	char cpbuf[30];		/* if we have numbers bigger than 30 */
-	char *cend = &cpbuf[30];/* chars, we lose, but seems unlikely */
+	/*
+	 * Although this is an array, the elements serve two different
+	 * purposes. The first element is the general buffer meant
+	 * to hold the entire result string.  The second one is a
+	 * temporary buffer for large floating point values. They
+	 * could just as easily be separate variables, and the
+	 * code might arguably be clearer.
+	 */
+	struct {
+		char *buf;
+		size_t bufsize;
+		char stackbuf[30];
+	} cpbufs[2];
+#define cpbuf	cpbufs[0].buf
+	char *cend = &cpbufs[0].stackbuf[sizeof(cpbufs[0].stackbuf)];
 	char *cp;
 	const char *fill;
 	AWKNUM tmpval;
@@ -603,6 +594,7 @@ format_tree(
 	int zero_flag = FALSE;
 	int quote_flag = FALSE;
 	int ii, jj;
+	char *chp;
 	static const char sp[] = " ";
 	static const char zero_string[] = "0";
 	static const char lchbuf[] = "0123456789abcdef";
@@ -614,6 +606,34 @@ format_tree(
 	osiz = INITIAL_OUT_SIZE;
 	ofre = osiz - 2;
 
+	{
+		size_t k;
+		for (k = 0; k < sizeof(cpbufs)/sizeof(cpbufs[0]); k++) {
+			cpbufs[k].bufsize = sizeof(cpbufs[k].stackbuf);
+			cpbufs[k].buf = cpbufs[k].stackbuf;
+		}
+	}
+
+	/*
+	 * The point of this goop is to grow the buffer
+	 * holding the converted number, so that large
+	 * values don't overflow a fixed length buffer.
+	 */
+#define PREPEND(CH) do {	\
+	if (cp == cpbufs[0].buf) {	\
+		char *prev = cpbufs[0].buf;	\
+		emalloc(cpbufs[0].buf, char *, 2*cpbufs[0].bufsize, \
+		 	"format_tree");	\
+		memcpy((cp = cpbufs[0].buf+cpbufs[0].bufsize), prev,	\
+		       cpbufs[0].bufsize);	\
+		cpbufs[0].bufsize *= 2;	\
+		if (prev != cpbufs[0].stackbuf)	\
+			free(prev);	\
+		cend = cpbufs[0].buf+cpbufs[0].bufsize;	\
+	}	\
+	*--cp = (CH);	\
+} while(0)
+
 	/*
 	 * Icky problem.  If the args make a nested call to printf/sprintf,
 	 * we end up clobbering the static variable `the_args'.  Not good.
@@ -704,6 +724,7 @@ format_tree(
 		have_prec = FALSE;
 		signchar = FALSE;
 		zero_flag = FALSE;
+		quote_flag = FALSE;
 		lj = alt = big = bigbig = small = FALSE;
 		fill = sp;
 		cp = cend;
@@ -861,7 +882,7 @@ check_pos:
 			if (big)
 				break;
 			else {
-				static int warned = FALSE;
+				static short warned = FALSE;
 				
 				if (do_lint && ! warned) {
 					lintwarn(_("`l' is meaningless in awk formats; ignored"));
@@ -876,7 +897,7 @@ check_pos:
 			if (bigbig)
 				break;
 			else {
-				static int warned = FALSE;
+				static short warned = FALSE;
 				
 				if (do_lint && ! warned) {
 					lintwarn(_("`L' is meaningless in awk formats; ignored"));
@@ -891,7 +912,7 @@ check_pos:
 			if (small)
 				break;
 			else {
-				static int warned = FALSE;
+				static short warned = FALSE;
 				
 				if (do_lint && ! warned) {
 					lintwarn(_("`h' is meaningless in awk formats; ignored"));
@@ -946,6 +967,15 @@ check_pos:
 			need_format = FALSE;
 			parse_next_arg();
 			tmpval = force_number(arg);
+			/*
+			 * Check for Nan or Inf (without using isfinite(),
+			 * since that may not be available on all platforms)
+			 */
+			if ((tmpval != tmpval) ||
+			    ((2*tmpval == tmpval) && (tmpval != 0)))
+				goto out_of_range;
+			else
+				tmpval = double_to_int(tmpval);
 
 			/*
 			 * ``The result of converting a zero value with a
@@ -955,25 +985,45 @@ check_pos:
 				goto pr_tail;
 
 			if (tmpval < 0) {
-				if (tmpval < INTMAX_MIN)
-					goto out_of_range;
+				tmpval = -tmpval;
 				sgn = TRUE;
-				uval = - (uintmax_t) (intmax_t) tmpval;
 			} else {
-				/* Use !, so that NaNs are out of range.  */
-				if (! (tmpval <= UINTMAX_MAX))
-					goto out_of_range;
+				if (tmpval == -0.0)
+					/* avoid printing -0 */
+					tmpval = 0.0;
 				sgn = FALSE;
-				uval = (uintmax_t) tmpval;
 			}
+			/*
+			 * Use snprintf return value to tell if there
+			 * is enough room in the buffer or not.
+			 */
+			while ((i = snprintf(cpbufs[1].buf,
+					     cpbufs[1].bufsize, "%.0f",
+					     tmpval)) >=
+			       cpbufs[1].bufsize) {
+				if (cpbufs[1].buf == cpbufs[1].stackbuf)
+					cpbufs[1].buf = NULL;
+				if (i > 0) {
+					cpbufs[1].bufsize += ((i > cpbufs[1].bufsize) ?
+							      i : cpbufs[1].bufsize);
+				}
+				else
+					cpbufs[1].bufsize *= 2;
+				assert(cpbufs[1].bufsize > 0);
+				erealloc(cpbufs[1].buf, char *,
+					 cpbufs[1].bufsize, "format_tree");
+			}
+			if (i < 1)
+				goto out_of_range;
+			chp = &cpbufs[1].buf[i-1];
 			ii = jj = 0;
 			do {
-				*--cp = (char) ('0' + uval % 10);
-				uval /= 10;
+				PREPEND(*chp);
+				chp--; i--;
 #if defined(HAVE_LOCALE_H)
 				if (quote_flag && loc.grouping[ii] && ++jj == loc.grouping[ii]) {
-					if (uval)	/* only add if more digits coming */
-						*--cp = loc.thousands_sep[0];	/* XXX - assumption it's one char */
+					if (i)	/* only add if more digits coming */
+						PREPEND(loc.thousands_sep[0]);	/* XXX - assumption it's one char */
 					if (loc.grouping[ii+1] == 0)
 						jj = 0;		/* keep using current val in loc.grouping[ii] */
 					else if (loc.grouping[ii+1] == CHAR_MAX)
@@ -984,18 +1034,18 @@ check_pos:
 					}
 				}
 #endif
-			} while (uval > 0);
+			} while (i > 0);
 
 			/* add more output digits to match the precision */
 			if (have_prec) {
 				while (cend - cp < prec)
-					*--cp = '0';
+					PREPEND('0');
 			}
 
 			if (sgn)
-				*--cp = '-';
+				PREPEND('-');
 			else if (signchar)
-				*--cp = signchar;
+				PREPEND(signchar);
 			/*
 			 * When to fill with zeroes is of course not simple.
 			 * First: No zero fill if left-justifying.
@@ -1047,14 +1097,14 @@ check_pos:
 				goto pr_tail;
 
 			if (tmpval < 0) {
-				if (tmpval < INTMAX_MIN)
-					goto out_of_range;
 				uval = (uintmax_t) (intmax_t) tmpval;
-			} else {
-				/* Use !, so that NaNs are out of range.  */
-				if (! (tmpval <= UINTMAX_MAX))
+				if ((AWKNUM)(intmax_t)uval !=
+				    double_to_int(tmpval))
 					goto out_of_range;
+			} else {
 				uval = (uintmax_t) tmpval;
+				if ((AWKNUM)uval != double_to_int(tmpval))
+					goto out_of_range;
 			}
 			/*
 			 * When to fill with zeroes is of course not simple.
@@ -1071,12 +1121,12 @@ check_pos:
 
 			ii = jj = 0;
 			do {
-				*--cp = chbuf[uval % base];
+				PREPEND(chbuf[uval % base]);
 				uval /= base;
 #if defined(HAVE_LOCALE_H)
 				if (base == 10 && quote_flag && loc.grouping[ii] && ++jj == loc.grouping[ii]) {
 					if (uval)	/* only add if more digits coming */
-						*--cp = loc.thousands_sep[0];	/* XXX --- assumption it's one char */
+						PREPEND(loc.thousands_sep[0]);	/* XXX --- assumption it's one char */
 					if (loc.grouping[ii+1] == 0)
 						jj = 0;		/* keep using current val in loc.grouping[ii] */
 					else if (loc.grouping[ii+1] == CHAR_MAX)
@@ -1092,20 +1142,20 @@ check_pos:
 			/* add more output digits to match the precision */
 			if (have_prec) {
 				while (cend - cp < prec)
-					*--cp = '0';
+					PREPEND('0');
 			}
 
 			if (alt && tmpval != 0) {
 				if (base == 16) {
-					*--cp = cs1;
-					*--cp = '0';
+					PREPEND(cs1);
+					PREPEND('0');
 					if (fill != sp) {
 						bchunk(cp, 2);
 						cp += 2;
 						fw -= 2;
 					}
 				} else if (base == 8)
-					*--cp = '0';
+					PREPEND('0');
 			}
 			base = 0;
 			if (prec > fw)
@@ -1130,7 +1180,7 @@ check_pos:
 			/* out of range - emergency use of %g format */
 			if (do_lint)
 				lintwarn(_("[s]printf: value %g is out of range for `%%%c' format"),
-							tmpval, cs1);
+							(double) tmpval, cs1);
 			cs1 = 'g';
 			goto format_float;
 
@@ -1175,15 +1225,32 @@ check_pos:
 			*cp++ = cs1;
 			*cp = '\0';
 #ifndef GFMT_WORKAROUND
-			(void) sprintf(obufout, cpbuf,
-				       (int) fw, (int) prec, (double) tmpval);
+#if defined(LC_NUMERIC)
+			if (quote_flag && ! use_lc_numeric)
+				setlocale(LC_NUMERIC, "");
+#endif
+			{
+				int n;
+				while ((n = snprintf(obufout, ofre, cpbuf,
+						     (int) fw, (int) prec,
+						     (double) tmpval)) >= ofre)
+					chksize(n)
+			}
+#if defined(LC_NUMERIC)
+			if (quote_flag && ! use_lc_numeric)
+				setlocale(LC_NUMERIC, "C");
+#endif
 #else	/* GFMT_WORKAROUND */
 			if (cs1 == 'g' || cs1 == 'G')
 				sgfmt(obufout, cpbuf, (int) alt,
 				       (int) fw, (int) prec, (double) tmpval);
-			else
-				(void) sprintf(obufout, cpbuf,
-				       (int) fw, (int) prec, (double) tmpval);
+			else {
+				int n;
+				while ((n = snprintf(obufout, ofre, cpbuf,
+						     (int) fw, (int) prec,
+						     (double) tmpval)) >= ofre)
+					chksize(n)
+			}
 #endif	/* GFMT_WORKAROUND */
 			len = strlen(obufout);
 			ofre -= len;
@@ -1193,11 +1260,13 @@ check_pos:
 		default:
 			break;
 		}
-		if (toofew)
+		if (toofew) {
+			free(obuf);	/* silence valgrind */
 			fatal("%s\n\t`%s'\n\t%*s%s",
 			      _("not enough arguments to satisfy format string"),
 			      fmt_string, (int) (s1 - fmt_string - 1), "",
 			      _("^ ran out for this one"));
+		}
 	}
 	if (do_lint) {
 		if (need_format)
@@ -1221,6 +1290,15 @@ check_pos:
 		args_size = save_args_size;
 	}
 
+	{
+		size_t k;
+		size_t count = sizeof(cpbufs)/sizeof(cpbufs[0]);
+		for (k = 0; k < count; k++) {
+			if (cpbufs[k].buf != cpbufs[k].stackbuf)
+				free(cpbufs[k].buf);
+		}
+	}
+
 	return r;
 }
 
@@ -1454,7 +1532,7 @@ single_byte_case:
 NODE *
 do_strftime(NODE *tree)
 {
-	NODE *t1, *t2, *ret;
+	NODE *t1, *t2, *t3, *ret;
 	struct tm *tm;
 	time_t fclock;
 	char *bufp;
@@ -1464,13 +1542,15 @@ do_strftime(NODE *tree)
 	static const char def_format[] = "%a %b %d %H:%M:%S %Z %Y";
 	const char *format;
 	int formatlen;
+	int do_gmt;
 
 	/* set defaults first */
 	format = def_format;	/* traditional date format */
 	formatlen = strlen(format);
 	(void) time(&fclock);	/* current time of day */
+	do_gmt = FALSE;
 
-	t1 = t2 = NULL;
+	t1 = t2 = t3 = NULL;
 	if (tree != NULL) {	/* have args */
 		if (tree->lnode != NULL) {
 			NODE *tmp = tree_eval(tree->lnode);
@@ -1493,10 +1573,24 @@ do_strftime(NODE *tree)
 				lintwarn(_("strftime: received non-numeric second argument"));
 			fclock = (time_t) force_number(t2);
 			free_temp(t2);
+
+			if (tree->rnode->rnode != NULL) {
+				tree = tree->rnode->rnode;
+				t3 = tree_eval(tree->lnode);
+				if ((t3->flags & (NUMCUR|NUMBER)) != 0)
+					do_gmt = (t3->numbr != 0);
+				else
+					do_gmt = (t3->stlen > 0);
+
+				free_temp(t3);
+			}
 		}
 	}
 
-	tm = localtime(&fclock);
+	if (do_gmt)
+		tm = gmtime(&fclock);
+	else
+		tm = localtime(&fclock);
 
 	bufp = buf;
 	bufsize = sizeof(buf);
@@ -1731,7 +1825,7 @@ do_print_rec(register NODE *tree)
 }
 
 #ifdef MBS_SUPPORT
-/* wide_tolower_toupper --- lower- or uppercase a multibute string */
+/* wide_tolower_toupper --- lower- or uppercase a multibyte string */
 
 typedef int (*isw_func)(wint_t);
 typedef wint_t (*tow_func)(wint_t);
@@ -1761,7 +1855,7 @@ wide_tolower_toupper(NODE *t1, isw_func iswu, tow_func towl)
 	 */
 	osiz = t1->stlen + 2 + (gawk_mb_cur_max - 1);
 	ofre = osiz - 2;
-	emalloc(obuf, char *, osiz, "wide_tolower_toupper");
+	emalloc(obuf, unsigned char *, osiz, "wide_tolower_toupper");
 
 	memset(&mbs, 0, sizeof(mbstate_t));
 	cp = (unsigned char *)t1->stptr;
@@ -1772,7 +1866,7 @@ wide_tolower_toupper(NODE *t1, isw_func iswu, tow_func towl)
 			size_t olen = cp2 - obuf;
 			ofre += osiz;
 			osiz *= 2;
-			erealloc(obuf, char *, osiz, "wide_tolower_toupper");
+			erealloc(obuf, unsigned char *, osiz, "wide_tolower_toupper");
 			cp2 = obuf + olen;
 		}
 		prev_mbs = mbs;
@@ -1809,7 +1903,7 @@ wide_tolower_toupper(NODE *t1, isw_func iswu, tow_func towl)
 			ofre--;
 		}
 	}
-	t2 = make_str_node(obuf, cp2 - obuf, ALREADY_MALLOCED);
+	t2 = make_str_node((char *) obuf, cp2 - obuf, ALREADY_MALLOCED);
 	t2->flags |= TEMP;
 	return t2;
 }
@@ -2020,7 +2114,7 @@ do_match(NODE *tree)
 
 		rlength = REEND(rp, t1->stptr) - RESTART(rp, t1->stptr);	/* byte length */
 #ifdef MBS_SUPPORT
-		if (gawk_mb_cur_max > 1) {
+		if (rlength > 0 && gawk_mb_cur_max > 1) {
 			t1 = str2wstr(t1, & wc_indices);
 			rlength = wc_indices[rstart + rlength - 1] - wc_indices[rstart] + 1;
 			rstart = wc_indices[rstart];
@@ -2046,7 +2140,7 @@ do_match(NODE *tree)
 					subpat_start = s;
 					subpat_len = len = SUBPATEND(rp, t1->stptr, ii) - s;
 #ifdef MBS_SUPPORT
-					if (gawk_mb_cur_max > 1) {
+					if (len > 0 && gawk_mb_cur_max > 1) {
 						subpat_start = wc_indices[s];
 						subpat_len = wc_indices[s + len - 1] - subpat_start + 1;
 					}
@@ -2089,9 +2183,9 @@ do_match(NODE *tree)
 			}
 
 			free(buf);
-			if (wc_indices != NULL)
-				free(wc_indices);
 		}
+		if (wc_indices != NULL)
+			free(wc_indices);
 	} else {		/* match failed */
 		rstart = 0;
 		rlength = -1;
@@ -2462,6 +2556,8 @@ sub_common(NODE *tree, long how_many, int backdigs)
 	free(t->stptr);
 	t->stptr = buf;
 	t->stlen = textlen;
+	free_wstr(t);
+	t->flags &= ~(NUMCUR|NUMBER);
 
 	free_temp(s);
 	if (matches > 0 && lhs) {
@@ -2471,7 +2567,6 @@ sub_common(NODE *tree, long how_many, int backdigs)
 		}
 		if (after_assign != NULL)
 			(*after_assign)();
-		t->flags &= ~(NUMCUR|NUMBER);
 	}
 	if (mb_indices != NULL)
 		free(mb_indices);
@@ -2645,56 +2740,12 @@ sgfmt(char *buf,	/* return buffer; assumed big enough to hold result */
 }
 #endif	/* GFMT_WORKAROUND */
 
-/*
- * The number of base-FLT_RADIX digits in an AWKNUM fraction, assuming
- * that AWKNUM is not long double.
- */
-#define AWKSMALL_MANT_DIG \
-  (sizeof (AWKNUM) == sizeof (double) ? DBL_MANT_DIG : FLT_MANT_DIG)
-
-/*
- * The number of base-FLT_DIGIT digits in an AWKNUM fraction, even if
- * AWKNUM is long double.  Don't mention 'long double' unless
- * LDBL_MANT_DIG is defined, for the sake of ancient compilers that
- * lack 'long double'.
- */
-#ifdef LDBL_MANT_DIG
-#define AWKNUM_MANT_DIG \
-  (sizeof (AWKNUM) == sizeof (long double) ? LDBL_MANT_DIG : AWKSMALL_MANT_DIG)
-#else
-#define AWKNUM_MANT_DIG AWKSMALL_MANT_DIG
-#endif
-
-/*
- * The number of bits in an AWKNUM fraction, assuming FLT_RADIX is
- * either 2 or 16.  IEEE and VAX formats use radix 2, and IBM
- * mainframe format uses radix 16; we know of no other radices in
- * practical use.
- */
-#if FLT_RADIX != 2 && FLT_RADIX != 16
-Please port the following code to your weird host;
-#endif
-#define AWKNUM_FRACTION_BITS (AWKNUM_MANT_DIG * (FLT_RADIX == 2 ? 1 : 4))
- 
 /* tmp_integer - Convert an integer to a temporary number node.  */
 
 static NODE *
 tmp_integer(uintmax_t n)
 {
-#ifdef HAVE_UINTMAX_T
-/* #ifndef LDBL_MANT_DIG */
-	/*
-	 * If uintmax_t is so wide that AWKNUM cannot represent all its
-	 * values, strip leading nonzero bits of integers that are so large
-	 * that they cannot be represented exactly as AWKNUMs, so that their
-	 * low order bits are represented exactly, without rounding errors.
-	 * This is more desirable in practice, since it means the user sees
-	 * integers that are the same width as the AWKNUM fractions.
-	 */
-	if (AWKNUM_FRACTION_BITS < CHAR_BIT * sizeof n)
-		n &= ((uintmax_t) 1 << AWKNUM_FRACTION_BITS) - 1;
-/* #endif */ /* LDBL_MANT_DIG */
-#endif /* HAVE_UINTMAX_T */
+	n = adjust_uint(n);
 
 	return tmp_number((AWKNUM) n);
 }
@@ -2922,7 +2973,7 @@ do_strtonum(NODE *tree)
 
 	if ((tmp->flags & (NUMBER|NUMCUR)) != 0)
 		d = (AWKNUM) force_number(tmp);
-	else if (isnondecimal(tmp->stptr, TRUE))
+	else if (isnondecimal(tmp->stptr, use_lc_numeric))
 		d = nondec2awknum(tmp->stptr, tmp->stlen);
 	else
 		d = (AWKNUM) force_number(tmp);
@@ -3013,7 +3064,7 @@ done:
 
 /* do_dcgettext, do_dcngettext --- handle i18n translations */
 
-#if ENABLE_NLS && HAVE_LC_MESSAGES && HAVE_DCGETTEXT
+#if ENABLE_NLS && defined(LC_MESSAGES) && HAVE_DCGETTEXT
 
 static int
 localecategory_from_argument(NODE *tree)
@@ -3100,7 +3151,7 @@ do_dcgettext(NODE *tree)
 	NODE *tmp, *t1, *t2;
 	char *string;
 	char *the_result;
-#if ENABLE_NLS && HAVE_LC_MESSAGES && HAVE_DCGETTEXT
+#if ENABLE_NLS && defined(LC_MESSAGES) && HAVE_DCGETTEXT
 	int lc_cat;
 	char *domain;
 #endif /* ENABLE_NLS */
@@ -3110,7 +3161,7 @@ do_dcgettext(NODE *tree)
 	string = t1->stptr;
 
 	t2 = NULL;
-#if ENABLE_NLS && HAVE_LC_MESSAGES && HAVE_DCGETTEXT
+#if ENABLE_NLS && defined(LC_MESSAGES) && HAVE_DCGETTEXT
 	tree = tree->rnode;	/* second argument */
 	if (tree != NULL) {
 		tmp = tree->lnode;
@@ -3142,7 +3193,7 @@ do_dcngettext(NODE *tree)
 	char *string1, *string2;
 	unsigned long number;
 	char *the_result;
-#if ENABLE_NLS && HAVE_LC_MESSAGES && HAVE_DCGETTEXT
+#if ENABLE_NLS && defined(LC_MESSAGES) && HAVE_DCGETTEXT
 	int lc_cat;
 	char *domain;
 #endif /* ENABLE_NLS */
@@ -3159,7 +3210,7 @@ do_dcngettext(NODE *tree)
 	number = (unsigned long) double_to_int(force_number(tree_eval(tmp)));
 
 	t3 = NULL;
-#if ENABLE_NLS && HAVE_LC_MESSAGES && HAVE_DCGETTEXT
+#if ENABLE_NLS && defined(LC_MESSAGES) && HAVE_DCGETTEXT
 	tree = tree->rnode->rnode->rnode;	/* fourth argument */
 	if (tree != NULL) {
 		tmp = tree->lnode;
diff --git a/config.guess b/config.guess
index 772ec36a..850a1a48 100755
--- a/config.guess
+++ b/config.guess
@@ -1,13 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-02-10'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,13 +18,15 @@ timestamp='2005-02-10'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -104,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -196,55 +199,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,40 +268,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -338,32 +312,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
+	exit ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -372,10 +346,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -387,10 +361,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -401,40 +375,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -458,32 +432,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -499,29 +474,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -529,7 +504,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -544,14 +519,18 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -565,28 +544,28 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -648,9 +627,19 @@ EOF
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -658,11 +647,11 @@ EOF
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -690,161 +679,179 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    amd64:CYGWIN*:*:*)
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -861,8 +868,12 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -880,15 +891,22 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -902,7 +920,7 @@ EOF
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -910,25 +928,28 @@ EOF
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -946,15 +967,15 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -971,7 +992,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -981,16 +1002,23 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -998,27 +1026,27 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1026,15 +1054,16 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1052,73 +1081,73 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1126,69 +1155,72 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1196,25 +1228,25 @@ EOF
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1225,41 +1257,47 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
 	esac ;;
     *:XENIX:*:SysV)
 	echo i386-pc-xenix
-	exit 0 ;;
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1291,7 +1329,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1380,11 +1418,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1393,22 +1432,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1419,7 +1458,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config.rpath b/config.rpath
index 3f1bef34..c492a93b 100755
--- a/config.rpath
+++ b/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2005 Free Software Foundation, Inc.
+#   Copyright 1996-2006 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -25,7 +25,7 @@
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -35,7 +35,17 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
 
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
@@ -48,7 +58,7 @@ else
       wl='-Wl,'
       ;;
     darwin*)
-      case "$cc_basename" in
+      case $cc_basename in
         xlc*)
           wl='-Wl,'
           ;;
@@ -78,6 +88,13 @@ else
         como)
           wl='-lopt='
           ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
       esac
       ;;
     osf3* | osf4* | osf5*)
@@ -120,6 +137,10 @@ case "$host_os" in
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -127,6 +148,12 @@ esac
 
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
     aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
@@ -162,9 +189,20 @@ if test "$with_gnu_ld" = yes; then
         ld_shlibs=no
       fi
       ;;
+    interix3*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
     netbsd*)
       ;;
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
         ld_shlibs=no
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -173,16 +211,23 @@ if test "$with_gnu_ld" = yes; then
         ld_shlibs=no
       fi
       ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
     sunos4*)
       hardcode_direct=yes
       ;;
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
@@ -191,10 +236,8 @@ if test "$with_gnu_ld" = yes; then
       fi
       ;;
   esac
-  if test "$ld_shlibs" = yes; then
-    # Unlike libtool, we use -rpath here, not --rpath, since the documented
-    # option of GNU ld is called -rpath, not --rpath.
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
   fi
 else
   case "$host_os" in
@@ -225,6 +268,7 @@ else
               break
             fi
           done
+          ;;
         esac
       fi
       hardcode_direct=yes
@@ -244,6 +288,7 @@ else
             hardcode_libdir_flag_spec='-L$libdir'
             hardcode_libdir_separator=
           fi
+          ;;
         esac
       fi
       # Begin _LT_AC_SYS_LIBPATH_AIX.
@@ -291,7 +336,7 @@ else
       if test "$GCC" = yes ; then
         :
       else
-        case "$cc_basename" in
+        case $cc_basename in
           xlc*)
             ;;
           *)
@@ -326,24 +371,25 @@ else
       # but as the default location of the library.
       hardcode_minus_L=yes
       ;;
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$with_gnu_ld" = no; then
-        case "$host_cpu" in
-          hppa*64*)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
-            hardcode_direct=no
-            ;;
-          ia64*)
-            hardcode_libdir_flag_spec='-L$libdir'
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
             hardcode_direct=no
-            # hardcode_minus_L: Not really in the search PATH,
-            # but as the default location of the library.
-            hardcode_minus_L=yes
             ;;
           *)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
             hardcode_direct=yes
             # hardcode_minus_L: Not really in the search PATH,
             # but as the default location of the library.
@@ -397,8 +443,6 @@ else
       fi
       hardcode_libdir_separator=:
       ;;
-    sco3.2v5*)
-      ;;
     solaris*)
       hardcode_libdir_flag_spec='-R$libdir'
       ;;
@@ -427,14 +471,11 @@ else
         ld_shlibs=yes
       fi
       ;;
-    sysv4.2uw2*)
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      ;;
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
       ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
       ;;
     uts4*)
       hardcode_libdir_flag_spec='-L$libdir'
@@ -471,12 +512,12 @@ case "$host_os" in
     ;;
   kfreebsd*-gnu)
     ;;
-  freebsd*)
+  freebsd* | dragonfly*)
     ;;
   gnu*)
     ;;
   hpux9* | hpux10* | hpux11*)
-    case "$host_cpu" in
+    case $host_cpu in
       ia64*)
         shrext=.so
         ;;
@@ -488,6 +529,8 @@ case "$host_os" in
         ;;
     esac
     ;;
+  interix3*)
+    ;;
   irix5* | irix6* | nonstopux*)
     case "$host_os" in
       irix5* | nonstopux*)
@@ -523,16 +566,16 @@ case "$host_os" in
     ;;
   osf3* | osf4* | osf5*)
     ;;
-  sco3.2v5*)
-    ;;
   solaris*)
     ;;
   sunos4*)
     ;;
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  sysv4 | sysv4.3*)
     ;;
   sysv4*MP*)
     ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    ;;
   uts4*)
     ;;
 esac
diff --git a/config.sub b/config.sub
index 1a7fd811..38e508a5 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-02-10'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -11,7 +12,7 @@ timestamp='2005-02-10'
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -21,14 +22,15 @@ timestamp='2005-02-10'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,8 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -170,6 +173,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -186,6 +193,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -230,14 +241,16 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -246,6 +259,7 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -254,20 +268,24 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -278,6 +296,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -297,8 +318,8 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -308,7 +329,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -319,6 +340,7 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,23 +349,26 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
@@ -683,6 +708,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -758,9 +786,8 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -791,6 +818,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -847,6 +880,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -873,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1086,13 +1127,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1165,20 +1203,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1196,7 +1237,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1330,6 +1371,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1339,9 +1386,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1385,6 +1432,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1556,7 +1606,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/configh.in b/configh.in
index 3731e4f7..df3c30f1 100644
--- a/configh.in
+++ b/configh.in
@@ -20,6 +20,12 @@
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM
 
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the `atexit' function. */
+#undef HAVE_ATEXIT
+
 /* Define to 1 if you have the `btowc' function. */
 #undef HAVE_BTOWC
 
@@ -35,6 +41,10 @@
    */
 #undef HAVE_DCGETTEXT
 
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+#undef HAVE_DECL_TZNAME
+
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
@@ -44,6 +54,9 @@
 /* Define to 1 if you have the `fmod' function. */
 #undef HAVE_FMOD
 
+/* have getaddrinfo */
+#undef HAVE_GETADDRINFO
+
 /* Define to 1 if you have the `getgrent' function. */
 #undef HAVE_GETGRENT
 
@@ -81,8 +94,11 @@
 /* Define to 1 if you have the `iswupper' function. */
 #undef HAVE_ISWUPPER
 
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
 
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
@@ -99,6 +115,9 @@
 /* Define if you have the 'long long' type. */
 #undef HAVE_LONG_LONG
 
+/* Define to 1 if the system has the type `long long int'. */
+#undef HAVE_LONG_LONG_INT
+
 /* Define to 1 if you have the `mbrlen' function. */
 #undef HAVE_MBRLEN
 
@@ -114,6 +133,9 @@
 /* Define to 1 if you have the `memcpy' function. */
 #undef HAVE_MEMCPY
 
+/* Define to 1 if you have the `memcpy_ulong' function. */
+#undef HAVE_MEMCPY_ULONG
+
 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
@@ -123,6 +145,12 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
+/* Define to 1 if you have the `memset_ulong' function. */
+#undef HAVE_MEMSET_ULONG
+
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
 /* we have the mktime function */
 #undef HAVE_MKTIME
 
@@ -144,12 +172,18 @@
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
+/* newer systems define this type here */
+#undef HAVE_SOCKADDR_STORAGE
+
 /* we have sockets on this system */
 #undef HAVE_SOCKETS
 
 /* Define to 1 if you have the <stdarg.h> header file. */
 #undef HAVE_STDARG_H
 
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -224,6 +258,9 @@
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
+/* Define to 1 if you have the `tmpfile' function. */
+#undef HAVE_TMPFILE
+
 /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
 #undef HAVE_TM_ZONE
@@ -250,6 +287,9 @@
 /* Define if you have the 'unsigned long long' type. */
 #undef HAVE_UNSIGNED_LONG_LONG
 
+/* Define to 1 if the system has the type `unsigned long long int'. */
+#undef HAVE_UNSIGNED_LONG_LONG_INT
+
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
@@ -274,6 +314,9 @@
 /* systems should define this type here */
 #undef HAVE_WINT_T
 
+/* disable fatal errors on directories */
+#undef NO_DIRECTORY_FATAL
+
 /* disable lint checks */
 #undef NO_LINT
 
@@ -304,10 +347,10 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
-/* The size of a `unsigned int', as computed by sizeof. */
+/* The size of `unsigned int', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_INT
 
-/* The size of a `unsigned long', as computed by sizeof. */
+/* The size of `unsigned long', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_LONG
 
 /* return type of sprintf */
@@ -316,9 +359,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* strtod doesn't have C89 semantics */
-#undef STRTOD_NOT_C89
-
 /* some systems define this type here */
 #undef TIME_T_IN_SYS_TYPES_H
 
@@ -344,6 +384,11 @@
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
@@ -362,6 +407,17 @@
 # undef __CHAR_UNSIGNED__
 #endif
 
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+
 /* Define like PROTOTYPES; this can be used by system headers. */
 #undef __PROTOTYPES
 
@@ -387,7 +443,7 @@
    supported. Do not define if restrict is supported directly. */
 #undef restrict
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* type to use in place of socklen_t if not defined */
diff --git a/configure b/configure
index 6c8b4b5c..91879336 100755
--- a/configure
+++ b/configure
@@ -1,27 +1,56 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GNU Awk 3.1.5.
+# Generated by GNU Autoconf 2.61 for GNU Awk 3.1.6.
 #
 # Report bugs to <bug-gawk@gnu.org>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -31,8 +60,43 @@ else
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -46,18 +110,19 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -65,157 +130,388 @@ fi
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
 fi
 
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
+  case $as_dir in
 	 /*)
-	   if ("$as_dir/$as_base" -c '
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
+  chmod +x "$as_me.lineno" ||
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -224,7 +520,28 @@ else
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -233,85 +550,196 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
 
+exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
 # Identity of this package.
 PACKAGE_NAME='GNU Awk'
 PACKAGE_TARNAME='gawk'
-PACKAGE_VERSION='3.1.5'
-PACKAGE_STRING='GNU Awk 3.1.5'
+PACKAGE_VERSION='3.1.6'
+PACKAGE_STRING='GNU Awk 3.1.6'
 PACKAGE_BUGREPORT='bug-gawk@gnu.org'
 
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar EGREP YACC LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RANLIB ac_ct_RANLIB U ANSI2KNR MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS SOCKET_LIBS LTLIBOBJS'
+gt_needs=
+ac_header_list=
+ac_func_list=
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+am__isrc
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+GREP
+EGREP
+YACC
+YFLAGS
+LN_S
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+CPP
+RANLIB
+U
+ANSI2KNR
+USE_NLS
+MSGFMT
+GMSGFMT
+MSGFMT_015
+GMSGFMT_015
+XGETTEXT
+XGETTEXT_015
+MSGMERGE
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+INTL_MACOSX_LIBS
+LIBICONV
+LTLIBICONV
+INTLLIBS
+LIBINTL
+LTLIBINTL
+POSUB
+LIBOBJS
+SOCKET_LIBS
+LTLIBOBJS'
 ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+YACC
+YFLAGS
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -338,34 +766,48 @@ x_libraries=NONE
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -387,33 +829,45 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -440,6 +894,12 @@ do
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -464,13 +924,16 @@ do
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -535,6 +998,16 @@ do
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -587,24 +1060,20 @@ do
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -635,8 +1104,7 @@ Try \`$0 --help' for more information." >&2
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
@@ -656,27 +1124,19 @@ if test -n "$ac_prev"; then
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+# Be sure to have absolute directory names.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
   case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -703,74 +1163,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
 test "$silent" = yes && exec 6>/dev/null
 
 
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$0" ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$0" : 'X\(//\)[^/]' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
 fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
@@ -779,7 +1241,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Awk 3.1.5 to adapt to many kinds of systems.
+\`configure' configures GNU Awk 3.1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -799,9 +1261,6 @@ Configuration:
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 			  [$ac_default_prefix]
@@ -819,15 +1278,22 @@ Fine tuning of the installation directories:
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/gawk]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -845,7 +1311,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Awk 3.1.5:";;
+     short | recursive ) echo "Configuration of GNU Awk 3.1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -855,6 +1321,7 @@ Optional Features:
   --enable-portals	Enable /p as path prefix for portals
   --disable-lint	Disable gawk lint checking
   --enable-switch	Enable switch statements for awk programs
+  --disable-directories-fatal	Disable fatal errors on directories
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-largefile     omit support for large files
@@ -872,12 +1339,18 @@ Optional Packages:
   --without-libintl-prefix     don't search for libintl in includedir and libdir
 
 Some influential environment variables:
+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+              the first program found out of: `bison -y', `byacc', `yacc'.
+  YFLAGS      The list of arguments that will be passed by default to $YACC.
+              This script will default YFLAGS to the empty string to avoid a
+              default value of `-d' given by some make applications.
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
@@ -885,120 +1358,86 @@ it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <bug-gawk@gnu.org>.
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Awk configure 3.1.5
-generated by GNU Autoconf 2.59
+GNU Awk configure 3.1.6
+generated by GNU Autoconf 2.61
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Awk $as_me 3.1.5, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+It was created by GNU Awk $as_me 3.1.6, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1017,7 +1456,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -1031,6 +1470,7 @@ do
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1052,7 +1492,6 @@ _ACEOF
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1063,7 +1502,7 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    *\'*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1085,9 +1524,7 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
@@ -1098,8 +1535,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1112,20 +1549,34 @@ trap 'exit_status=$?
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1136,22 +1587,28 @@ _ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1163,26 +1620,24 @@ _ASBOX
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1213,14 +1668,17 @@ _ACEOF
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1236,8 +1694,8 @@ if test -r "$cache_file"; then
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
@@ -1246,15 +1704,18 @@ echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+gt_needs="$gt_needs "
+ac_header_list="$ac_header_list sys/time.h"
+ac_header_list="$ac_header_list unistd.h"
+ac_func_list="$ac_func_list alarm"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1279,8 +1740,7 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1297,12 +1757,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 
 
 
@@ -1327,6 +1781,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -1345,31 +1804,38 @@ then
 fi
 
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1384,8 +1850,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1407,7 +1873,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1426,21 +1892,22 @@ case $as_dir/ in
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1450,8 +1917,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -1493,20 +1960,20 @@ echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.  echo might interpret backslashes.
 # By default was `s,x,x', remove it if useless.
 cat <<\_ACEOF >conftest.sed
 s/[\\$]/&&/g;s/;s,x,x,$//
 _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+rm -f conftest.sed
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1521,45 +1988,60 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1572,54 +2054,57 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$AWK" && break
 done
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1632,12 +2117,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -1652,7 +2141,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gawk'
- VERSION='3.1.5'
+ VERSION='3.1.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1680,7 +2169,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -1690,8 +2179,8 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1704,32 +2193,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1742,33 +2233,47 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  STRIP=$ac_ct_STRIP
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -1783,10 +2288,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-# Check whether --enable-portals or --disable-portals was given.
+
+# Check whether --enable-portals was given.
 if test "${enable_portals+set}" = set; then
-  enableval="$enable_portals"
-  if test "$enableval" = yes
+  enableval=$enable_portals; if test "$enableval" = yes
 	then
 
 cat >>confdefs.h <<\_ACEOF
@@ -1795,12 +2300,12 @@ _ACEOF
 
 	fi
 
-fi;
+fi
+
 
-# Check whether --with-whiny-user-strftime or --without-whiny-user-strftime was given.
+# Check whether --with-whiny-user-strftime was given.
 if test "${with_whiny_user_strftime+set}" = set; then
-  withval="$with_whiny_user_strftime"
-  if test "$withval" = yes
+  withval=$with_whiny_user_strftime; if test "$withval" = yes
 	then
 
 cat >>confdefs.h <<\_ACEOF
@@ -1809,11 +2314,11 @@ _ACEOF
 
 	fi
 
-fi;
-# Check whether --enable-lint or --disable-lint was given.
+fi
+
+# Check whether --enable-lint was given.
 if test "${enable_lint+set}" = set; then
-  enableval="$enable_lint"
-  if test "$enableval" = no
+  enableval=$enable_lint; if test "$enableval" = no
 	then
 
 cat >>confdefs.h <<\_ACEOF
@@ -1822,11 +2327,11 @@ _ACEOF
 
 	fi
 
-fi;
-# Check whether --enable-switch or --disable-switch was given.
+fi
+
+# Check whether --enable-switch was given.
 if test "${enable_switch+set}" = set; then
-  enableval="$enable_switch"
-  if test "$enableval" = yes
+  enableval=$enable_switch; if test "$enableval" = yes
 	then
 
 cat >>confdefs.h <<\_ACEOF
@@ -1835,29 +2340,190 @@ _ACEOF
 
 	fi
 
-fi;
+fi
+
+# Check whether --enable-directories-fatal was given.
+if test "${enable_directories_fatal+set}" = set; then
+  enableval=$enable_directories_fatal; if test "$enableval" = no
+	then
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_DIRECTORY_FATAL 1
+_ACEOF
+
+	fi
+
+fi
+
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in grep ggrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
     fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_GREP_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+    # Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_EGREP_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+
+   fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
 
 for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1870,38 +2536,40 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
+  { echo "$as_me:$LINENO: result: $YACC" >&5
+echo "${ECHO_T}$YACC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$YACC" && break
 done
 test -n "$YACC" || YACC="yacc"
 
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
 ac_ext=c
@@ -1912,8 +2580,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1926,32 +2594,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1964,36 +2634,51 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2006,74 +2691,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
+  fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2087,7 +2732,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2098,6 +2743,7 @@ do
   fi
 done
 done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -2115,22 +2761,23 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2143,36 +2790,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2185,29 +2834,45 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -2220,21 +2885,35 @@ See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -2259,47 +2938,77 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link_default") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2311,19 +3020,21 @@ See \`config.log' for more details." >&2;}
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
 
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2342,22 +3053,27 @@ See \`config.log' for more details." >&2;}
     fi
   fi
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2368,9 +3084,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
@@ -2384,14 +3099,14 @@ See \`config.log' for more details." >&2;}
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2411,14 +3126,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
@@ -2436,12 +3157,12 @@ fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2464,50 +3185,49 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2523,38 +3243,118 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2570,12 +3370,12 @@ else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2609,12 +3409,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2629,205 +3434,57 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2835,7 +3492,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 DEPDIR="${am__leading_dot}deps"
 
-          ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
@@ -2845,8 +3502,8 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -2873,22 +3530,20 @@ if test "$am__include" = "#"; then
 fi
 
 
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
 rm -f confinc confmf
 
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+# Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
+  enableval=$enable_dependency_tracking;
+fi
 
-fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -2898,11 +3553,10 @@ fi
 
 
 
-
 depcc="$CC"   am_compiler_list=
 
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2966,6 +3620,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -2991,13 +3646,11 @@ else
 fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -3013,8 +3666,8 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -3048,24 +3701,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3074,9 +3725,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3086,24 +3738,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -3114,6 +3764,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -3131,8 +3782,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3155,24 +3806,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3181,9 +3830,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3193,24 +3843,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -3221,6 +3869,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -3245,8 +3894,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3259,32 +3908,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3297,27 +3948,41 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
@@ -3339,8 +4004,8 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3362,7 +4027,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3381,21 +4046,22 @@ case $as_dir/ in
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3406,44 +4072,45 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 
 # This is mainly for my use during testing and development.
 # Yes, it's a bit of a hack.
-echo "$as_me:$LINENO: checking for special development options" >&5
-echo $ECHO_N "checking for special development options... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for special development options" >&5
+echo $ECHO_N "checking for special development options... $ECHO_C" >&6; }
 if test -f $srcdir/.developing
 then
 	# add other debug flags as appropriate, save GAWKDEBUG for emergencies
-	CFLAGS="$CFLAGS -DARRAYDEBUG"
+	CFLAGS="$CFLAGS -DARRAYDEBUG -DYYDEBUG"
 	if grep dbug $srcdir/.developing
 	then
 		CFLAGS="$CFLAGS -DDBUG"
@@ -3452,22 +4119,28 @@ then
 	# turn on compiler warnings if we're doing development
 	if test "$GCC" = yes
 	then
-		CFLAGS="$CFLAGS -Wall"
+		CFLAGS="$CFLAGS -Wall -fno-builtin"
 	fi
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
 
 
+cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+
 
 
-echo "$as_me:$LINENO: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+
+{ echo "$as_me:$LINENO: checking for AIX" >&5
+echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3481,147 +4154,21 @@ cat >>conftest.$ac_ext <<_ACEOF
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "yes" >/dev/null 2>&1; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 cat >>confdefs.h <<\_ACEOF
 #define _ALL_SOURCE 1
 _ACEOF
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 rm -f conftest*
 
 
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-if test "${ac_cv_search_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
-
-fi
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3645,35 +4192,31 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -3729,6 +4272,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -3748,18 +4292,27 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -3772,12 +4325,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3800,9 +4355,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3816,38 +4371,35 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_Header=no"
+	eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -3859,17 +4411,17 @@ done
 
 
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for minix/config.h" >&5
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3880,41 +4432,37 @@ $ac_includes_default
 #include <minix/config.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3923,24 +4471,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <minix/config.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -3948,9 +4494,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -3974,25 +4521,23 @@ echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compi
 echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to bug-gawk@gnu.org ##
 ## ------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_minix_config_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
 
 fi
 if test $ac_cv_header_minix_config_h = yes; then
@@ -4020,15 +4565,158 @@ _ACEOF
 
 fi
 
-# Check whether --enable-largefile or --disable-largefile was given.
+
+
+
+
+
+
+
+
+
+
+  { echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+echo $ECHO_N "checking whether it is safe to define __EXTENSIONS__... $ECHO_C" >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+echo "${ECHO_T}$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+
+        { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
+if test "${ac_cv_lib_cposix_strerror+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcposix  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_cposix_strerror=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_cposix_strerror=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
+if test $ac_cv_lib_cposix_strerror = yes; then
+  LIBS="$LIBS -lcposix"
+fi
+
+
+
+# Check whether --enable-largefile was given.
 if test "${enable_largefile+set}" = set; then
-  enableval="$enable_largefile"
+  enableval=$enable_largefile;
+fi
 
-fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4036,8 +4724,8 @@ else
      if test "$GCC" != yes; then
        ac_save_CC=$CC
        while :; do
-     	 # IRIX 6.2 and later do not support large files by default,
-     	 # so use the C compiler's -n32 option if that helps.
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
 	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4061,84 +4749,77 @@ main ()
   return 0;
 }
 _ACEOF
-     	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
-     	 CC="$CC -n32"
-     	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
 	 break
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   while :; do
-  ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4163,34 +4844,31 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_file_offset_bits=no; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4216,54 +4894,53 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_sys_file_offset_bits=64; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-if test "$ac_cv_sys_file_offset_bits" != no; then
-
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
 cat >>confdefs.h <<_ACEOF
 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 _ACEOF
-
-fi
+;;
+esac
 rm -f conftest*
-  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   while :; do
-  ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4288,34 +4965,31 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_large_files=no; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4341,52 +5015,52 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_sys_large_files=1; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
   break
 done
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-if test "$ac_cv_sys_large_files" != no; then
-
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
 cat >>confdefs.h <<_ACEOF
 #define _LARGE_FILES $ac_cv_sys_large_files
 _ACEOF
-
-fi
+;;
+esac
 rm -f conftest*
+  fi
 fi
 
 
-echo "$as_me:$LINENO: checking for AIX compilation hacks" >&5
-echo $ECHO_N "checking for AIX compilation hacks... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for AIX compilation hacks" >&5
+echo $ECHO_N "checking for AIX compilation hacks... $ECHO_C" >&6; }
 if test "${gawk_cv_aix_hack+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4400,12 +5074,12 @@ else
 fi
 
 fi
-echo "$as_me:$LINENO: result: ${gawk_cv_aix_hack}" >&5
-echo "${ECHO_T}${gawk_cv_aix_hack}" >&6
+{ echo "$as_me:$LINENO: result: ${gawk_cv_aix_hack}" >&5
+echo "${ECHO_T}${gawk_cv_aix_hack}" >&6; }
 
 
-echo "$as_me:$LINENO: checking for Linux/Alpha compilation hacks" >&5
-echo $ECHO_N "checking for Linux/Alpha compilation hacks... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Linux/Alpha compilation hacks" >&5
+echo $ECHO_N "checking for Linux/Alpha compilation hacks... $ECHO_C" >&6; }
 if test "${gawk_cv_linux_alpha_hack+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4426,8 +5100,8 @@ else
 fi
 
 fi
-echo "$as_me:$LINENO: result: ${gawk_cv_linux_alpha_hack}" >&5
-echo "${ECHO_T}${gawk_cv_linux_alpha_hack}" >&6
+{ echo "$as_me:$LINENO: result: ${gawk_cv_linux_alpha_hack}" >&5
+echo "${ECHO_T}${gawk_cv_linux_alpha_hack}" >&6; }
 
 
 if test "$ISC" = 1	# will be set by test for ISC
@@ -4435,852 +5109,11 @@ then
 	CFLAGS="$CFLAGS -D_SYSV3"
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-
-echo "$as_me:$LINENO: checking for function prototypes" >&5
-echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
-if test "$ac_cv_prog_cc_stdc" != no; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: checking for function prototypes" >&5
+echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6; }
+if test "$ac_cv_prog_cc_c89" != no; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define PROTOTYPES 1
@@ -5292,8 +5125,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -5308,18 +5141,19 @@ fi
 for ac_header in string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5330,41 +5164,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5373,24 +5203,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5398,9 +5226,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -5424,25 +5253,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to bug-gawk@gnu.org ##
 ## ------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -5466,31 +5294,17 @@ case `(uname) 2> /dev/null` in
 esac
 
 
-
-        MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-
-
-
-  echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-    # Check whether --enable-nls or --disable-nls was given.
+  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+    # Check whether --enable-nls was given.
 if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-  USE_NLS=$enableval
+  enableval=$enable_nls; USE_NLS=$enableval
 else
   USE_NLS=yes
-fi;
-  echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
+fi
+
+  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6; }
 
 
 
@@ -5527,8 +5341,8 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5559,17 +5373,17 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5584,30 +5398,42 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
-
 if test -n "$GMSGFMT"; then
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
 
+    case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+
+
+
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
@@ -5638,8 +5464,8 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5670,15 +5496,21 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
     rm -f messages.po
 
+    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+
+
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
@@ -5710,8 +5542,8 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGMERGE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5741,39 +5573,18 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6
+  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
-      if test "$GMSGFMT" != ":"; then
-            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
-      GMSGFMT=":"
-    fi
-  fi
+        test -n "$localedir" || localedir='${datadir}/locale'
 
-      if test "$XGETTEXT" != ":"; then
-            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
-      XGETTEXT=":"
-    fi
-        rm -f messages.po
-  fi
 
-            ac_config_commands="$ac_config_commands default-1"
+  ac_config_commands="$ac_config_commands po-directories"
 
 
 
@@ -5793,67 +5604,96 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
   prefix="$acl_save_prefix"
 
 # Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
+fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
@@ -5870,8 +5710,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -5900,11 +5740,11 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
 fi
 if test "${acl_cv_path_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5934,17 +5774,17 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 if test "${acl_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5956,15 +5796,15 @@ case `$LD -v 2>&1 </dev/null` in
   acl_cv_prog_gnu_ld=no ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
-                                                echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
 if test "${acl_cv_rpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5976,8 +5816,8 @@ else
     acl_cv_rpath=done
 
 fi
-echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6
+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -5985,13 +5825,33 @@ echo "${ECHO_T}$acl_cv_rpath" >&6
   hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
   hardcode_direct="$acl_cv_hardcode_direct"
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
-    # Check whether --enable-rpath or --disable-rpath was given.
+    # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
-  enableval="$enable_rpath"
-  :
+  enableval=$enable_rpath; :
 else
   enable_rpath=yes
-fi;
+fi
+
+
+
+                  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+
 
 
 
@@ -6013,10 +5873,9 @@ fi;
   prefix="$acl_save_prefix"
 
 
-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+# Check whether --with-libiconv-prefix was given.
 if test "${with_libiconv_prefix+set}" = set; then
-  withval="$with_libiconv_prefix"
-
+  withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -6035,11 +5894,12 @@ if test "${with_libiconv_prefix+set}" = set; then
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 
-fi;
+fi
+
       LIBICONV=
   LTLIBICONV=
   INCICONV=
@@ -6077,9 +5937,16 @@ fi;
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -6107,9 +5974,16 @@ fi;
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -6132,7 +6006,7 @@ fi;
           if test "X$found_dir" != "X"; then
                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
               else
                                                                                 haveit=
@@ -6197,8 +6071,8 @@ fi;
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -6247,9 +6121,9 @@ fi;
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -6392,22 +6266,27 @@ fi;
 
 
 
-    echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
+
+
+
+
+
+
+
+    { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
 if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <CFPreferences.h>
+#include <CoreFoundation/CFPreferences.h>
 int
 main ()
 {
@@ -6417,41 +6296,37 @@ CFPreferencesCopyAppValue(NULL, NULL)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   gt_cv_func_CFPreferencesCopyAppValue=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gt_cv_func_CFPreferencesCopyAppValue=no
+	gt_cv_func_CFPreferencesCopyAppValue=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-     CPPFLAGS="$gt_save_CPPFLAGS"
      LIBS="$gt_save_LIBS"
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -6459,22 +6334,20 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   fi
-    echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
 if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <CFLocale.h>
+#include <CoreFoundation/CFLocale.h>
 int
 main ()
 {
@@ -6484,41 +6357,37 @@ CFLocaleCopyCurrent();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   gt_cv_func_CFLocaleCopyCurrent=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gt_cv_func_CFLocaleCopyCurrent=no
+	gt_cv_func_CFLocaleCopyCurrent=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-     CPPFLAGS="$gt_save_CPPFLAGS"
      LIBS="$gt_save_LIBS"
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -6534,36 +6403,43 @@ _ACEOF
 
 
 
-  echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-    # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-  USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi;
-  echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
-
-
 
 
   LIBINTL=
   LTLIBINTL=
   POSUB=
 
+    case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
     if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
 
 
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
 
-
-
-
-        echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
+        { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
+if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -6573,53 +6449,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
 int
 main ()
 {
 bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_gnugettext1_libc=yes
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$gt_func_gnugettext_libc=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gt_cv_func_gnugettext1_libc=no
+	eval "$gt_func_gnugettext_libc=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
+ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
-        if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
 
 
@@ -6650,8 +6525,8 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
   done
 
 
-  echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6677,34 +6552,32 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   am_cv_func_iconv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
@@ -6728,42 +6601,40 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -6772,10 +6643,10 @@ _ACEOF
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6
+    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -6787,6 +6658,7 @@ echo "${ECHO_T}$LIBICONV" >&6
 
 
 
+
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -6801,10 +6673,9 @@ echo "${ECHO_T}$LIBICONV" >&6
   prefix="$acl_save_prefix"
 
 
-# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
+# Check whether --with-libintl-prefix was given.
 if test "${with_libintl_prefix+set}" = set; then
-  withval="$with_libintl_prefix"
-
+  withval=$with_libintl_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -6823,11 +6694,12 @@ if test "${with_libintl_prefix+set}" = set; then
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 
-fi;
+fi
+
       LIBINTL=
   LTLIBINTL=
   INCINTL=
@@ -6865,9 +6737,16 @@ fi;
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -6895,9 +6774,16 @@ fi;
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -6920,7 +6806,7 @@ fi;
           if test "X$found_dir" != "X"; then
                         LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
               else
                                                                                 haveit=
@@ -6985,8 +6871,8 @@ fi;
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -7035,9 +6921,9 @@ fi;
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -7163,9 +7049,9 @@ fi;
     done
   fi
 
-          echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
+          { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
+if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
@@ -7179,6 +7065,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
@@ -7189,43 +7076,40 @@ int
 main ()
 {
 bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_gnugettext1_libintl=yes
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$gt_func_gnugettext_libintl=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gt_cv_func_gnugettext1_libintl=no
+	eval "$gt_func_gnugettext_libintl=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-                        if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7234,6 +7118,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
@@ -7244,54 +7129,53 @@ int
 main ()
 {
 bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext1_libintl=yes
+                eval "$gt_func_gnugettext_libintl=yes"
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
+ac_res=`eval echo '${'$gt_func_gnugettext_libintl'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
         fi
 
-                                        if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -7323,15 +7207,15 @@ _ACEOF
     fi
   fi
 
-  echo "$as_me:$LINENO: checking whether to use NLS" >&5
-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
-  echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
+  { echo "$as_me:$LINENO: checking whether to use NLS" >&5
+echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -7339,18 +7223,18 @@ echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
     else
       gt_source="included intl directory"
     fi
-    echo "$as_me:$LINENO: result: $gt_source" >&5
-echo "${ECHO_T}$gt_source" >&6
+    { echo "$as_me:$LINENO: result: $gt_source" >&5
+echo "${ECHO_T}$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
-        echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { echo "$as_me:$LINENO: checking how to link with libintl" >&5
+echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
+        { echo "$as_me:$LINENO: result: $LIBINTL" >&5
+echo "${ECHO_T}$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -7402,8 +7286,129 @@ _ACEOF
 
 
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
+if test "${am_cv_langinfo_codeset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <langinfo.h>
+int
+main ()
+{
+char* cs = nl_langinfo(CODESET); return !cs;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  am_cv_langinfo_codeset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	am_cv_langinfo_codeset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
+  if test $am_cv_langinfo_codeset = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LANGINFO_CODESET 1
+_ACEOF
+
+  fi
+
+
+  { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+if test "${gt_cv_val_LC_MESSAGES+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <locale.h>
+int
+main ()
+{
+return LC_MESSAGES
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  gt_cv_val_LC_MESSAGES=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_val_LC_MESSAGES=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5
+echo "${ECHO_T}$gt_cv_val_LC_MESSAGES" >&6; }
+  if test $gt_cv_val_LC_MESSAGES = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LC_MESSAGES 1
+_ACEOF
+
+  fi
+
+
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7427,35 +7432,31 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -7511,6 +7512,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -7530,18 +7532,27 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7554,12 +7565,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -7568,8 +7581,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7582,7 +7595,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/types.h>
 #include <sys/wait.h>
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
 #endif
 #ifndef WIFEXITED
 # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
@@ -7599,38 +7612,34 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_sys_wait_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_sys_wait_h=no
+	ac_cv_header_sys_wait_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -7639,8 +7648,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7664,38 +7673,34 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_time=no
+	ac_cv_header_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+echo "${ECHO_T}$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -7722,24 +7727,27 @@ fi
 
 
 
-for ac_header in fcntl.h limits.h locale.h libintl.h mcheck.h \
-	netdb.h netinet/in.h  signum.h stdarg.h string.h \
+
+
+for ac_header in arpa/inet.h fcntl.h limits.h locale.h libintl.h mcheck.h \
+	netdb.h netinet/in.h  signum.h stdarg.h stddef.h string.h \
 	sys/param.h sys/socket.h sys/time.h unistd.h \
 	termios.h stropts.h wchar.h wctype.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7750,41 +7758,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7793,24 +7797,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -7818,9 +7820,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -7844,25 +7847,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to bug-gawk@gnu.org ##
 ## ------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -7881,18 +7883,19 @@ then
 for ac_header in memory.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7903,41 +7906,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7946,24 +7945,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -7971,9 +7968,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -7997,25 +7995,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to bug-gawk@gnu.org ##
 ## ------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -8032,18 +8029,19 @@ else
 for ac_header in strings.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8054,41 +8052,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8097,24 +8091,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -8122,9 +8114,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -8148,25 +8141,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to bug-gawk@gnu.org ##
 ## ------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -8180,8 +8172,8 @@ done
 
 fi
 
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for pid_t" >&5
+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8192,50 +8184,47 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef pid_t ac__type_new_;
 int
 main ()
 {
-if ((pid_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (pid_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_pid_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_pid_t=no
+	ac_cv_type_pid_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
 if test $ac_cv_type_pid_t = yes; then
   :
 else
@@ -8246,8 +8235,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8259,64 +8248,52 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
 
 int
 main ()
 {
-int i;
+return *(signal (0, 0)) (0) == 1;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_signal=void
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_signal=int
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_signal=int
+	ac_cv_type_signal=void
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8327,62 +8304,59 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((size_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (size_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_size_t=no
+	ac_cv_type_size_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 if test $ac_cv_type_size_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8404,8 +8378,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -8419,8 +8393,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
-echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
+echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6; }
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8434,7 +8408,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* Thanks to Mike Rendell for this test.  */
-#include <sys/types.h>
+$ac_includes_default
 #define NGID 256
 #undef MAX
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
@@ -8444,7 +8418,7 @@ main ()
 {
   gid_t gidset[NGID];
   int i, n;
-  union { gid_t gval; long lval; }  val;
+  union { gid_t gval; long int lval; }  val;
 
   val.lval = -1;
   for (i = 0; i < NGID; i++)
@@ -8452,18 +8426,28 @@ main ()
   n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
 		 gidset);
   /* Exit non-zero if getgroups seems to require an array of ints.  This
-     happens when gid_t is short but getgroups modifies an array of ints.  */
-  exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
+     happens when gid_t is short int but getgroups modifies an array
+     of ints.  */
+  return n > 0 && gidset[n] != val.gval;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8476,8 +8460,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_type_getgroups=int
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8498,8 +8484,8 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
-echo "${ECHO_T}$ac_cv_type_getgroups" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
+echo "${ECHO_T}$ac_cv_type_getgroups" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define GETGROUPS_T $ac_cv_type_getgroups
@@ -8507,9 +8493,9 @@ _ACEOF
 
 
 
-  echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
+  { echo "$as_me:$LINENO: checking for long long int" >&5
+echo $ECHO_N "checking for long long int... $ECHO_C" >&6; }
+if test "${ac_cv_type_long_long_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -8518,50 +8504,64 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-long long ll = 1LL; int i = 63;
+long long int ll = 9223372036854775807ll;
+	    long long int nll = -9223372036854775807LL;
+	    typedef int a[((-9223372036854775807LL < 0
+			    && 0 < 9223372036854775807ll)
+			   ? 1 : -1)];
+	    int i = 63;
 int
 main ()
 {
-long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;
+long long int llmax = 9223372036854775807ll;
+	    return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+		    | (llmax / ll) | (llmax % ll));
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_type_long_long_int=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_long_long=no
+	ac_cv_type_long_long_int=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
+echo "${ECHO_T}$ac_cv_type_long_long_int" >&6; }
+  if test $ac_cv_type_long_long_int = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_LONG_INT 1
+_ACEOF
+
+  fi
+
+
+
+  ac_cv_type_long_long=$ac_cv_type_long_long_int
   if test $ac_cv_type_long_long = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -8571,9 +8571,9 @@ _ACEOF
   fi
 
 
-  echo "$as_me:$LINENO: checking for unsigned long long" >&5
-echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_long_long+set}" = set; then
+  { echo "$as_me:$LINENO: checking for unsigned long long int" >&5
+echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6; }
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -8582,50 +8582,62 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-unsigned long long ull = 1ULL; int i = 63;
+unsigned long long int ull = 18446744073709551615ULL;
+	    typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
+			   ? 1 : -1)];
+	   int i = 63;
 int
 main ()
 {
-unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;
+unsigned long long int ullmax = 18446744073709551615ull;
+	    return (ull << 63 | ull >> 63 | ull << i | ull >> i
+		    | ullmax / ull | ullmax % ull);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_unsigned_long_long=yes
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_type_unsigned_long_long_int=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_unsigned_long_long=no
+	ac_cv_type_unsigned_long_long_int=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6; }
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+_ACEOF
+
+  fi
+
+
+
+  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
   if test $ac_cv_type_unsigned_long_long = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -8635,8 +8647,8 @@ _ACEOF
   fi
 
 
-  echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for inttypes.h" >&5
+echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
 if test "${gl_cv_header_inttypes_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8651,44 +8663,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-uintmax_t i = (uintmax_t) -1;
+uintmax_t i = (uintmax_t) -1; return !i;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_header_inttypes_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gl_cv_header_inttypes_h=no
+	gl_cv_header_inttypes_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6
+{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
+echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; }
   if test $gl_cv_header_inttypes_h = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -8698,8 +8706,8 @@ _ACEOF
   fi
 
 
-  echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for stdint.h" >&5
+echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
 if test "${gl_cv_header_stdint_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8714,44 +8722,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-uintmax_t i = (uintmax_t) -1;
+uintmax_t i = (uintmax_t) -1; return !i;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_header_stdint_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gl_cv_header_stdint_h=no
+	gl_cv_header_stdint_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
-echo "${ECHO_T}$gl_cv_header_stdint_h" >&6
+{ echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
+echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; }
   if test $gl_cv_header_stdint_h = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -8802,8 +8806,8 @@ _ACEOF
 
   fi
 
-echo "$as_me:$LINENO: checking for ssize_t" >&5
-echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ssize_t" >&5
+echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8814,50 +8818,47 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef ssize_t ac__type_new_;
 int
 main ()
 {
-if ((ssize_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (ssize_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_ssize_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_ssize_t=no
+	ac_cv_type_ssize_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
 if test $ac_cv_type_ssize_t = yes; then
   :
 else
@@ -8868,8 +8869,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for unsigned int" >&5
-echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for unsigned int" >&5
+echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6; }
 if test "${ac_cv_type_unsigned_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8880,61 +8881,57 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef unsigned int ac__type_new_;
 int
 main ()
 {
-if ((unsigned int *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (unsigned int))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_unsigned_int=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_unsigned_int=no
+	ac_cv_type_unsigned_int=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6; }
 
-echo "$as_me:$LINENO: checking size of unsigned int" >&5
-echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of unsigned int" >&5
+echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_unsigned_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_unsigned_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -8944,10 +8941,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -8955,27 +8953,22 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -8985,10 +8978,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -8996,56 +8990,53 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -9053,27 +9044,22 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -9083,10 +9069,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -9094,50 +9081,48 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+	ac_lo= ac_hi=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -9148,10 +9133,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -9159,52 +9145,45 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_unsigned_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77
+'') if test "$ac_cv_type_unsigned_int" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned int), 77
+echo "$as_me: error: cannot compute sizeof (unsigned int)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_unsigned_int=0
+   fi ;;
 esac
 else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9212,8 +9191,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-long longval () { return (long) (sizeof (unsigned int)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned int)); }
+   typedef unsigned int ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -9222,35 +9202,44 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
-    exit (1);
-  if (((long) (sizeof (unsigned int))) < 0)
+    return 1;
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
-      long i = longval ();
-      if (i != ((long) (sizeof (unsigned int))))
-	exit (1);
+      long int i = longval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%ld\n", i);
     }
   else
     {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (unsigned int))))
-	exit (1);
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%lu\n", i);
     }
-  exit (ferror (f) || fclose (f) != 0);
+  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9261,29 +9250,32 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77
+if test "$ac_cv_type_unsigned_int" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned int), 77
+echo "$as_me: error: cannot compute sizeof (unsigned int)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_unsigned_int=0
+   fi
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_unsigned_int=0
-fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking for unsigned long" >&5
-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for unsigned long" >&5
+echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
 if test "${ac_cv_type_unsigned_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9294,61 +9286,57 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef unsigned long ac__type_new_;
 int
 main ()
 {
-if ((unsigned long *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (unsigned long))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_unsigned_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_unsigned_long=no
+	ac_cv_type_unsigned_long=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
 
-echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_unsigned_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -9358,10 +9346,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -9369,27 +9358,22 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -9399,10 +9383,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -9410,56 +9395,53 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -9467,27 +9449,22 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -9497,10 +9474,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -9508,50 +9486,48 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+	ac_lo= ac_hi=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -9562,10 +9538,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -9573,52 +9550,45 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
+'') if test "$ac_cv_type_unsigned_long" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+echo "$as_me: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_unsigned_long=0
+   fi ;;
 esac
 else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9626,8 +9596,9 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-long longval () { return (long) (sizeof (unsigned long)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
+   typedef unsigned long ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -9636,35 +9607,44 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
-    exit (1);
-  if (((long) (sizeof (unsigned long))) < 0)
+    return 1;
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
-      long i = longval ();
-      if (i != ((long) (sizeof (unsigned long))))
-	exit (1);
+      long int i = longval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%ld\n", i);
     }
   else
     {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (unsigned long))))
-	exit (1);
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%lu\n", i);
     }
-  exit (ferror (f) || fclose (f) != 0);
+  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9675,22 +9655,25 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
+if test "$ac_cv_type_unsigned_long" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+echo "$as_me: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_unsigned_long=0
+   fi
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_unsigned_long=0
-fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
 _ACEOF
@@ -9739,27 +9722,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
 cat >>confdefs.h <<\_ACEOF
 #define TIME_T_IN_SYS_TYPES_H 1
@@ -9769,8 +9747,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9790,27 +9770,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_WCTYPE_T 1
@@ -9820,8 +9795,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9841,46 +9818,91 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WINT_T 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/socket.h>
+int
+main ()
+{
+
+	struct sockaddr_storage foo;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINT_T 1
+#define HAVE_SOCKADDR_STORAGE 1
 _ACEOF
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
 
 
 
-   echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+   { echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9893,56 +9915,53 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/types.h>
 #include <sys/socket.h>
 
+typedef socklen_t ac__type_new_;
 int
 main ()
 {
-if ((socklen_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (socklen_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_socklen_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_socklen_t=no
+	ac_cv_type_socklen_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
-echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
 if test $ac_cv_type_socklen_t = yes; then
   :
 else
 
-      echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5
-echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5
+echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6; }
       if test "${rsync_cv_socklen_t_equiv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9976,27 +9995,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
                   rsync_cv_socklen_t_equiv="$t"
                   break
@@ -10005,8 +10019,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             done
          done
 
@@ -10016,8 +10032,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-      echo "$as_me:$LINENO: result: $rsync_cv_socklen_t_equiv" >&5
-echo "${ECHO_T}$rsync_cv_socklen_t_equiv" >&6
+      { echo "$as_me:$LINENO: result: $rsync_cv_socklen_t_equiv" >&5
+echo "${ECHO_T}$rsync_cv_socklen_t_equiv" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define socklen_t $rsync_cv_socklen_t_equiv
@@ -10031,9 +10047,9 @@ fi
 for ac_func in vprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -10059,75 +10075,67 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
-echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for _doprnt" >&5
+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
 if test "${ac_cv_func__doprnt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10154,68 +10162,59 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef _doprnt
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char _doprnt ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub__doprnt) || defined (__stub____doprnt)
+#if defined __stub__doprnt || defined __stub____doprnt
 choke me
-#else
-char (*f) () = _doprnt;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != _doprnt;
+return _doprnt ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func__doprnt=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func__doprnt=no
+	ac_cv_func__doprnt=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
+echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
 if test $ac_cv_func__doprnt = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -10230,21 +10229,24 @@ done
 
 
 
-for ac_header in stdlib.h
+
+
+for ac_header in $ac_header_list
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10255,41 +10257,37 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10298,24 +10296,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10323,9 +10319,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -10349,25 +10346,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to bug-gawk@gnu.org ##
 ## ------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -10380,12 +10376,19 @@ fi
 done
 
 
-for ac_func in strtod
+
+
+
+
+
+
+
+for ac_func in $ac_func_list
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -10411,68 +10414,60 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -10481,333 +10476,24 @@ _ACEOF
 fi
 done
 
-echo "$as_me:$LINENO: checking for strtod with C89 semantics" >&5
-echo $ECHO_N "checking for strtod with C89 semantics... $ECHO_C" >&6
-if test "${gawk_ac_cv_func_strtod_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  gawk_ac_cv_func_strtod_c89=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Test program from Arnold Robbins (arnold@skeeve.com) */
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#else
-extern double strtod();
-#endif
-
-int
-main ()
-{
-#if ! HAVE_STRTOD
-  exit(1);
-#else
-  double d;
-  char *str = "0x345a";
-
-  d = strtod(str, 0);
-  if (d == 0)
-     exit (0);
-  else
-     exit (1);
-#endif
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gawk_ac_cv_func_strtod_c89=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gawk_ac_cv_func_strtod_c89=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $gawk_ac_cv_func_strtod_c89" >&5
-echo "${ECHO_T}$gawk_ac_cv_func_strtod_c89" >&6
-if test $gawk_ac_cv_func_strtod_c89 = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STRTOD_NOT_C89 1
-_ACEOF
-
-fi
-
-
-
 
-for ac_header in stdlib.h sys/time.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------- ##
-## Report this to bug-gawk@gnu.org ##
-## ------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
 
-done
 
 
-for ac_func in alarm
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
 
-#undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
 
-fi
-done
 
-echo "$as_me:$LINENO: checking for working mktime" >&5
-echo $ECHO_N "checking for working mktime... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for working mktime" >&5
+echo $ECHO_N "checking for working mktime... $ECHO_C" >&6; }
 if test "${ac_cv_func_working_mktime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10821,26 +10507,24 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* Test program from Paul Eggert and Tony Leneis.  */
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
 #else
-# if HAVE_SYS_TIME_H
+# ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 # else
 #  include <time.h>
 # endif
 #endif
 
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
-#if !HAVE_ALARM
+#ifndef HAVE_ALARM
 # define alarm(X) /* empty */
 #endif
 
@@ -10857,9 +10541,9 @@ static char *tz_strings[] = {
 };
 #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
 
-/* Fail if mktime fails to convert a date in the spring-forward gap.
+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
    Based on a problem report from Andreas Jaeger.  */
-static void
+static int
 spring_forward_gap ()
 {
   /* glibc (up to about 1998-10-07) failed this test. */
@@ -10878,29 +10562,27 @@ spring_forward_gap ()
   tm.tm_min = 0;
   tm.tm_sec = 0;
   tm.tm_isdst = -1;
-  if (mktime (&tm) == (time_t)-1)
-    exit (1);
+  return mktime (&tm) != (time_t) -1;
 }
 
-static void
+static int
 mktime_test1 (now)
      time_t now;
 {
   struct tm *lt;
-  if ((lt = localtime (&now)) && mktime (lt) != now)
-    exit (1);
+  return ! (lt = localtime (&now)) || mktime (lt) == now;
 }
 
-static void
+static int
 mktime_test (now)
      time_t now;
 {
-  mktime_test1 (now);
-  mktime_test1 ((time_t) (time_t_max - now));
-  mktime_test1 ((time_t) (time_t_min + now));
+  return (mktime_test1 (now)
+	  && mktime_test1 ((time_t) (time_t_max - now))
+	  && mktime_test1 ((time_t) (time_t_min + now)));
 }
 
-static void
+static int
 irix_6_4_bug ()
 {
   /* Based on code from Ariel Faigon.  */
@@ -10913,11 +10595,10 @@ irix_6_4_bug ()
   tm.tm_sec = 0;
   tm.tm_isdst = -1;
   mktime (&tm);
-  if (tm.tm_mon != 2 || tm.tm_mday != 31)
-    exit (1);
+  return tm.tm_mon == 2 && tm.tm_mday == 31;
 }
 
-static void
+static int
 bigtime_test (j)
      int j;
 {
@@ -10939,8 +10620,39 @@ bigtime_test (j)
 	     && lt->tm_wday == tm.tm_wday
 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
-	exit (1);
+	return 0;
     }
+  return 1;
+}
+
+static int
+year_2050_test ()
+{
+  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
+     ignoring leap seconds.  */
+  unsigned long int answer = 2527315200UL;
+
+  struct tm tm;
+  time_t t;
+  tm.tm_year = 2050 - 1900;
+  tm.tm_mon = 2 - 1;
+  tm.tm_mday = 1;
+  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
+  tm.tm_isdst = -1;
+
+  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
+     instead of "TZ=America/Vancouver" in order to detect the bug even
+     on systems that don't support the Olson extension, or don't have the
+     full zoneinfo tables installed.  */
+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+
+  t = mktime (&tm);
+
+  /* Check that the result is either a failure, or close enough
+     to the correct answer that we can assume the discrepancy is
+     due to leap seconds.  */
+  return (t == (time_t) -1
+	  || (0 < t && answer - 120 <= t && t <= answer + 120));
 }
 
 int
@@ -10967,28 +10679,39 @@ main ()
 	putenv (tz_strings[i]);
 
       for (t = 0; t <= time_t_max - delta; t += delta)
-	mktime_test (t);
-      mktime_test ((time_t) 1);
-      mktime_test ((time_t) (60 * 60));
-      mktime_test ((time_t) (60 * 60 * 24));
+	if (! mktime_test (t))
+	  return 1;
+      if (! (mktime_test ((time_t) 1)
+	     && mktime_test ((time_t) (60 * 60))
+	     && mktime_test ((time_t) (60 * 60 * 24))))
+	return 1;
 
       for (j = 1; 0 < j; j *= 2)
-	bigtime_test (j);
-      bigtime_test (j - 1);
+	if (! bigtime_test (j))
+	  return 1;
+      if (! bigtime_test (j - 1))
+	return 1;
     }
-  irix_6_4_bug ();
-  spring_forward_gap ();
-  exit (0);
+  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11001,18 +10724,18 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_func_working_mktime=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5
-echo "${ECHO_T}$ac_cv_func_working_mktime" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5
+echo "${ECHO_T}$ac_cv_func_working_mktime" >&6; }
 if test $ac_cv_func_working_mktime = no; then
-  case $LIBOBJS in
-    "mktime.$ac_objext"   | \
-  *" mktime.$ac_objext"   | \
-    "mktime.$ac_objext "* | \
+  case " $LIBOBJS " in
   *" mktime.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mktime.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS mktime.$ac_objext"
+ ;;
 esac
 
 fi
@@ -11026,9 +10749,169 @@ _ACEOF
 	;;
 esac
 
+{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5
+echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }
+if test "${ac_cv_func_getaddrinfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define getaddrinfo innocuous_getaddrinfo
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char getaddrinfo (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef getaddrinfo
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getaddrinfo ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_getaddrinfo || defined __stub___getaddrinfo
+choke me
+#endif
+
+int
+main ()
+{
+return getaddrinfo ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_func_getaddrinfo=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_getaddrinfo=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
+echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; }
+if test $ac_cv_func_getaddrinfo = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETADDRINFO 1
+_ACEOF
+
+else
+  { echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5
+echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6; }
+if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getaddrinfo ();
+int
+main ()
+{
+return getaddrinfo ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_socket_getaddrinfo=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_socket_getaddrinfo=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6; }
+if test $ac_cv_lib_socket_getaddrinfo = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETADDRINFO 1
+_ACEOF
+
+fi
+
+fi
+
+
 
-echo "$as_me:$LINENO: checking for fmod in -lm" >&5
-echo $ECHO_N "checking for fmod in -lm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for fmod in -lm" >&5
+echo $ECHO_N "checking for fmod in -lm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_m_fmod+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11041,56 +10924,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char fmod ();
 int
 main ()
 {
-fmod ();
+return fmod ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_fmod=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_m_fmod=no
+	ac_cv_lib_m_fmod=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_fmod" >&5
-echo "${ECHO_T}$ac_cv_lib_m_fmod" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_fmod" >&5
+echo "${ECHO_T}$ac_cv_lib_m_fmod" >&6; }
 if test $ac_cv_lib_m_fmod = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -11101,6 +10981,11 @@ _ACEOF
 fi
 
 
+# Need the check for mkstemp and tmpfile for missing_d/snprintf.c.
+
+
+
+
 
 
 
@@ -11130,17 +11015,20 @@ fi
 
 
 
-for ac_func in fmod getgrent getgroups grantpt iswctype mbrlen \
-	memcmp memcpy memmove memset setlocale snprintf strchr \
-	strerror strftime strncasecmp strtod strtoul system tzset \
-	isascii btowc \
-	iswlower iswupper towlower towupper \
-	wcrtomb wcscoll wcscoll wctype
+
+
+for ac_func in atexit btowc fmod getgrent getgroups grantpt \
+	isascii iswctype iswlower iswupper mbrlen \
+	memcmp memcpy memcpy_ulong memmove memset \
+	memset_ulong mkstemp setlocale snprintf strchr \
+	strerror strftime strncasecmp strtod strtoul \
+	system tmpfile towlower towupper tzset wcrtomb \
+	wcscoll wcscoll wctype
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -11166,68 +11054,60 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -11237,8 +11117,8 @@ fi
 done
 
 
-  echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
-echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
+echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6; }
 if test "${ac_cv_func_mbrtowc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11252,45 +11132,46 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-mbstate_t state; return ! (sizeof state && mbrtowc);
+wchar_t wc;
+	      char const s[] = "";
+	      size_t n = 1;
+	      mbstate_t state;
+	      return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_mbrtowc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_mbrtowc=no
+	ac_cv_func_mbrtowc=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mbrtowc" >&5
-echo "${ECHO_T}$ac_cv_func_mbrtowc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_mbrtowc" >&5
+echo "${ECHO_T}$ac_cv_func_mbrtowc" >&6; }
   if test $ac_cv_func_mbrtowc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -11301,17 +11182,17 @@ _ACEOF
 
 
 if test "${ac_cv_header_dlfcn_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for dlfcn.h" >&5
-echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dlfcn.h" >&5
+echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_dlfcn_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
-echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
+echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking dlfcn.h usability" >&5
-echo $ECHO_N "checking dlfcn.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dlfcn.h usability" >&5
+echo $ECHO_N "checking dlfcn.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11322,41 +11203,37 @@ $ac_includes_default
 #include <dlfcn.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking dlfcn.h presence" >&5
-echo $ECHO_N "checking dlfcn.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dlfcn.h presence" >&5
+echo $ECHO_N "checking dlfcn.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11365,24 +11242,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <dlfcn.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11390,9 +11265,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -11416,25 +11292,23 @@ echo "$as_me: WARNING: dlfcn.h:     section \"Present But Cannot Be Compiled\""
 echo "$as_me: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to bug-gawk@gnu.org ##
 ## ------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for dlfcn.h" >&5
-echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for dlfcn.h" >&5
+echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_dlfcn_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_dlfcn_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
-echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
+echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6; }
 
 fi
 if test $ac_cv_header_dlfcn_h = yes; then
@@ -11455,14 +11329,13 @@ _ACEOF
 
 	# Check this separately. Some systems have dlopen
 	# in libc. Notably freebsd and cygwin.
-
-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+	# HP-NSK has it in zrldsrl
+	{ echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
+if test "${ac_cv_search_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11470,62 +11343,73 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+for ac_lib in '' dl zrldsrl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_search_dlopen=$ac_res
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
 
-  LIBS="-ldl $LIBS"
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_dlopen+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_dlopen+set}" = set; then
+  :
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+echo "${ECHO_T}$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
@@ -11542,8 +11426,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 	;;
-*)	echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
-echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6
+*)	{ echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
+echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6; }
 if test "${ac_cv_func_getpgrp_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11564,39 +11448,35 @@ getpgrp (0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_func_getpgrp_void=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_getpgrp_void=yes
+	ac_cv_func_getpgrp_void=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
-echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
+echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6; }
 if test $ac_cv_func_getpgrp_void = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -11608,8 +11488,8 @@ fi
 	;;
 esac
 
-echo "$as_me:$LINENO: checking for printf %F format" >&5
-echo $ECHO_N "checking for printf %F format... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for printf %F format" >&5
+echo $ECHO_N "checking for printf %F format... $ECHO_C" >&6; }
 if test "$cross_compiling" = yes; then
   has_f_format=no
 else
@@ -11631,13 +11511,22 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11650,8 +11539,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 has_f_format=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 if test "$has_f_format" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -11659,8 +11550,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-echo "$as_me:$LINENO: result: $has_f_format" >&5
-echo "${ECHO_T}$has_f_format" >&6
+{ echo "$as_me:$LINENO: result: $has_f_format" >&5
+echo "${ECHO_T}$has_f_format" >&6; }
 
 
 gawk_have_sockets=no
@@ -11687,8 +11578,8 @@ else
   # needs -lnsl.
   # The nsl library prevents programs from opening the X display
   # on Irix 5.2, according to dickey@clark.net.
-  echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11715,72 +11606,63 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef gethostbyname
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+#if defined __stub_gethostbyname || defined __stub___gethostbyname
 choke me
-#else
-char (*f) () = gethostbyname;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != gethostbyname;
+return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_gethostbyname=no
+	ac_cv_func_gethostbyname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
 
   if test $ac_cv_func_gethostbyname = no; then
-    echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11793,56 +11675,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
 main ()
 {
-gethostbyname ();
+return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_nsl_gethostbyname=no
+	ac_cv_lib_nsl_gethostbyname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   SOCKET_LIBS="$SOCKET_LIBS -lnsl"
 fi
@@ -11856,8 +11735,8 @@ fi
   # gethostby* variants that don't use the nameserver (or something).
   # -lsocket must be given before -lnsl if both are needed.
   # We assume that if connect needs -lnsl, so does gethostbyname.
-  echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11884,72 +11763,63 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef connect
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char connect ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_connect) || defined (__stub___connect)
+#if defined __stub_connect || defined __stub___connect
 choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != connect;
+return connect ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_connect=no
+	ac_cv_func_connect=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
 
   if test $ac_cv_func_connect = no; then
-    echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11962,56 +11832,53 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char connect ();
 int
 main ()
 {
-connect ();
+return connect ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_socket_connect=no
+	ac_cv_lib_socket_connect=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
 if test $ac_cv_lib_socket_connect = yes; then
   SOCKET_LIBS="-lsocket $SOCKET_LIBS"
     				  gawk_have_sockets=yes
@@ -12024,14 +11891,14 @@ fi
 
 if test "${gawk_have_sockets}" = "yes"
 then
-	echo "$as_me:$LINENO: checking where to find the socket library calls" >&5
-echo $ECHO_N "checking where to find the socket library calls... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking where to find the socket library calls" >&5
+echo $ECHO_N "checking where to find the socket library calls... $ECHO_C" >&6; }
 	case "${SOCKET_LIBS}" in
 	?*)	gawk_lib_loc="${SOCKET_LIBS}" ;;
 	*)	gawk_lib_loc="the standard library" ;;
 	esac
-	echo "$as_me:$LINENO: result: ${gawk_lib_loc}" >&5
-echo "${ECHO_T}${gawk_lib_loc}" >&6
+	{ echo "$as_me:$LINENO: result: ${gawk_lib_loc}" >&5
+echo "${ECHO_T}${gawk_lib_loc}" >&6; }
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -12041,9 +11908,8 @@ _ACEOF
 fi
 
 
-
-echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
-echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
+echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12065,33 +11931,28 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12109,40 +11970,37 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_member_struct_stat_st_blksize=no
+	ac_cv_member_struct_stat_st_blksize=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; }
 if test $ac_cv_member_struct_stat_st_blksize = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -12157,8 +12015,8 @@ _ACEOF
 fi
 
 
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12182,38 +12040,34 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_time=no
+	ac_cv_header_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+echo "${ECHO_T}$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -12222,8 +12076,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12239,44 +12093,42 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-struct tm *tp; tp->tm_sec;
+struct tm tm;
+				     int *p = &tm.tm_sec;
+ 				     return !p;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_struct_tm=time.h
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_struct_tm=sys/time.h
+	ac_cv_struct_tm=sys/time.h
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -12285,8 +12137,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
+echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
 if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12311,33 +12163,28 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12358,40 +12205,37 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_member_struct_tm_tm_zone=no
+	ac_cv_member_struct_tm_tm_zone=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
+echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
 if test $ac_cv_member_struct_tm_tm_zone = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -12408,8 +12252,77 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
-  echo "$as_me:$LINENO: checking for tzname" >&5
-echo $ECHO_N "checking for tzname... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
+echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_tzname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <time.h>
+
+int
+main ()
+{
+#ifndef tzname
+  (void) tzname;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_tzname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_tzname=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
+echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
+if test $ac_cv_have_decl_tzname = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME 0
+_ACEOF
+
+
+fi
+
+
+  { echo "$as_me:$LINENO: checking for tzname" >&5
+echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
 if test "${ac_cv_var_tzname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12420,52 +12333,49 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <time.h>
-#ifndef tzname /* For SGI.  */
-extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
+#if !HAVE_DECL_TZNAME
+extern char *tzname[];
 #endif
 
 int
 main ()
 {
-atoi(*tzname);
+return tzname[0][0];
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_var_tzname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_var_tzname=no
+	ac_cv_var_tzname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-echo "${ECHO_T}$ac_cv_var_tzname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
+echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
   if test $ac_cv_var_tzname = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -12477,8 +12387,8 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking whether char is unsigned" >&5
-echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
+echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
 if test "${ac_cv_c_char_unsigned+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12500,38 +12410,34 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_char_unsigned=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_c_char_unsigned=yes
+	ac_cv_c_char_unsigned=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
-echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
+echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6; }
 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
   cat >>confdefs.h <<\_ACEOF
 #define __CHAR_UNSIGNED__ 1
@@ -12539,8 +12445,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12558,10 +12464,10 @@ main ()
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  char const *const *pcpcc;
+  char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
@@ -12570,16 +12476,17 @@ main ()
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
+    if (s) return 0;
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
@@ -12598,7 +12505,9 @@ main ()
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
+    if (!foo) return 0;
   }
+  return !cs[0] && !zero.x;
 #endif
 
   ;
@@ -12606,38 +12515,34 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_c_const=no
+	ac_cv_c_const=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -12646,8 +12551,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
-echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
+echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6; }
 if test "${ac_cv_c_restrict+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12661,42 +12566,53 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-float * $ac_kw x;
+typedef int * int_ptr;
+        int foo (int_ptr $ac_kw ip) {
+        return ip[0];
+       }
+int
+main ()
+{
+int s[1];
+        int * $ac_kw t = s;
+        t[0] = 0;
+        return foo(t)
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_restrict=$ac_kw; break
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_restrict=$ac_kw
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     test "$ac_cv_c_restrict" != no && break
    done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
-echo "${ECHO_T}$ac_cv_c_restrict" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
+echo "${ECHO_T}$ac_cv_c_restrict" >&6; }
  case $ac_cv_c_restrict in
    restrict) ;;
    no)
@@ -12710,8 +12626,8 @@ _ACEOF
  ;;
  esac
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12731,39 +12647,37 @@ $ac_kw foo_t foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_inline=$ac_kw
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
 
 
 case $ac_cv_c_inline in
@@ -12781,8 +12695,8 @@ _ACEOF
     ;;
 esac
 
-echo "$as_me:$LINENO: checking for preprocessor stringizing operator" >&5
-echo $ECHO_N "checking for preprocessor stringizing operator... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for preprocessor stringizing operator" >&5
+echo $ECHO_N "checking for preprocessor stringizing operator... $ECHO_C" >&6; }
 if test "${ac_cv_c_stringize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12805,8 +12719,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stringize" >&5
-echo "${ECHO_T}$ac_cv_c_stringize" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_stringize" >&5
+echo "${ECHO_T}$ac_cv_c_stringize" >&6; }
 if test $ac_cv_c_stringize = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -12816,20 +12730,12 @@ _ACEOF
 fi
 
 
-          ac_config_headers="$ac_config_headers config.h:configh.in"
-
-
-
-
-                                                            ac_config_files="$ac_config_files Makefile awklib/Makefile doc/Makefile po/Makefile.in test/Makefile version.c:version.in"
-
-
-
-
+ac_config_headers="$ac_config_headers config.h:configh.in"
 
 
 
 
+ac_config_files="$ac_config_files Makefile awklib/Makefile doc/Makefile po/Makefile.in test/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12849,39 +12755,58 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -12890,32 +12815,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -12936,13 +12847,6 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -12967,17 +12871,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -12987,8 +12919,43 @@ else
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -13002,18 +12969,19 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -13021,159 +12989,120 @@ fi
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
+# CDPATH.
+$as_unset CDPATH
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+  chmod +x "$as_me.lineno" ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -13182,7 +13111,28 @@ else
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -13191,31 +13141,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 exec 6>&1
 
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by GNU Awk $as_me 3.1.5, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+# values after options handling.
+ac_log="
+This file was extended by GNU Awk $as_me 3.1.6, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -13223,30 +13156,20 @@ generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+_ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
-
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -13254,7 +13177,7 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -13273,19 +13196,22 @@ Configuration commands:
 $config_commands
 
 Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Awk config.status 3.1.5
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+GNU Awk config.status 3.1.6
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -13296,39 +13222,24 @@ while test $# != 0
 do
   case $1 in
   --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  -*)
+  *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
@@ -13338,18 +13249,24 @@ Try \`$0 --help' for more information." >&2;}
     $ac_shift
     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
+  -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
@@ -13365,21 +13282,32 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
+  export CONFIG_SHELL
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  echo "$ac_log"
+} >&5
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 #
-# INIT-COMMANDS section.
+# INIT-COMMANDS
 #
-
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
+    # from automake < 1.5.
     eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
@@ -13387,28 +13315,28 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 _ACEOF
 
-
-
 cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "awklib/Makefile" ) CONFIG_FILES="$CONFIG_FILES awklib/Makefile" ;;
-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
-  "version.c" ) CONFIG_FILES="$CONFIG_FILES version.c:version.in" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:configh.in" ;;
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:configh.in" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "awklib/Makefile") CONFIG_FILES="$CONFIG_FILES awklib/Makefile" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
 
+
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -13420,603 +13348,602 @@ if $ac_need_defaults; then
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
   trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
 } ||
 {
    echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
 #
-# CONFIG_FILES section.
+# Set up the sed scripts for CONFIG_FILES section.
 #
 
 # No need to generate the scripts if there are no CONFIG_FILES.
 # This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@EGREP@,$EGREP,;t t
-s,@YACC@,$YACC,;t t
-s,@LN_S@,$LN_S,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@CPP@,$CPP,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@U@,$U,;t t
-s,@ANSI2KNR@,$ANSI2KNR,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@MSGMERGE@,$MSGMERGE,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
-s,@LIBICONV@,$LIBICONV,;t t
-s,@LTLIBICONV@,$LTLIBICONV,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
-s,@LTLIBINTL@,$LTLIBINTL,;t t
-s,@POSUB@,$POSUB,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@SOCKET_LIBS@,$SOCKET_LIBS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
+if test -n "$CONFIG_FILES"; then
+
+_ACEOF
+
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+YACC!$YACC$ac_delim
+YFLAGS!$YFLAGS$ac_delim
+LN_S!$LN_S$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+CPP!$CPP$ac_delim
+RANLIB!$RANLIB$ac_delim
+U!$U$ac_delim
+ANSI2KNR!$ANSI2KNR$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+MSGFMT_015!$MSGFMT_015$ac_delim
+GMSGFMT_015!$GMSGFMT_015$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+XGETTEXT_015!$XGETTEXT_015$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
-fi # test -n "$CONFIG_FILES"
+done
 
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
+LIBICONV!$LIBICONV$ac_delim
+LTLIBICONV!$LTLIBICONV$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
+LIBINTL!$LIBINTL$ac_delim
+LTLIBINTL!$LTLIBINTL$ac_delim
+POSUB!$POSUB$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+SOCKET_LIBS!$SOCKET_LIBS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
 cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      ac_file_inputs="$ac_file_inputs $ac_f"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    fi
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin";;
+    esac
+    ;;
   esac
 
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
   ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
 
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
 $extrasub
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
   case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
   esac
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+_ACEOF
 
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
 do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
   rm -f conftest.defines
   mv conftest.tail conftest.defines
 done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
 
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
 cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
   if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
       rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
+  rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
 _am_stamp_count=1
 for _am_header in $config_headers :; do
@@ -14027,135 +13954,39 @@ for _am_header in $config_headers :; do
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
 $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X$ac_file : 'X\(//\)[^/]' \| \
 	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
 echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
 
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.
@@ -14163,20 +13994,32 @@ echo "$as_me: executing $ac_dest commands" >&6;}
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+    dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   else
     continue
   fi
@@ -14198,49 +14041,76 @@ echo X"$mf" |
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
+    fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
   done
 done
  ;;
-    default-1 )
+    "po-directories":C)
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
@@ -14277,11 +14147,12 @@ done
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -14352,23 +14223,16 @@ done
         ;;
       esac
     done ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-sed '$i\
-	echo $as_me: fixing Makefile to keep version.c\
-	sed "/CONFIG_CLEAN_FILES/s/version.c//" < Makefile > $$.Makefile\
-	mv $$.Makefile Makefile
-	' < $CONFIG_STATUS > $$.gawk-hack
-	mv $$.gawk-hack $CONFIG_STATUS
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
diff --git a/configure.ac b/configure.ac
index ee5a487c..9a66858c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,14 @@
 dnl
 dnl configure.ac --- autoconf input file for gawk
 dnl
-dnl Copyright (C) 1995-2005 the Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2007 the Free Software Foundation, Inc.
 dnl
 dnl This file is part of GAWK, the GNU implementation of the
 dnl AWK Programming Language.
 dnl
 dnl GAWK is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
+dnl the Free Software Foundation; either version 3 of the License, or
 dnl (at your option) any later version.
 dnl
 dnl GAWK is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([GNU Awk], 3.1.5, bug-gawk@gnu.org, gawk)
+AC_INIT([GNU Awk], 3.1.6, bug-gawk@gnu.org, gawk)
 
 # This is a hack. Different versions of install on different systems
 # are just too different. Chuck it and use install-sh.
@@ -39,8 +39,9 @@ then
 	export INSTALL
 fi
 
-AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE
+AC_PREREQ(2.61)
+AM_INIT_AUTOMAKE([1.10])
+
 
 dnl Additional argument stuff
 AC_ARG_ENABLE(portals, [  --enable-portals	Enable /p as path prefix for portals],
@@ -68,6 +69,12 @@ AC_ARG_ENABLE(switch, [  --enable-switch	Enable switch statements for awk progra
 		AC_DEFINE(ALLOW_SWITCH, 1, [switch statements are enabled in awk programs])
 	fi
 )
+AC_ARG_ENABLE([directories-fatal], [  --disable-directories-fatal	Disable fatal errors on directories],
+	if test "$enableval" = no
+	then
+		AC_DEFINE(NO_DIRECTORY_FATAL, 1, [disable fatal errors on directories])
+	fi
+)
 
 dnl checks for programs
 AC_PROG_EGREP
@@ -90,7 +97,7 @@ AC_MSG_CHECKING([for special development options])
 if test -f $srcdir/.developing
 then
 	# add other debug flags as appropriate, save GAWKDEBUG for emergencies
-	CFLAGS="$CFLAGS -DARRAYDEBUG"
+	CFLAGS="$CFLAGS -DARRAYDEBUG -DYYDEBUG"
 	if grep dbug $srcdir/.developing
 	then
 		CFLAGS="$CFLAGS -DDBUG"
@@ -99,7 +106,7 @@ then
 	# turn on compiler warnings if we're doing development
 	if test "$GCC" = yes
 	then
-		CFLAGS="$CFLAGS -Wall"
+		CFLAGS="$CFLAGS -Wall -fno-builtin"
 	fi
 	AC_MSG_RESULT([yes])
 else
@@ -109,9 +116,8 @@ fi
 AC_SUBST(CFLAGS)
 
 dnl checks for systems
-AC_AIX
+AC_USE_SYSTEM_EXTENSIONS
 AC_ISC_POSIX
-AC_MINIX
 AC_SYS_LARGEFILE
 GAWK_AC_AIX_TWEAK
 GAWK_AC_LINUX_ALPHA
@@ -122,8 +128,7 @@ dnl	need -D_SYSV3 for ISC
 	CFLAGS="$CFLAGS -D_SYSV3"
 fi
 
-dnl check for C compiler for automake
-AM_PROG_CC_STDC
+dnl check for C compiler for automake. Needed for dfa.h.
 AM_C_PROTOTYPES
 
 dnl Cygwin doesn't like to get libs with full paths
@@ -139,14 +144,16 @@ esac
 
 dnl initialize GNU gettext
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.14.4])
+AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_LANGINFO_CODESET
+gt_LC_MESSAGES
 
 dnl checks for header files
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
-AC_CHECK_HEADERS(fcntl.h limits.h locale.h libintl.h mcheck.h \
-	netdb.h netinet/in.h  signum.h stdarg.h string.h \
+AC_CHECK_HEADERS(arpa/inet.h fcntl.h limits.h locale.h libintl.h mcheck.h \
+	netdb.h netinet/in.h  signum.h stdarg.h stddef.h string.h \
 	sys/param.h sys/socket.h sys/time.h unistd.h \
 	termios.h stropts.h wchar.h wctype.h)
 
@@ -191,6 +198,12 @@ AC_TRY_COMPILE([#include <wctype.h>],[
 	foo = 0;
 ],
 	AC_DEFINE(HAVE_WINT_T, 1, [systems should define this type here]))
+dnl check for sockaddr_storage
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>],[
+	struct sockaddr_storage foo;
+],
+	AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [newer systems define this type here]))
 
 dnl Borrwed from rsync, thanks to to Jim Meyering.
 
@@ -244,20 +257,27 @@ TYPE_SOCKLEN_T
 
 dnl checks for functions
 AC_FUNC_VPRINTF
-GAWK_AC_FUNC_STRTOD_C89
 AC_FUNC_MKTIME
 case "$ac_cv_func_working_mktime" in
 yes)	AC_DEFINE(HAVE_MKTIME, 1, [we have the mktime function])
 	;;
 esac
 
+AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAVE_GETADDRINFO, 1, [have getaddrinfo])],
+	      [AC_CHECK_LIB(socket, getaddrinfo,
+			    [AC_DEFINE(HAVE_GETADDRINFO, 1,
+				       [have getaddrinfo])])])
+
 AC_CHECK_LIB(m, fmod)
-AC_CHECK_FUNCS(fmod getgrent getgroups grantpt iswctype mbrlen \
-	memcmp memcpy memmove memset setlocale snprintf strchr \
-	strerror strftime strncasecmp strtod strtoul system tzset \
-	isascii btowc \
-	iswlower iswupper towlower towupper \
-	wcrtomb wcscoll wcscoll wctype)
+
+# Need the check for mkstemp and tmpfile for missing_d/snprintf.c.
+AC_CHECK_FUNCS(atexit btowc fmod getgrent getgroups grantpt \
+	isascii iswctype iswlower iswupper mbrlen \
+	memcmp memcpy memcpy_ulong memmove memset \
+	memset_ulong mkstemp setlocale snprintf strchr \
+	strerror strftime strncasecmp strtod strtoul \
+	system tmpfile towlower towupper tzset wcrtomb \
+	wcscoll wcscoll wctype)
 dnl this check is for both mbrtowc and the mbstate_t type, which is good
 AC_FUNC_MBRTOWC
 
@@ -277,7 +297,8 @@ AC_CHECK_HEADER(dlfcn.h,
 
 	# Check this separately. Some systems have dlopen
 	# in libc. Notably freebsd and cygwin.
-	AC_CHECK_LIB(dl, dlopen)
+	# HP-NSK has it in zrldsrl
+	AC_SEARCH_LIBS(dlopen, dl zrldsrl)
 ])
 
 dnl check for how to use getpgrp
@@ -341,30 +362,5 @@ AC_CONFIG_FILES(Makefile
 	awklib/Makefile
 	doc/Makefile
 	po/Makefile.in
-	test/Makefile
-	[version.c:version.in])
-
-dnl This is a significant and rather ugly hack.  We want to keep
-dnl version.c from being removed upon `make distclean'.
-dnl We put the `$$' on the front for old systems with 14-char filenames.
-
-dnl At this point, `configure' has finished creating `config.status' which
-dnl actually does all the checking and configuring. `config.status' is run
-dnl by the AC_OUTPUT macro below.  This step comes in between the two: it
-dnl adds code to `config.status'.  Doing it there ensures that this step
-dnl happens *every* time `config.status' is run, such as when `make' decides
-dnl to update something.  Fun, fun, fun.
-
-dnl Be careful of multiple levels of shell quoting!
-
-dnl The trailing newline in the sed command is needed for Mac OS X. Sigh.
-
-AC_CONFIG_COMMANDS_POST([sed '$i\
-	echo $as_me: fixing Makefile to keep version.c\
-	sed "/CONFIG_CLEAN_FILES/s/version.c//" < Makefile > $$.Makefile\
-	mv $$.Makefile Makefile
-	' < $CONFIG_STATUS > $$.gawk-hack
-	mv $$.gawk-hack $CONFIG_STATUS])
-
-
+	test/Makefile)
 AC_OUTPUT
diff --git a/custom.h b/custom.h
index 6411f80d..a4a8d368 100644
--- a/custom.h
+++ b/custom.h
@@ -18,7 +18,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/depcomp b/depcomp
index fc834192..ca5ea4e1 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-02-09.22
+scriptversion=2006-10-15.18
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -91,7 +92,20 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -276,6 +290,46 @@ icc)
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +342,13 @@ tru64)
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
@@ -467,7 +521,8 @@ cpp)
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
diff --git a/dfa.c b/dfa.c
index 71e37369..67564794 100644
--- a/dfa.c
+++ b/dfa.c
@@ -1,9 +1,10 @@
 /* dfa.c - deterministic extended regexp routines for GNU
-   Copyright 1988, 1998, 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright 1988, 1998, 2000, 2002, 2004, 2005, 2007
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,7 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
+   Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* Written June, 1988 by Mike Haertel
    Modified July, 1988 by Arthur David Olson to assist BMG speedups  */
@@ -624,7 +626,7 @@ parse_bracket_exp_mb ()
 		      work_mbc->coll_elems[work_mbc->ncoll_elems++] = elem;
 		    }
  		}
-	      wc = wc1 = WEOF;
+	      wc1 = wc = WEOF;
 	    }
 	  else
 	    /* We treat '[' as a normal character here.  */
@@ -982,6 +984,9 @@ lex (void)
 	  if (c != '}')
 	    dfaerror(_("malformed repeat count"));
 	  laststart = 0;
+#ifdef GAWK
+	  dfa->broken = (minrep == maxrep && minrep == 0);
+#endif
 	  return lasttok = REPMN;
 
 	case '|':
@@ -1373,7 +1378,14 @@ copytoks (int tindex, int ntokens)
   int i;
 
   for (i = 0; i < ntokens; ++i)
-    addtok(dfa->tokens[tindex + i]);
+    {
+      addtok(dfa->tokens[tindex + i]);
+#ifdef MBS_SUPPORT
+      /* Update index into multibyte csets.  */
+      if (MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
+	dfa->multibyte_prop[dfa->tindex - 1] = dfa->multibyte_prop[tindex + i];
+#endif
+    }
 }
 
 static void
@@ -1602,8 +1614,8 @@ state_index (struct dfa *d, position_set const *s, int newline, int letter)
   d->states[i].constraint = 0;
   d->states[i].first_end = 0;
 #ifdef MBS_SUPPORT
-  if (MB_CUR_MAX > 1)
-    d->states[i].mbps.nelem = 0;
+  d->states[i].mbps.nelem = 0;
+  d->states[i].mbps.elems = NULL;
 #endif
   for (j = 0; j < s->nelem; ++j)
     if (d->tokens[s->elems[j].index] < 0)
@@ -2890,7 +2902,8 @@ dfaexec (struct dfa *d, char const *begin, char *end,
 	    {
 	      remain_bytes
 		= mbrtowc(inputwcs + i, begin + i, end - begin - i + 1, &mbs);
-	      if (remain_bytes <= 1)
+	      if (remain_bytes < 1
+	          || (remain_bytes == 1 && inputwcs[i] == (wchar_t)begin[i]))
 		{
 		  remain_bytes = 0;
 		  inputwcs[i] = (wchar_t)begin[i];
@@ -2978,12 +2991,12 @@ dfaexec (struct dfa *d, char const *begin, char *end,
 		    unsigned char const *nextp;
 		    nextp = p;
 		    s = transit_state(d, s, &nextp);
-	      p = (unsigned char *)nextp;
+		    p = (unsigned char *)nextp;
 
 		    /* Trans table might be updated.  */
 		    trans = d->trans;
-		  }
-		else
+	    }
+	  else
 #endif /* MBS_SUPPORT */
 	  s = d->fails[s][*p++];
 	  continue;
@@ -3054,13 +3067,16 @@ dfainit (struct dfa *d)
   d->fails = 0;
   d->newlines = 0;
   d->success = 0;
+#ifdef GAWK
+  d->broken = 0;
+#endif
 }
 
 /* Parse and analyze a single string of the given length. */
 void
 dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
 {
-  if (case_fold)	/* dummy folding in service of dfamust() */
+  if (case_fold && len)	/* dummy folding in service of dfamust() */
     {
       char *lcopy;
       int i;
@@ -3136,8 +3152,13 @@ dfafree (struct dfa *d)
     }
 #endif /* MBS_SUPPORT */
 
-  for (i = 0; i < d->sindex; ++i)
+  for (i = 0; i < d->sindex; ++i) {
     free((ptr_t) d->states[i].elems.elems);
+#ifdef MBS_SUPPORT
+    if (d->states[i].mbps.nelem > 0)
+      free((ptr_t) d->states[i].mbps.elems);
+#endif /* MBS_SUPPORT */
+  }
   free((ptr_t) d->states);
   for (i = 0; i < d->tindex; ++i)
     if (d->follows[i].elems)
diff --git a/dfa.h b/dfa.h
index 32449f48..06b427d2 100644
--- a/dfa.h
+++ b/dfa.h
@@ -3,7 +3,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
+   Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA */
 
 /* Written June, 1988 by Mike Haertel */
 
@@ -373,6 +374,10 @@ struct dfa
   struct dfamust *musts;	/* List of strings, at least one of which
 				   is known to appear in any r.e. matching
 				   the dfa. */
+#ifdef GAWK
+  int broken;			/* True if using a feature where there
+				   are bugs and gawk should use regex. */
+#endif
 };
 
 /* Some macros for user access to dfa internals. */
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7d7f2050..91d01a33 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,148 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Fri Oct 19 04:13:33 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.1: Add length(array) to list of extensions at end.
+	Revise date.
+
+Thu Oct 18 08:40:59 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* texinfo.tex: Updated to version from Texinfo 4.11.
+
+Sun Oct 14 20:37:59 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awkcard.in: Fix version numbers and copyright info, minor
+	cleanups to format nicely.
+
+Sun Sep 30 22:30:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi (Conversion): Add table describing locale decimal
+	point versus period.
+
+Sat Sep  8 23:53:46 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi: A number of minor fixes based on suggestions
+	from Jack Kelley <Jack.Kelley@epa.qld.gov.au>.
+
+Sat Aug 11 22:46:14 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi (Copying): Move to GPL 3.
+
+Wed May 30 17:11:19 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (CLEANFILES): Added, so that even "make distclean"
+	will do the right thing.
+	(clean): Removed, let automake to do it.
+
+Tue May 29 22:49:16 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi: Document --use-lc-numeric. Document that some
+	VMS systems come with an old version of gawk.
+
+Mon May 28 08:21:51 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.1, awkcard.in: Document --use-lc-numeric.
+
+Tue May 15 13:27:38 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi, gawk.1: Documented --disable-directories-fatal
+	configure option.
+
+Wed May  9 21:50:44 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.1: Reviewed and updated, minor typos fixed.
+	* awkcard.in: Added mention of %F.
+
+Wed May  2 19:55:02 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi: Cleaned up discussion of string concatenation
+	where needed, including a note about the mixed treatment
+	of `"echo " "date" | getline'.  Sigh.
+
+Sun Apr 29 13:33:27 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi (Time Functions): Update description of strftime
+	for third utc-flag argument. Other minor fixes.
+	* gawk.1, awkcard.in: Same.
+
+Tue Apr  3 22:47:40 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi (New Ports): Update list of files for all of
+	regex that should not be messed with lightly.
+
+Wed Mar 21 09:02:53 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi: Removed last vestiges of arnold@gnu.org
+	email address.
+
+Wed Mar  7 13:06:31 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi (Getopt Function): Add a note that user level
+	code must clear out ARGV from 1 to Optind.
+	Thanks to Matthew.Hall1@VerizonWireless.com, from mail
+	dated Tue, 02 Aug 2005 09:04:37 -0700.
+
+Wed Mar  7 08:48:02 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi: Fix my personal email address. Sheesh.
+	Thanks again to Sahak Petrosyan <petrosyan@gmail.com>.
+
+Tue Mar  6 09:13:38 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi: Fix link to online version of the manual.
+	Thanks to Sahak Petrosyan <petrosyan@gmail.com>.
+
+Wed Feb 14 19:40:33 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.texi: Add discussion of magic values for Inf, NaN,
+	and hexadecimal floating point in appendix on numbers.
+	Other minor updates for date, trademarks, etc.
+
+Sun Jan 21 12:59:33 2007  "Ennio-(Sr)"     <ennio@WouldBe-ei.net>
+
+	* gawk.1: Add note that locale settings can influence the
+	choice of decimal point character.
+
+Sat Jan 13 22:43:39 2007  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* gawk.texi: Fix some typos.
+	* gawkinet.texi: Likewise.
+
+Sat Jan 13 21:25:28 2007  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de> 
+
+	* awkcard.in: next is POSIX.
+	* gawk.texi: V7/SVR3.1: Mention assignable `$0', `var in index'
+	as expression.  Specify `FS' limitation. 
+
+Fri Jan 12 12:28:51 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* texinfo.tex: Updated upon move to current autotools.
+
+Thu Jan  4 19:56:45 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* gawk.1: Applied patch from Eric Raymond to stop his stupid
+	automated email kvetching about the wonders of docbook.
+
+2006-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* gawk.texi: Document that `$$0++--' isn't valid even though it
+	is unambiguous according to the Awk grammar.  This is in response
+	to Open Group XCU ERN 86
+	<http://www.opengroup.org/austin/aardvark/latest/xcubug2.txt>.
+
+Fri Oct 21 12:50:19 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	Better support for PDF, thanks to Marty Leisner
+	<leisner@rochester.rr.com> for the prodding.
+
+	* Makefile.am: Add lflashlight.pdf, rflashlight.pdf, statist.pdf
+	to EXTRADIST and add gawk.pdf and gawkinet.pdf to list of files
+	to remove for `clean'.
+	*  lflashlight.pdf, rflashlight.pdf, statist.pdf: New files, created
+	with `epstopdf foo.eps > foo.pdf'.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
@@ -331,7 +476,7 @@ Thu Jul 29 23:15:34 1999  Arnold D. Robbins  <arnold@skeeve.com>
 	  install it directly.
 
 Wed Jun 30 16:14:36 1999  Arnold D. Robbins  <arnold@gnu.org>
-  
+
 	* Release 3.0.4: Release tar file made.  This time for sure.
 
 Wed Oct  7 21:59:33 1998  Arnold D. Robbins  <arnold@gnu.org>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f3a26815..b83f9d67 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,14 +1,15 @@
 #
 # doc/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 2000, 2001, 2002, 2004, 2005 the Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2007
+# the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 #
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GAWK is distributed in the hope that it will be useful,
@@ -31,7 +32,11 @@ EXTRA_DIST = ChangeLog README.card ad.block setter.outline \
 	awkcard.in awkforai.txt texinfo.tex cardfonts \
 	macros colors no.colors $(man_MANS) \
 	lflashlight.eps rflashlight.eps \
-	statist.jpg statist.eps
+	lflashlight.pdf rflashlight.pdf \
+	statist.jpg statist.eps statist.pdf
+
+# Get rid of generated files when cleaning
+CLEANFILES = *.ps *.html *.dvi *~ awkcard.nc awkcard.tr gawk.pdf gawkinet.pdf
 
 MAKEINFO = @MAKEINFO@ --no-split --force
 
@@ -90,6 +95,3 @@ awkcard.ps: $(CARDFILES)
 
 awkcard.nc: $(CARDFILES)
 	$(TROFF) $(CARDSRC_N) | $(SEDME) | cat $(srcdir)/setter.outline - > awkcard.ps && touch awkcard.nc
-
-clean:
-	rm -f *.ps *~ awkcard.nc awkcard.tr *.html
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 93a4d28f..efd6ff05 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,14 +17,15 @@
 #
 # doc/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 2000, 2001, 2002, 2004, 2005 the Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2007
+# the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 #
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GAWK is distributed in the hope that it will be useful,
@@ -36,15 +37,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -63,13 +60,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \
 	texinfo.tex
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/socket.m4 \
-	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intmax_t.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/stdint_h.m4 \
 	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -92,13 +90,17 @@ MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 DVIPS = dvips
 am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -118,6 +120,9 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -134,8 +139,9 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@ --no-split --force
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -155,12 +161,14 @@ U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -172,36 +180,51 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 info_TEXINFOS = gawk.texi gawkinet.texi
 man_MANS = gawk.1 igawk.1
 EXTRA_DIST = ChangeLog README.card ad.block setter.outline \
 	awkcard.in awkforai.txt texinfo.tex cardfonts \
 	macros colors no.colors $(man_MANS) \
 	lflashlight.eps rflashlight.eps \
-	statist.jpg statist.eps
+	lflashlight.pdf rflashlight.pdf \
+	statist.jpg statist.eps statist.pdf
 
+
+# Get rid of generated files when cleaning
+CLEANFILES = *.ps *.html *.dvi *~ awkcard.nc awkcard.tr gawk.pdf gawkinet.pdf
 TROFF = groff -t -Tps -U
 SEDME = sed -e "s/^level0 restore/level0 restore flashme 100 72 moveto (Copyright `date '+%m-%d-%y %T'`, FSF, Inc. (all)) show/" \
 		-e "s/^\/level0 save def/\/level0 save def 30 -48 translate/"
@@ -262,9 +285,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && cd $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
-	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-	  if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-	done; \
+	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
+	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
+	  done; \
+	else :; fi && \
 	cd "$$am__cwd"; \
 	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
 	 -o $@ $<; \
@@ -310,11 +335,29 @@ gawkinet.dvi: gawkinet.texi
 gawkinet.pdf: gawkinet.texi 
 gawkinet.html: gawkinet.texi 
 .dvi.ps:
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	$(DVIPS) -o $@ $<
 
+uninstall-dvi-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(DVIS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dvidir)/$$f"; \
+	done
+
+uninstall-html-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(HTMLS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
+	  rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
+	done
+
 uninstall-info-am:
 	@$(PRE_UNINSTALL)
-	@if (install-info --version && \
+	@if test -d '$(DESTDIR)$(infodir)' && \
+	    (install-info --version && \
 	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
@@ -328,12 +371,28 @@ uninstall-info-am:
 	for file in $$list; do \
 	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
 	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  (if cd "$(DESTDIR)$(infodir)"; then \
+	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
 	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
 	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
 	   else :; fi); \
 	done
 
+uninstall-pdf-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(PDFS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+	done
+
+uninstall-ps-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(PSS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(psdir)/$$f"; \
+	done
+
 dist-info: $(INFO_DEPS)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; \
@@ -342,10 +401,13 @@ dist-info: $(INFO_DEPS)
 	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
 	  esac; \
 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
-	  for file in $$d/$$base*; do \
-	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-	    test -f $(distdir)/$$relfile || \
-	      cp -p $$file $(distdir)/$$relfile; \
+	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
+	    if test -f $$file; then \
+	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
+	      test -f $(distdir)/$$relfile || \
+		cp -p $$file $(distdir)/$$relfile; \
+	    else :; fi; \
 	  done; \
 	done
 
@@ -366,7 +428,7 @@ maintainer-clean-aminfo:
 	done
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -417,22 +479,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -451,7 +512,7 @@ check: check-am
 all-am: Makefile $(INFO_DEPS) $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -470,6 +531,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -477,6 +539,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
@@ -499,13 +563,42 @@ install-data-am: install-info-am install-man
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
+install-dvi: install-dvi-am
+
+install-dvi-am: $(DVIS)
+	@$(NORMAL_INSTALL)
+	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
+	@list='$(DVIS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+	done
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+	@$(NORMAL_INSTALL)
+	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+	@list='$(HTMLS)'; for p in $$list; do \
+	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  if test -d "$$d$$p"; then \
+	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+	  else \
+	    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+	  fi; \
+	done
 install-info: install-info-am
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
+	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
@@ -535,6 +628,28 @@ install-info-am: $(INFO_DEPS)
 	else : ; fi
 install-man: install-man1
 
+install-pdf: install-pdf-am
+
+install-pdf-am: $(PDFS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
+	@list='$(PDFS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+	done
+install-ps: install-ps-am
+
+install-ps-am: $(PSS)
+	@$(NORMAL_INSTALL)
+	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
+	@list='$(PSS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
+	done
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -554,22 +669,28 @@ ps: ps-am
 
 ps-am: $(PSS)
 
-uninstall-am: uninstall-info-am uninstall-man
+uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
+	uninstall-man uninstall-pdf-am uninstall-ps-am
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
 uninstall-man: uninstall-man1
 
+.MAKE: install-am install-data-am install-strip uninstall-am
+
 .PHONY: all all-am check check-am clean clean-generic dist-info \
 	distclean distclean-generic distdir dvi dvi-am html html-am \
 	info info-am install install-am install-data install-data-am \
-	install-data-hook install-exec install-exec-am install-info \
-	install-info-am install-man install-man1 install-strip \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
 	mostlyclean-aminfo mostlyclean-generic pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-hook uninstall-info-am \
-	uninstall-man uninstall-man1
+	uninstall uninstall-am uninstall-dvi-am uninstall-hook \
+	uninstall-html-am uninstall-info-am uninstall-man \
+	uninstall-man1 uninstall-pdf-am uninstall-ps-am
 
 
 # Link gawk.1 to pgawk.1
@@ -604,9 +725,6 @@ awkcard.ps: $(CARDFILES)
 
 awkcard.nc: $(CARDFILES)
 	$(TROFF) $(CARDSRC_N) | $(SEDME) | cat $(srcdir)/setter.outline - > awkcard.ps && touch awkcard.nc
-
-clean:
-	rm -f *.ps *~ awkcard.nc awkcard.tr *.html
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/doc/awkcard.in b/doc/awkcard.in
index 7d55d977..30591403 100644
--- a/doc/awkcard.in
+++ b/doc/awkcard.in
@@ -1,7 +1,7 @@
 .\" AWK Reference Card --- Arnold Robbins, arnold@skeeve.com
 .\"
 .\" Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-.\" 2003, 2004, 2005 Free Software Foundation, Inc.
+.\" 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 .\" 
 .\" Permission is granted to make and distribute verbatim copies of
 .\" this reference card provided the copyright notice and this permission
@@ -100,8 +100,8 @@ Brian Kernighan and Michael Brennan who reviewed it.
 \*(CD
 .SL
 .nf
-\*(FRCopyright \(co 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-Free Software Foundation, Inc.
+\*(FRCopyright \(co 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2007 Free Software Foundation, Inc.
 .nf
 .BT
 
@@ -223,11 +223,10 @@ mail to \*(FCbug-gawk@gnu.org\*(FR.\*(CX
 .\" --- Command Line Arguments (gawk)
 .ES
 .fi
-\*(CDThe following options are specific to \*(GK.
-You may also use ``\*(FC\-W \*(FIoption\*(FR''
-for full POSIX compliance.
-Long options may abbreviated as long as the abbreviation
+\*(CDLong options may abbreviated as long as the abbreviation
 remains unique.
+You may use ``\*(FC\-W \*(FIoption\*(FR''
+for full POSIX compliance.
 .sp .5
 .ig
 .\" This option is left undocumented, on purpose.
@@ -355,21 +354,28 @@ T}
 ls
 l lw(2.2i).
 \*(FC\-\^\-source '\*(FItext\*(FC'\*(FR
-%use \*(FItext\*(FR as AWK program source code.
+%T{
+use \*(FItext\*(FR as AWK program source code.
 \*(FC\-\^\-version\*(FR%T{
 print version information on \*(FCstdout\fP
 and exit zero.
 T}
+.T&
+ls
+l lw(2.2i).
+\*(FC\-\^\-use\-lc\-numeric
+%T{
+force use of the locale's decimal point character when parsing input data.
+T}
 .TE
 .sp .5
 .fi
 In compatibility mode,
 any other options are flagged as invalid, but are otherwise ignored.
-In normal operation, as long as program text has been supplied, unknown
+Normally, if there is program text, unknown options
 options are passed on to the AWK program in
 \*(FCARGV\*(FR
-for processing. This is most useful for running AWK
-programs via the \*(FC#!\*(FR executable interpreter mechanism.\*(CB
+for processing.\*(CB
 .EB "\s+2\f(HBCOMMAND LINE ARGUMENTS (\*(GK\f(HB)\*(FR\s0"
 
 .BT
@@ -1168,7 +1174,7 @@ T}
 .br
 co-process pipe into \*(FCgetline\*(FR; set \*(FIv\*(FR.
 .ti -.2i
-\*(FCnext\fP
+\*(CD\*(FCnext\fP
 .br
 stop processing the current input
 record. Read next input record and
@@ -1297,6 +1303,8 @@ accept the following conversion specification formats:
 \*(FC%E\fP		like \*(FC%e\fP, but use \*(FCE\fP instead of \*(FCe\*(FR
 \*(FC%f\fP		a floating point number of the form
 		\*(FC[\-]ddd.dddddd\*(FR
+\*(FC%F\fP		like \*(FC%f\fP, but use capital letters for infinity and
+		not-a-number values.
 \*(FC%g\fP		use \*(FC%e\fP or \*(FC%f\fP, whichever is shorter, with
 		nonsignificant zeros suppressed
 \*(FC%G\fP		like \*(FC%g\fP, but use \*(FC%E\fP instead of \*(FC%e\*(FR
@@ -1672,12 +1680,15 @@ stamp of the same form as returned by \*(FCsystime()\*(FR.
 The \*(FIdatespec\fP is a string of the form
 \*(FC"\*(FIYYYY MM DD HH MM SS[ DST]\*(FC"\*(FR.
 .ti -.2i
-\*(FCstrftime(\*(FR[\*(FIformat \*(FR[\*(FC, \*(FItimestamp\*(FR]]\*(FC)\*(FR
+\*(FCstrftime(\*(FR[\*(FIformat \*(FR[\*(FC, \*(FItimestamp\*(FR[\*(FC, \*(FIutc-flag\*(FR]]]\*(FC)\*(FR
 .br
 formats \*(FItimestamp\fP
 according to the specification in \*(FIformat\*(FR. The
 \*(FItimestamp\fP should be of the same form as returned by
 \*(FCsystime()\*(FR.
+If \*(FIutc-flag\*(FR
+is present and is non-zero or non-null, the result
+is in UTC, otherwise the result is in local time.
 If \*(FItimestamp\fP is missing, the current time of day is used. If
 \*(FIformat\fP is missing, a default format equivalent to the output
 of \*(FIdate\*(FR(1) is used.
@@ -1902,7 +1913,7 @@ to use the current domain.\*(CB
 .ES
 .nf
 \*(CDHost: \*(FCftp.gnu.org\*(FR
-File: \*(FC/gnu/gawk/gawk-3.1.5.tar.gz\fP
+File: \*(FC/gnu/gawk/gawk-3.1.6.tar.gz\fP
 .in +.2i
 .fi
 GNU \*(AK (\*(GK). There may be a later version.
@@ -1929,8 +1940,8 @@ Michael Brennan's \*(MK. There may be a newer version.\*(CX
 .\" --- Copying Permissions
 .ES
 .fi
-\*(CDCopyright \(co 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+\*(CDCopyright \(co 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2007 Free Software Foundation, Inc.
 .sp .5   
 Permission is granted to make and distribute verbatim copies of this
 reference card provided the copyright notice and this permission notice
diff --git a/doc/gawk.1 b/doc/gawk.1
index 9859e7d3..3e950452 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -3,6 +3,14 @@
 .ds AN \s-1ANSI\s+1
 .ds GN \s-1GNU\s+1
 .ds AK \s-1AWK\s+1
+.de EX
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+..
 .ds EP \fIGAWK: Effective AWK Programming\fP
 .if !\n(.g \{\
 .	if !\w|\*(lq| \{\
@@ -14,7 +22,7 @@
 .		if \w'\(rq' .ds rq "\(rq
 .	\}
 .\}
-.TH GAWK 1 "June 26 2005" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "Oct 19 2007" "Free Software Foundation" "Utility Commands"
 .SH NAME
 gawk \- pattern scanning and processing language
 .SH SYNOPSIS
@@ -53,7 +61,7 @@ file .\|.\|.
 .I Gawk
 is the \*(GN Project's implementation of the \*(AK programming language.
 It conforms to the definition of the language in
-the \*(PX 1003.2 Command Language And Utilities Standard.
+the \*(PX 1003.1 Standard.
 This version in turn is based on the description in
 .IR "The AWK Programming Language" ,
 by Aho, Kernighan, and Weinberger,
@@ -94,7 +102,7 @@ pre-defined \*(AK variables.
 .PP
 .I Gawk
 options may be either traditional \*(PX one letter options,
-or \*(GN style long options.  \*(PX options start with a single \*(lq\-\*(rq,
+or \*(GN-style long options.  \*(PX options start with a single \*(lq\-\*(rq,
 while long options start with \*(lq\-\^\-\*(rq.
 Long options are provided for both \*(GN-specific features and
 for \*(PX-mandated features.
@@ -119,7 +127,7 @@ remains unique.
 .SH OPTIONS
 .PP
 .I Gawk
-accepts the following options, listed alphabetically.
+accepts the following options, listed by frequency.
 .TP
 .PD 0
 .BI \-F " fs"
@@ -174,7 +182,8 @@ 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 the Bell Laboratories research version of \*(UX
+option are from an earlier version of the Bell Laboratories
+research version of \*(UX
 .IR awk .
 They are ignored by
 .IR gawk ,
@@ -233,7 +242,7 @@ If no
 is provided,
 .I gawk
 uses a file named
-.I awkvars.out
+.B awkvars.out
 in the current directory.
 .sp .5
 Having a list of all the global variables is a good way to look for
@@ -446,6 +455,25 @@ It is intended primarily for medium to large \*(AK programs used
 in shell scripts.
 .TP
 .PD 0
+.B "\-W use\-lc\-numeric"
+.TP
+.PD
+.B \-\^\-use\-lc\-numeric
+This forces
+.I gawk
+to use the locale's decimal point character when parsing input data.
+Although the POSIX standard requires this behavior, and
+.I gawk
+does so when
+.B \-\^\-posix
+is in effect, the default is to follow traditional behavior and use a
+period as the decimal point, even in locales where the period is not the
+decimal point character.  This option overrides the default behavior,
+without the full draconian strictness of the
+.B \-\^\-posix
+option.
+.TP
+.PD 0
 .B "\-W version"
 .TP
 .PD
@@ -467,7 +495,7 @@ these options cause an immediate, successful exit.)
 .B \-\^\-
 Signal the end of options. This is useful to allow further arguments to the
 \*(AK program itself to start with a \*(lq\-\*(rq.
-This is mainly for consistency with the argument parsing convention used
+This provides consistency with the argument parsing convention used
 by most other \*(PX programs.
 .PP
 In compatibility mode,
@@ -588,7 +616,7 @@ or both,
 depending upon how they are used.  \*(AK also has one dimensional
 arrays; arrays with multiple dimensions may be simulated.
 Several pre-defined variables are set as a program
-runs; these will be described as needed and summarized below.
+runs; these are described as needed and summarized below.
 .SS Records
 Normally, records are separated by newline characters.  You can control how
 records are separated by assigning values to the built-in variable
@@ -636,10 +664,10 @@ In the special case that
 .B FS
 is a single space, fields are separated
 by runs of spaces and/or tabs and/or newlines.
-(But see the discussion of
-.BR \-\^\-posix ,
+(But see the section
+.BR "POSIX COMPATIBILITY" ,
 below).
-.B NOTE:
+.BR NOTE :
 The value of
 .B IGNORECASE
 (see below) also affects how fields are split when
@@ -828,7 +856,7 @@ and
 .B sub()
 built-in functions all ignore case when doing regular expression
 operations.
-.B NOTE:
+.BR NOTE :
 Array subscripting is
 .I not
 affected.
@@ -858,7 +886,7 @@ the C
 facilities such as
 .BR isalpha() ,
 and
-.BR tolupper() .
+.BR toupper() .
 .TP
 .B LINT
 Provides dynamic control of the
@@ -1003,11 +1031,7 @@ are associative, i.e. indexed by string values.
 .PP
 The special operator
 .B in
-may be used in an
-.B if
-or
-.B while
-statement to see if an array has an index consisting of a particular
+may be used to test if an array has an index consisting of a particular
 value.
 .PP
 .RS
@@ -1040,7 +1064,7 @@ just by specifying the array name without a subscript.
 Variables and fields
 may be (floating point) numbers, or strings, or both.  How the
 value of a variable is interpreted depends upon its context.  If used in
-a numeric expression, it will be treated as a number, if used as a string
+a numeric expression, it will be treated as a number; if used as a string
 it will be treated as a string.
 .PP
 To force a variable to be treated as a number, add 0 to it; to force it
@@ -1073,6 +1097,16 @@ the variable
 .B b
 has a string value of \fB"12"\fR and not \fB"12.00"\fR.
 .PP
+When operating in POSIX mode (such as with the
+.B \-\^\-posix
+command line option),
+beware that locale settings may interfere with the way
+decimal numbers are treated: the decimal separator of the numbers you
+are feeding to
+.I gawk
+must conform to what your locale would expect, be it
+a comma (,) or a period (.).
+.PP
 .I Gawk
 performs comparisons as follows:
 If two variables are numeric, they are compared numerically.
@@ -1081,13 +1115,6 @@ If one value is numeric and the other has a string value that is a
 Otherwise, the numeric value is converted to a string and a string
 comparison is performed.
 Two strings are compared, of course, as strings.
-Note that the POSIX standard applies the concept of
-\*(lqnumeric string\*(rq everywhere, even to string constants.
-However, this is
-clearly incorrect, and
-.I gawk
-does not do this.
-(Fortunately, this is fixed in the next version of the standard.)
 .PP
 Note that string constants, such as \fB"57"\fP, are
 .I not
@@ -1335,7 +1362,7 @@ matches the end of a string.
 character list, matches any of the characters
 .IR abc.\|.\|. .
 .TP
-.BI [^ abc.\|.\|. ]
+\fB[^\fIabc.\|.\|.\fB]\fR
 negated character list, matches any character except
 .IR abc.\|.\|. .
 .TP
@@ -1429,7 +1456,7 @@ The escape sequences that are valid in string constants (see below)
 are also valid in regular expressions.
 .PP
 .I "Character classes"
-are a new feature introduced in the \*(PX standard.
+are a feature introduced in the \*(PX standard.
 A character class is a special notation for describing
 lists of characters that have a specific attribute, but where the
 actual characters themselves can vary from country to country and/or
@@ -1495,7 +1522,8 @@ match them, and if your character set collated differently from
 With the \*(PX character classes, you can write
 .BR /[[:alnum:]]/ ,
 and this matches
-the alphabetic and numeric characters in your character set.
+the alphabetic and numeric characters in your character set,
+no matter what it is.
 .PP
 Two additional special sequences can appear in character lists.
 These apply to non-\s-1ASCII\s+1 character sets, which can have single symbols
@@ -1505,7 +1533,7 @@ that are represented with more than one
 character, as well as several characters that are equivalent for
 .IR collating ,
 or sorting, purposes.  (E.g., in French, a plain \*(lqe\*(rq
-and a grave-accented e\` are equivalent.)
+and a grave-accented \*(lqe\h'-\w:e:u'\`\*(rq are equivalent.)
 .TP
 Collating Symbols
 A collating symbol is a multi-character collating element enclosed in
@@ -1637,6 +1665,13 @@ Addition and subtraction.
 .I space
 String concatenation.
 .TP
+.B "| |&"
+Piped I/O for
+.BR getline ,
+.BR print ,
+and
+.BR printf .
+.TP
 .PD 0
 .B "< >"
 .TP
@@ -1649,7 +1684,7 @@ The regular relational operators.
 .TP
 .B "~ !~"
 Regular expression match, negated match.
-.B NOTE:
+.BR NOTE :
 Do not use a constant regular expression
 .RB ( /foo/ )
 on the left-hand side of a
@@ -1780,6 +1815,10 @@ as above.
 Co-processes are a
 .I gawk
 extension.
+.RI ( command
+can also be a socket.  See the subsection
+.BR "Special File Names" ,
+below.)
 .TP
 .B next
 Stop processing the current input record.  The next input record
@@ -1856,14 +1895,17 @@ and
 .BR printf .
 .TP
 .BI "print .\|.\|. >>" " file"
-appends output to the
+Appends output to the
 .IR file .
 .TP
 .BI "print .\|.\|. |" " command"
-writes on a pipe.
+Writes on a pipe.
 .TP
 .BI "print .\|.\|. |&" " command"
-sends data to a co-process.
+Sends data to a co-process or socket.
+(See also the subsection
+.BR "Special File Names" ,
+below.)
 .PP
 The
 .BR getline
@@ -1872,8 +1914,8 @@ Upon an error,
 .B ERRNO
 contains a string describing the problem.
 .PP
-.B NOTE:
-If using a pipe or co-process to
+.BR NOTE :
+If using a pipe, co-process, or socket to
 .BR getline ,
 or from
 .B print
@@ -1883,8 +1925,8 @@ within a loop, you
 .I must
 use
 .B close()
-to create new instances of the command.
-\*(AK does not automatically close pipes or co-processes when
+to create new instances of the command or socket.
+\*(AK does not automatically close pipes, sockets, or co-processes when
 they return EOF.
 .SS The \fIprintf\fP\^ Statement
 .PP
@@ -1907,7 +1949,7 @@ character of that string is printed.
 .BR "%d" "," " %i"
 A decimal number (the integer part).
 .TP
-.B %e , " %E"
+.BR %e , " %E"
 A floating point number of the form
 .BR [\-]d.dddddde[+\^\-]dd .
 The
@@ -1917,11 +1959,22 @@ format uses
 instead of
 .BR e .
 .TP
-.B %f
+.BR %f , " %F"
 A floating point number of the form
 .BR [\-]ddd.dddddd .
+If the system library supports it,
+.B %F
+is available as well. This is like
+.BR %f ,
+but uses capital letters for special \*(lqnot a number\*(rq
+and \*(lqinfinity\*(rq values. If
+.B %F
+is not available,
+.I gawk
+uses
+.BR %f .
 .TP
-.B %g , " %G"
+.BR %g , " %G"
 Use
 .B %e
 or
@@ -1944,7 +1997,7 @@ An unsigned decimal number (again, an integer).
 .B %s
 A character string.
 .TP
-.B %x , " %X"
+.BR %x , " %X"
 An unsigned hexadecimal number (an integer).
 The
 .B %X
@@ -1965,7 +2018,7 @@ outside the range of a C
 integer,
 .I gawk
 switches to the
-.B %g
+.B %0f
 format specifier. If
 .B \-\^\-lint
 is provided on the command line
@@ -2023,8 +2076,9 @@ a nonzero result.
 For
 .BR %e ,
 .BR %E ,
+.B %f
 and
-.BR %f ,
+.BR %F ,
 the result always contains a
 decimal point.
 For
@@ -2053,8 +2107,9 @@ A number that specifies the precision to use when printing.
 For the
 .BR %e ,
 .BR %E ,
+.B %f
 and
-.BR %f
+.BR %F ,
 formats, this specifies the
 number of digits you want printed to the right of the decimal point.
 For the
@@ -2275,7 +2330,7 @@ The contents of
 are sorted using
 .IR gawk\^ "'s"
 normal rules for
-comparing values, and the indexes of the
+comparing values, and the indices of the
 sorted values of
 .I s
 are replaced with sequential
@@ -2288,7 +2343,7 @@ is first duplicated into
 .IR d ,
 and then
 .I d
-is sorted, leaving the indexes of the
+is sorted, leaving the indices of the
 source array
 .I s
 unchanged.
@@ -2530,6 +2585,16 @@ with all the lower-case characters in
 .I str
 translated to their corresponding upper-case counterparts.
 Non-alphabetic characters are left unchanged.
+.PP
+As of version 3.1.5, 
+.I gawk
+is multibyte aware.  This means that
+.BR index() ,
+.BR length() ,
+.B substr()
+and
+.B match()
+all work in terms of characters, not bytes.
 .SS Time Functions
 Since one of the primary uses of \*(AK programs is processing log files
 that contain time stamp information,
@@ -2574,11 +2639,15 @@ is out of range,
 .B mktime()
 returns \-1.
 .TP
-\fBstrftime(\fR[\fIformat \fR[\fB, \fItimestamp\fR]]\fB)\fR
+\fBstrftime(\fR[\fIformat \fR[\fB, \fItimestamp\fR[\fB, \fIutc-flag\fR]]]\fB)\fR
 Formats
 .I timestamp
 according to the specification in
 .IR format.
+If
+.I utc-flag
+is present and is non-zero or non-null, the result
+is in UTC, otherwise the result is in local time.
 The
 .I timestamp
 should be of the same form as returned by
@@ -2595,14 +2664,6 @@ See the specification for the
 .B strftime()
 function in \*(AN C for the format conversions that are
 guaranteed to be available.
-A public-domain version of
-.IR strftime (3)
-and a man page for it come with
-.IR gawk ;
-if that version was used to build
-.IR gawk ,
-then all of the conversions described in that man page are available to
-.IR gawk.
 .TP
 .B systime()
 Returns the current time of day as the number of seconds since the Epoch
@@ -2613,7 +2674,7 @@ Starting with version 3.1 of
 the following bit manipulation functions are available.
 They work by converting double-precision floating point
 values to
-.B "unsigned long"
+.B uintmax_t
 integers, doing the operation, and then converting the
 result back to floating point.
 The functions are:
@@ -2771,7 +2832,7 @@ function  f(p, q,     a, b)	# a and b are local
 The left parenthesis in a function call is required
 to immediately follow the function name,
 without any intervening white space.
-This is to avoid a syntactic ambiguity with the concatenation operator.
+This avoids a syntactic ambiguity with the concatenation operator.
 This restriction does not apply to the built-in functions listed above.
 .PP
 Functions may call each other and may be recursive.
@@ -2819,7 +2880,7 @@ Returns the value returned by
 .ft B
 This function is provided and documented in \*(EP,
 but everything about this feature is likely to change
-in the next release.
+eventually.
 We STRONGLY recommend that you do not use this feature
 for anything that you aren't willing to redo.
 .ft R
@@ -2834,7 +2895,9 @@ or whatever file was named with the
 .B \-\^\-profile
 option.  It then continues to run.
 .B SIGHUP
-causes it to dump the profile and function call stack and then exit.
+causes
+.I pgawk
+to dump the profile and function call stack and then exit.
 .SH EXAMPLES
 .nf
 Print and sort the login names of all users:
@@ -2907,10 +2970,11 @@ action to assign a value to the
 .B TEXTDOMAIN
 variable to set the text domain to a name associated with your program.
 .sp
-.ti +5n
-.ft B
+.RS
+.EX
 BEGIN { TEXTDOMAIN = "myprog" }
-.ft R
+.EE
+.RE
 .sp
 This allows
 .I gawk
@@ -2942,9 +3006,9 @@ to generate a
 file for your program.
 .TP
 5.
-Provide appropriate translations, and build and install a corresponding
+Provide appropriate translations, and build and install the corresponding
 .B \&.mo
-file.
+files.
 .PP
 The internationalization features are described in full detail in \*(EP.
 .SH POSIX COMPATIBILITY
@@ -3080,7 +3144,9 @@ invoking
 .I gawk
 with the
 .B \-\^\-traditional
-option.
+or
+.B \-\^\-posix
+options.
 .PP
 The following features of
 .I gawk
@@ -3186,6 +3252,10 @@ The ability to use positional specifiers with
 .B printf
 and
 .BR sprintf() .
+.TP
+\(bu
+The ability to pass an array to
+.BR length() .
 .\" New keywords or changes to keywords
 .TP
 \(bu
@@ -3258,7 +3328,7 @@ option is \*(lqt\*(rq, then
 is set to the tab character.
 Note that typing
 .B "gawk \-F\et \&.\|.\|."
-simply causes the shell to quote the \*(lqt,\*(rq, and does not pass
+simply causes the shell to quote the \*(lqt,\*(rq and does not pass
 \*(lq\et\*(rq to the
 .B \-F
 option.
@@ -3310,6 +3380,15 @@ command, then it accepts an additional control-flow statement:
 \fB}\fR
 .fi
 .RE
+.PP
+If
+.I gawk
+is configured with the
+.B \-\^\-disable\-directories-fatal
+option, then it will silently skip directories named on the command line.
+Otherwise, it will do so only if invoked with the
+.B \-\^\-traditional
+option.
 .SH ENVIRONMENT VARIABLES
 The
 .B AWKPATH
@@ -3350,6 +3429,8 @@ Addison-Wesley, 1988.  ISBN 0-201-07981-X.
 .PP
 \*(EP,
 Edition 3.0, published by the Free Software Foundation, 2001.
+The current version of this document is available online at
+.BR http://www.gnu.org/software/gawk/manual .
 .SH BUGS
 The
 .B \-F
@@ -3385,13 +3466,16 @@ The initial DOS port was done by Conrad Kwok and Scott Garfinkle.
 Scott Deifik is the current DOS maintainer.  Pat Rankin did the
 port to VMS, and Michal Jaegermann did the port to the Atari ST.
 The port to OS/2 was done by Kai Uwe Rommel, with contributions and
-help from Darrel Hankerson.  Fred Fish supplied support for the Amiga,
-Stephen Davies provided the Tandem port,
+help from Darrel Hankerson.
+Juan M.\& Guerrero now maintains the OS/2 port.
+Fred Fish supplied support for the Amiga,
 and Martin Brown provided the BeOS port.
+Stephen Davies provided the original Tandem port, and
+Matthew Woehlke provided changes for Tandem's POSIX-compliant systems.
 .SH VERSION INFORMATION
 This man page documents
 .IR gawk ,
-version 3.1.5.
+version 3.1.6.
 .SH BUG REPORTS
 If you find a bug in
 .IR gawk ,
@@ -3404,12 +3488,18 @@ Please include your operating system and its revision, the version of
 what C compiler you used to compile it, and a test program
 and data that are as small as possible for reproducing the problem.
 .PP
-Before sending a bug report, please do two things.  First, verify that
+Before sending a bug report, please do the following things.  First, verify that
 you have the latest version of
 .IR gawk .
 Many bugs (usually subtle ones) are fixed at each release, and if
 yours is out of date, the problem may already have been solved.
-Second, please read this man page and the reference manual carefully to
+Second, please see if setting the environment variable
+.B LC_ALL
+to
+.B LC_ALL=C
+causes things to behave as you expect. If so, it's a locale issue,
+and may or may not really be a bug.
+Finally, please read this man page and the reference manual carefully to
 be sure that what you think is a bug really is, instead of just a quirk
 in the language.
 .PP
@@ -3435,7 +3525,8 @@ provided valuable assistance during testing and debugging.
 We thank him.
 .SH COPYING PERMISSIONS
 Copyright \(co 1989, 1991, 1992, 1993, 1994, 1995, 1996,
-1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2007
+Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of
 this manual page provided the copyright notice and this permission
diff --git a/doc/gawk.info b/doc/gawk.info
index edc9939c..98e33fba 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -1,7 +1,7 @@
-This is gawk.info, produced by makeinfo version 4.6 from gawk.texi.
-
 INFO-DIR-SECTION Text creation and manipulation
 START-INFO-DIR-ENTRY
+This is gawk.info, produced by makeinfo version 4.11 from gawk.texi.
+
 * Gawk: (gawk).                 A text scanning and processing language.
 END-INFO-DIR-ENTRY
 INFO-DIR-SECTION Individual utilities
@@ -9,12 +9,12 @@ START-INFO-DIR-ENTRY
 * awk: (gawk)Invoking gawk.                     Text scanning and processing.
 END-INFO-DIR-ENTRY
 
-Copyright (C) 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 
 
    This is Edition 3 of `GAWK: Effective AWK Programming: A User's
-Guide for GNU Awk', for the 3.1.5 (or later) version of the GNU
+Guide for GNU Awk', for the 3.1.6 (or later) version of the GNU
 implementation of AWK.
 
    Permission is granted to copy, distribute and/or modify this document
@@ -40,12 +40,12 @@ General Introduction
 This file documents `awk', a program that you can use to select
 particular records in a file and perform operations upon them.
 
-Copyright (C) 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 
 
    This is Edition 3 of `GAWK: Effective AWK Programming: A User's
-Guide for GNU Awk', for the 3.1.5 (or later) version of the GNU
+Guide for GNU Awk', for the 3.1.6 (or later) version of the GNU
 implementation of AWK.
 
    Permission is granted to copy, distribute and/or modify this document
@@ -98,7 +98,7 @@ texts being (a) (see below), and with the Back-Cover Texts being (b)
                                    operating systems.
 * Notes::                          Notes about `gawk' extensions and
                                    possible future work.
-* Basic Concepts::                 A very quick intoduction to programming
+* Basic Concepts::                 A very quick introduction to programming
                                    concepts.
 * Glossary::                       An explanation of some unfamiliar terms.
 * Copying::                        Your right to copy and distribute
@@ -222,6 +222,8 @@ texts being (a) (see below), and with the Back-Cover Texts being (b)
 * Typing and Comparison::          How variables acquire types and how this
                                    affects comparison of numbers and strings
                                    with `<', etc.
+* Variable Typing::                String type versus numeric type.
+* Comparison Operators::           The comparison operators.
 * Boolean Ops::                    Combining comparison expressions using
                                    boolean operators `||' (``or''),
                                    `&&' (``and'') and `!' (``not'').
@@ -417,6 +419,7 @@ texts being (a) (see below), and with the Back-Cover Texts being (b)
 * VMS Installation Details::       How to install `gawk' under VMS.
 * VMS Running::                    How to run `gawk' under VMS.
 * VMS POSIX::                      Alternate instructions for VMS POSIX.
+* VMS Old Gawk::                   An old version comes with some VMS systems.
 * Unsupported::                    Systems whose ports are no longer
                                    supported.
 * Atari Installation::             Installing `gawk' on the Atari ST.
@@ -446,6 +449,10 @@ texts being (a) (see below), and with the Back-Cover Texts being (b)
 * Basic High Level::               The high level view.
 * Basic Data Typing::              A very quick intro to data types.
 * Floating Point Issues::          Stuff to know about floating-point numbers.
+* String Conversion Precision::    The String Value Can Lie.
+* Unexpected Results::             Floating Point Numbers Are Not
+                                   Abstract Numbers.
+* POSIX Floating Point Problems::  Standards Versus Existing Practice.
 
                   To Miriam, for making me complete.
 
@@ -456,8 +463,6 @@ texts being (a) (see below), and with the Back-Cover Texts being (b)
                   To Nachum, for the added dimension.
 
                    To Malka, for the new beginning.
- 
-
 
 File: gawk.info,  Node: Foreword,  Next: Preface,  Prev: Top,  Up: Top
 
@@ -559,14 +564,14 @@ inconvenient.  Such jobs are often easier with `awk'.  The `awk'
 utility interprets a special-purpose programming language that makes it
 easy to handle simple data-reformatting jobs.
 
-The GNU implementation of `awk' is called `gawk'; it is fully
+   The GNU implementation of `awk' is called `gawk'; it is fully
 compatible with the System V Release 4 version of `awk'.  `gawk' is
 also compatible with the POSIX specification of the `awk' language.
 This means that all properly written `awk' programs should work with
 `gawk'.  Thus, we usually don't distinguish between `gawk' and other
 `awk' implementations.
 
-Using `awk' allows you to:
+   Using `awk' allows you to:
 
    * Manage small, personal databases
 
@@ -579,7 +584,7 @@ Using `awk' allows you to:
    * Experiment with algorithms that you can adapt later to other
      computer languages
 
-In addition, `gawk' provides facilities that make it easy to:
+   In addition, `gawk' provides facilities that make it easy to:
 
    * Extract bits and pieces of data for processing
 
@@ -587,15 +592,15 @@ In addition, `gawk' provides facilities that make it easy to:
 
    * Perform simple network communications
 
-This Info file teaches you about the `awk' language and how you can use
-it effectively.  You should already be familiar with basic system
+   This Info file teaches you about the `awk' language and how you can
+use it effectively.  You should already be familiar with basic system
 commands, such as `cat' and `ls',(1) as well as basic shell facilities,
 such as input/output (I/O) redirection and pipes.
 
-Implementations of the `awk' language are available for many different
-computing environments.  This Info file, while describing the `awk'
-language in general, also describes the particular implementation of
-`awk' called `gawk' (which stands for "GNU awk").  `gawk' runs on a
+   Implementations of the `awk' language are available for many
+different computing environments.  This Info file, while describing the
+`awk' language in general, also describes the particular implementation
+of `awk' called `gawk' (which stands for "GNU awk").  `gawk' runs on a
 broad range of Unix systems, ranging from 80386 PC-based computers up
 through large-scale systems, such as Crays. `gawk' has also been ported
 to Mac OS X, MS-DOS, Microsoft Windows (all versions) and OS/2 PCs,
@@ -614,10 +619,10 @@ Atari and Amiga microcomputers, BeOS, Tandem D20, and VMS.
 * How To Contribute::           Helping to save the world.
 * Acknowledgments::             Acknowledgments.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) These commands are available on POSIX-compliant systems, as well as
-on traditional Unix-based systems. If you are using some other
+   (1) These commands are available on POSIX-compliant systems, as well
+as on traditional Unix-based systems. If you are using some other
 operating system, you still need to be familiar with the ideas of I/O
 redirection and pipes.
 
@@ -628,6 +633,7 @@ History of `awk' and `gawk'
 ===========================
 
                    Recipe For A Programming Language
+
           1 part  `egrep'   1 part  `snobol'
           2 parts `ed'      3 parts C
 
@@ -637,7 +643,7 @@ History of `awk' and `gawk'
      After eight years, add another part `egrep' and two more parts C.
      Document very well and release.
 
-The name `awk' comes from the initials of its designers: Alfred V.
+   The name `awk' comes from the initials of its designers: Alfred V.
 Aho, Peter J. Weinberger and Brian W. Kernighan.  The original version
 of `awk' was written in 1977 at AT&T Bell Laboratories.  In 1985, a new
 version made the programming language more powerful, introducing
@@ -650,23 +656,23 @@ and Utilities standard further clarified the language.  Both the `gawk'
 designers and the original Bell Laboratories `awk' designers provided
 feedback for the POSIX specification.
 
-Paul Rubin wrote the GNU implementation, `gawk', in 1986.  Jay Fenlason
-completed it, with advice from Richard Stallman.  John Woods
+   Paul Rubin wrote the GNU implementation, `gawk', in 1986.  Jay
+Fenlason completed it, with advice from Richard Stallman.  John Woods
 contributed parts of the code as well.  In 1988 and 1989, David
 Trueman, with help from me, thoroughly reworked `gawk' for compatibility
 with the newer `awk'.  Circa 1995, I became the primary maintainer.
 Current development focuses on bug fixes, performance improvements,
 standards compliance, and occasionally, new features.
 
-In May of 1997, Ju"rgen Kahrs felt the need for network access from
+   In May of 1997, Ju"rgen Kahrs felt the need for network access from
 `awk', and with a little help from me, set about adding features to do
 this for `gawk'.  At that time, he also wrote the bulk of `TCP/IP
 Internetworking with `gawk'' (a separate document, available as part of
 the `gawk' distribution).  His code finally became part of the main
 `gawk' distribution with `gawk' version 3.1.
 
-*Note Contributors::, for a complete list of those who made important
-contributions to `gawk'.
+   *Note Contributors::, for a complete list of those who made
+important contributions to `gawk'.
 
 
 File: gawk.info,  Node: Names,  Next: This Manual,  Prev: History,  Up: Preface
@@ -675,17 +681,17 @@ A Rose by Any Other Name
 ========================
 
 The `awk' language has evolved over the years. Full details are
-provided in *Note Language History::.  The language described in this
+provided in *note Language History::.  The language described in this
 Info file is often referred to as "new `awk'" (`nawk').
 
-Because of this, many systems have multiple versions of `awk'.  Some
+   Because of this, many systems have multiple versions of `awk'.  Some
 systems have an `awk' utility that implements the original version of
 the `awk' language and a `nawk' utility for the new version.  Others
 have an `oawk' version for the "old `awk'" language and plain `awk' for
 the new one.  Still others only have one version, which is usually the
 new one.(1)
 
-All in all, this makes it difficult for you to know which version of
+   All in all, this makes it difficult for you to know which version of
 `awk' you should run when writing your programs.  The best advice I can
 give here is to check your local documentation. Look for `awk', `oawk',
 and `nawk', as well as for `gawk'.  It is likely that you already have
@@ -693,14 +699,14 @@ some version of new `awk' on your system, which is what you should use
 when running your programs.  (Of course, if you're reading this Info
 file, chances are good that you have `gawk'!)
 
-Throughout this Info file, whenever we refer to a language feature that
-should be available in any complete implementation of POSIX `awk', we
-simply use the term `awk'.  When referring to a feature that is
+   Throughout this Info file, whenever we refer to a language feature
+that should be available in any complete implementation of POSIX `awk',
+we simply use the term `awk'.  When referring to a feature that is
 specific to the GNU implementation, we use the term `gawk'.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Often, these systems use `gawk' for their `awk' implementation!
+   (1) Often, these systems use `gawk' for their `awk' implementation!
 
 
 File: gawk.info,  Node: This Manual,  Next: Conventions,  Prev: Names,  Up: Preface
@@ -715,99 +721,100 @@ careful, we call the language "the `awk' language," and the program
 and how to run the `awk' utility.  The term "`awk' program" refers to a
 program written by you in the `awk' programming language.
 
-Primarily, this Info file explains the features of `awk', as defined in
-the POSIX standard.  It does so in the context of the `gawk'
+   Primarily, this Info file explains the features of `awk', as defined
+in the POSIX standard.  It does so in the context of the `gawk'
 implementation.  While doing so, it also attempts to describe important
 differences between `gawk' and other `awk' implementations.(1) Finally,
 any `gawk' features that are not in the POSIX standard for `awk' are
 noted.
 
-There are subsections labelled as *Advanced Notes* scattered throughout
-the Info file.  They add a more complete explanation of points that are
-relevant, but not likely to be of interest on first reading.  All
-appear in the index, under the heading "advanced features."
+   There are subsections labelled as *Advanced Notes* scattered
+throughout the Info file.  They add a more complete explanation of
+points that are relevant, but not likely to be of interest on first
+reading.  All appear in the index, under the heading "advanced
+features."
 
-Most of the time, the examples use complete `awk' programs.  In some of
-the more advanced sections, only the part of the `awk' program that
+   Most of the time, the examples use complete `awk' programs.  In some
+of the more advanced sections, only the part of the `awk' program that
 illustrates the concept currently being described is shown.
 
-While this Info file is aimed principally at people who have not been
+   While this Info file is aimed principally at people who have not been
 exposed to `awk', there is a lot of information here that even the `awk'
 expert should find useful.  In particular, the description of POSIX
-`awk' and the example programs in *Note Library Functions::, and in
-*Note Sample Programs::, should be of interest.
+`awk' and the example programs in *note Library Functions::, and in
+*note Sample Programs::, should be of interest.
 
-*Note Getting Started::, provides the essentials you need to know to
+   *note Getting Started::, provides the essentials you need to know to
 begin using `awk'.
 
-*Note Regexp::, introduces regular expressions in general, and in
+   *note Regexp::, introduces regular expressions in general, and in
 particular the flavors supported by POSIX `awk' and `gawk'.
 
-*Note Reading Files::, describes how `awk' reads your data.  It
+   *note Reading Files::, describes how `awk' reads your data.  It
 introduces the concepts of records and fields, as well as the `getline'
 command.  I/O redirection is first described here.
 
-*Note Printing::, describes how `awk' programs can produce output with
-`print' and `printf'.
+   *note Printing::, describes how `awk' programs can produce output
+with `print' and `printf'.
 
-*Note Expressions::, describes expressions, which are the basic
+   *note Expressions::, describes expressions, which are the basic
 building blocks for getting most things done in a program.
 
-*Note Patterns and Actions::, describes how to write patterns for
+   *note Patterns and Actions::, describes how to write patterns for
 matching records, actions for doing something when a record is matched,
 and the built-in variables `awk' and `gawk' use.
 
-*Note Arrays::, covers `awk''s one-and-only data structure: associative
-arrays.  Deleting array elements and whole arrays is also described, as
-well as sorting arrays in `gawk'.
+   *note Arrays::, covers `awk''s one-and-only data structure:
+associative arrays.  Deleting array elements and whole arrays is also
+described, as well as sorting arrays in `gawk'.
 
-*Note Functions::, describes the built-in functions `awk' and `gawk'
+   *note Functions::, describes the built-in functions `awk' and `gawk'
 provide, as well as how to define your own functions.
 
-*Note Internationalization::, describes special features in `gawk' for
-translating program messages into different languages at runtime.
+   *note Internationalization::, describes special features in `gawk'
+for translating program messages into different languages at runtime.
 
-*Note Advanced Features::, describes a number of `gawk'-specific
+   *note Advanced Features::, describes a number of `gawk'-specific
 advanced features.  Of particular note are the abilities to have
 two-way communications with another process, perform TCP/IP networking,
 and profile your `awk' programs.
 
-*Note Invoking Gawk::, describes how to run `gawk', the meaning of its
-command-line options, and how it finds `awk' program source files.
+   *note Invoking Gawk::, describes how to run `gawk', the meaning of
+its command-line options, and how it finds `awk' program source files.
 
-*Note Library Functions::, and *Note Sample Programs::, provide many
+   *note Library Functions::, and *note Sample Programs::, provide many
 sample `awk' programs.  Reading them allows you to see `awk' solving
 real problems.
 
-*Note Language History::, describes how the `awk' language has evolved
-since first release to present.  It also describes how `gawk' has
-acquired features over time.
+   *note Language History::, describes how the `awk' language has
+evolved since first release to present.  It also describes how `gawk'
+has acquired features over time.
 
-*Note Installation::, describes how to get `gawk', how to compile it
+   *note Installation::, describes how to get `gawk', how to compile it
 under Unix, and how to compile and use it on different non-Unix
 systems.  It also describes how to report bugs in `gawk' and where to
 get three other freely available implementations of `awk'.
 
-*Note Notes::, describes how to disable `gawk''s extensions, as well as
-how to contribute new code to `gawk', how to write extension libraries,
-and some possible future directions for `gawk' development.
+   *note Notes::, describes how to disable `gawk''s extensions, as well
+as how to contribute new code to `gawk', how to write extension
+libraries, and some possible future directions for `gawk' development.
 
-*Note Basic Concepts::, provides some very cursory background material
-for those who are completely unfamiliar with computer programming.
-Also centralized there is a discussion of some of the issues
-surrounding floating-point numbers.
+   *note Basic Concepts::, provides some very cursory background
+material for those who are completely unfamiliar with computer
+programming.  Also centralized there is a discussion of some of the
+issues surrounding floating-point numbers.
 
-The *Note Glossary::, defines most, if not all, the significant terms
-used throughout the book.  If you find terms that you aren't familiar
-with, try looking them up here.
+   The *note Glossary::, defines most, if not all, the significant
+terms used throughout the book.  If you find terms that you aren't
+familiar with, try looking them up here.
 
-*Note Copying::, and *Note GNU Free Documentation License::, present
+   *note Copying::, and *note GNU Free Documentation License::, present
 the licenses that cover the `gawk' source code and this Info file,
 respectively.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) All such differences appear in the index under the entry
+   (1) All such differences appear in the index under the entry
 "differences in `awk' and `gawk'."
 
 
@@ -821,10 +828,10 @@ formatting language.  A single Texinfo source file is used to produce
 both the printed and online versions of the documentation.  This minor
 node briefly documents the typographical conventions used in Texinfo.
 
-Examples you would type at the command-line are preceded by the common
-shell primary and secondary prompts, `$' and `>'.  Output from the
-command is preceded by the glyph "-|".  This typically represents the
-command's standard output.  Error messages, and other output on the
+   Examples you would type at the command-line are preceded by the
+common shell primary and secondary prompts, `$' and `>'.  Output from
+the command is preceded by the glyph "-|".  This typically represents
+the command's standard output.  Error messages, and other output on the
 command's standard error, are preceded by the glyph "error-->".  For
 example:
 
@@ -833,7 +840,7 @@ example:
      $ echo hello on stderr 1>&2
      error--> hello on stderr
 
-Characters that you type at the keyboard look `like this'.  In
+   Characters that you type at the keyboard look `like this'.  In
 particular, there are special characters called "control characters."
 These are characters that you type by holding down both the `CONTROL'
 key and another key, at the same time.  For example, a `Ctrl-d' is typed
@@ -847,14 +854,14 @@ Dark Corners
      illuminate, there's always a smaller but darker one.
      Brian Kernighan
 
-Until the POSIX standard (and `The Gawk Manual'), many features of
+   Until the POSIX standard (and `The Gawk Manual'), many features of
 `awk' were either poorly documented or not documented at all.
 Descriptions of such features (often called "dark corners") are noted
 in this Info file with "(d.c.)".  They also appear in the index under
 the heading "dark corner."
 
-As noted by the opening quote, though, any coverage of dark corners is,
-by definition, something that is incomplete.
+   As noted by the opening quote, though, any coverage of dark corners
+is, by definition, something that is incomplete.
 
 
 File: gawk.info,  Node: Manual History,  Next: How To Contribute,  Prev: Conventions,  Up: Preface
@@ -867,23 +874,24 @@ to the production and distribution of freely distributable software.
 It was founded by Richard M. Stallman, the author of the original Emacs
 editor.  GNU Emacs is the most widely used version of Emacs today.
 
-The GNU(1) Project is an ongoing effort on the part of the Free Software
-Foundation to create a complete, freely distributable, POSIX-compliant
-computing environment.  The FSF uses the "GNU General Public License"
-(GPL) to ensure that their software's source code is always available
-to the end user. A copy of the GPL is included for your reference
-(*note Copying::).  The GPL applies to the C language source code for
-`gawk'.  To find out more about the FSF and the GNU Project online, see
-the GNU Project's home page (http://www.gnu.org).  This Info file may
-also be read from their web site (http://www.gnu.org/manual/gawk/).
-
-A shell, an editor (Emacs), highly portable optimizing C, C++, and
+   The GNU(1) Project is an ongoing effort on the part of the Free
+Software Foundation to create a complete, freely distributable,
+POSIX-compliant computing environment.  The FSF uses the "GNU General
+Public License" (GPL) to ensure that their software's source code is
+always available to the end user. A copy of the GPL is included for
+your reference (*note Copying::).  The GPL applies to the C language
+source code for `gawk'.  To find out more about the FSF and the GNU
+Project online, see the GNU Project's home page (http://www.gnu.org).
+This Info file may also be read from their web site
+(http://www.gnu.org/software/gawk/manual/).
+
+   A shell, an editor (Emacs), highly portable optimizing C, C++, and
 Objective-C compilers, a symbolic debugger and dozens of large and
 small utilities (such as `gawk'), have all been completed and are
 freely available.  The GNU operating system kernel (the HURD), has been
 released but is still in an early stage of development.
 
-Until the GNU operating system is more fully developed, you should
+   Until the GNU operating system is more fully developed, you should
 consider using GNU/Linux, a freely distributable, Unix-like operating
 system for Intel 80386, DEC Alpha, Sun SPARC, IBM S/390, and other
 systems.(2) There are many books on GNU/Linux. One that is freely
@@ -895,35 +903,35 @@ systems: NetBSD, FreeBSD, and OpenBSD. All are based on the 4.4-Lite
 Berkeley Software Distribution, and they use recent versions of `gawk'
 for their versions of `awk'.)
 
-The Info file itself has gone through a number of previous editions.
+   The Info file itself has gone through a number of previous editions.
 Paul Rubin wrote the very first draft of `The GAWK Manual'; it was
 around 40 pages in size.  Diane Close and Richard Stallman improved it,
 yielding a version that was around 90 pages long and barely described
 the original, "old" version of `awk'.
 
-I started working with that version in the fall of 1988.  As work on it
-progressed, the FSF published several preliminary versions (numbered
+   I started working with that version in the fall of 1988.  As work on
+it progressed, the FSF published several preliminary versions (numbered
 0.X).  In 1996, Edition 1.0 was released with `gawk' 3.0.0.  The FSF
 published the first two editions under the title `The GNU Awk User's
 Guide'.
 
-This edition maintains the basic structure of Edition 1.0, but with
+   This edition maintains the basic structure of Edition 1.0, but with
 significant additional material, reflecting the host of new features in
-`gawk' version 3.1.  Of particular note is *Note Array Sorting::, as
-well as *Note Bitwise Functions::, *Note Internationalization::, and
-also *Note Advanced Features::, and *Note Dynamic Extensions::.
+`gawk' version 3.1.  Of particular note is *note Array Sorting::, as
+well as *note Bitwise Functions::, *note Internationalization::, and
+also *note Advanced Features::, and *note Dynamic Extensions::.
 
-`GAWK: Effective AWK Programming' will undoubtedly continue to evolve.
-An electronic version comes with the `gawk' distribution from the FSF.
-If you find an error in this Info file, please report it!  *Note
-Bugs::, for information on submitting problem reports electronically,
-or write to me in care of the publisher.
+   `GAWK: Effective AWK Programming' will undoubtedly continue to
+evolve.  An electronic version comes with the `gawk' distribution from
+the FSF.  If you find an error in this Info file, please report it!
+*Note Bugs::, for information on submitting problem reports
+electronically, or write to me in care of the publisher.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) GNU stands for "GNU's not Unix."
+   (1) GNU stands for "GNU's not Unix."
 
-(2) The terminology "GNU/Linux" is explained in the *Note Glossary::.
+   (2) The terminology "GNU/Linux" is explained in the *note Glossary::.
 
 
 File: gawk.info,  Node: How To Contribute,  Next: Acknowledgments,  Prev: Manual History,  Up: Preface
@@ -957,59 +965,59 @@ acknowledgments:
      implementation and to this manual, that would otherwise have
      escaped us.
 
-I would like to acknowledge Richard M. Stallman, for his vision of a
+   I would like to acknowledge Richard M. Stallman, for his vision of a
 better world and for his courage in founding the FSF and starting the
 GNU Project.
 
-The following people (in alphabetical order) provided helpful comments
-on various versions of this book, up to and including this edition.
-Rick Adams, Nelson H.F. Beebe, Karl Berry, Dr. Michael Brennan, Rich
-Burridge, Claire Cloutier, Diane Close, Scott Deifik, Christopher
-("Topher") Eliot, Jeffrey Friedl, Dr. Darrel Hankerson, Michal
-Jaegermann, Dr. Richard J. LeBlanc, Michael Lijewski, Pat Rankin,
+   The following people (in alphabetical order) provided helpful
+comments on various versions of this book, up to and including this
+edition.  Rick Adams, Nelson H.F. Beebe, Karl Berry, Dr. Michael
+Brennan, Rich Burridge, Claire Cloutier, Diane Close, Scott Deifik,
+Christopher ("Topher") Eliot, Jeffrey Friedl, Dr. Darrel Hankerson,
+Michal Jaegermann, Dr. Richard J. LeBlanc, Michael Lijewski, Pat Rankin,
 Miriam Robbins, Mary Sheehan, and Chuck Toporek.
 
-Robert J. Chassell provided much valuable advice on the use of Texinfo.
-He also deserves special thanks for convincing me _not_ to title this
-Info file `How To Gawk Politely'.  Karl Berry helped significantly with
-the TeX part of Texinfo.
+   Robert J. Chassell provided much valuable advice on the use of
+Texinfo.  He also deserves special thanks for convincing me _not_ to
+title this Info file `How To Gawk Politely'.  Karl Berry helped
+significantly with the TeX part of Texinfo.
 
-I would like to thank Marshall and Elaine Hartholz of Seattle and Dr.
-Bert and Rita Schreiber of Detroit for large amounts of quiet vacation
-time in their homes, which allowed me to make significant progress on
-this Info file and on `gawk' itself.
+   I would like to thank Marshall and Elaine Hartholz of Seattle and
+Dr. Bert and Rita Schreiber of Detroit for large amounts of quiet
+vacation time in their homes, which allowed me to make significant
+progress on this Info file and on `gawk' itself.
 
-Phil Hughes of SSC contributed in a very important way by loaning me
+   Phil Hughes of SSC contributed in a very important way by loaning me
 his laptop GNU/Linux system, not once, but twice, which allowed me to
 do a lot of work while away from home.
 
-David Trueman deserves special credit; he has done a yeoman job of
+   David Trueman deserves special credit; he has done a yeoman job of
 evolving `gawk' so that it performs well and without bugs.  Although he
 is no longer involved with `gawk', working with him on this project was
 a significant pleasure.
 
-The intrepid members of the GNITS mailing list, and most notably Ulrich
-Drepper, provided invaluable help and feedback for the design of the
-internationalization features.
+   The intrepid members of the GNITS mailing list, and most notably
+Ulrich Drepper, provided invaluable help and feedback for the design of
+the internationalization features.
 
-Nelson Beebe, Martin Brown, Andreas Buening, Scott Deifik, Darrel
+   Nelson Beebe, Martin Brown, Andreas Buening, Scott Deifik, Darrel
 Hankerson, Isamu Hasegawa, Michal Jaegermann, Ju"rgen Kahrs, Pat Rankin,
 Kai Uwe Rommel, and Eli Zaretskii (in alphabetical order) make up the
 `gawk' "crack portability team."  Without their hard work and help,
 `gawk' would not be nearly the fine program it is today.  It has been
 and continues to be a pleasure working with this team of fine people.
 
-David and I would like to thank Brian Kernighan of Bell Laboratories for
-invaluable assistance during the testing and debugging of `gawk', and
-for help in clarifying numerous points about the language.  We could
-not have done nearly as good a job on either `gawk' or its
+   David and I would like to thank Brian Kernighan of Bell Laboratories
+for invaluable assistance during the testing and debugging of `gawk',
+and for help in clarifying numerous points about the language.  We
+could not have done nearly as good a job on either `gawk' or its
 documentation without his help.
 
-Chuck Toporek, Mary Sheehan, and Claire Coutier of O'Reilly &
+   Chuck Toporek, Mary Sheehan, and Claire Coutier of O'Reilly &
 Associates contributed significant editorial help for this Info file
 for the 3.1 release of `gawk'.
 
-I must thank my wonderful wife, Miriam, for her patience through the
+   I must thank my wonderful wife, Miriam, for her patience through the
 many versions of this project, for her proofreading, and for sharing me
 with the computer.  I would like to thank my parents for their love,
 and for the grace with which they raised and educated me.  Finally, I
@@ -1035,23 +1043,23 @@ of the patterns, `awk' performs specified actions on that line.  `awk'
 keeps processing input lines in this way until it reaches the end of
 the input files.
 
-Programs in `awk' are different from programs in most other languages,
-because `awk' programs are "data-driven"; that is, you describe the
-data you want to work with and then what to do when you find it.  Most
-other languages are "procedural"; you have to describe, in great
-detail, every step the program is to take.  When working with procedural
-languages, it is usually much harder to clearly describe the data your
-program will process.  For this reason, `awk' programs are often
-refreshingly easy to read and write.
+   Programs in `awk' are different from programs in most other
+languages, because `awk' programs are "data-driven"; that is, you
+describe the data you want to work with and then what to do when you
+find it.  Most other languages are "procedural"; you have to describe,
+in great detail, every step the program is to take.  When working with
+procedural languages, it is usually much harder to clearly describe the
+data your program will process.  For this reason, `awk' programs are
+often refreshingly easy to read and write.
 
-When you run `awk', you specify an `awk' "program" that tells `awk'
+   When you run `awk', you specify an `awk' "program" that tells `awk'
 what to do.  The program consists of a series of "rules".  (It may also
 contain "function definitions", an advanced feature that we will ignore
 for now.  *Note User-defined::.)  Each rule specifies one pattern to
 search for and one action to perform upon finding the pattern.
 
-Syntactically, a rule consists of a pattern followed by an action.  The
-action is enclosed in curly braces to separate it from the pattern.
+   Syntactically, a rule consists of a pattern followed by an action.
+The action is enclosed in curly braces to separate it from the pattern.
 Newlines usually separate rules.  Therefore, an `awk' program looks
 like this:
 
@@ -1087,12 +1095,12 @@ this:
 
      awk 'PROGRAM' INPUT-FILE1 INPUT-FILE2 ...
 
-When the program is long, it is usually more convenient to put it in a
-file and run it with a command like this:
+   When the program is long, it is usually more convenient to put it in
+a file and run it with a command like this:
 
      awk -f PROGRAM-FILE INPUT-FILE1 INPUT-FILE2 ...
 
-This minor node discusses both mechanisms, along with several
+   This minor node discusses both mechanisms, along with several
 variations of each.
 
 * Menu:
@@ -1123,19 +1131,19 @@ program as the first argument of the `awk' command, like this:
 where PROGRAM consists of a series of PATTERNS and ACTIONS, as
 described earlier.
 
-This command format instructs the "shell", or command interpreter, to
-start `awk' and use the PROGRAM to process records in the input
+   This command format instructs the "shell", or command interpreter,
+to start `awk' and use the PROGRAM to process records in the input
 file(s).  There are single quotes around PROGRAM so the shell won't
 interpret any `awk' characters as special shell characters.  The quotes
 also cause the shell to treat all of PROGRAM as a single argument for
 `awk', and allow PROGRAM to be more than one line long.
 
-This format is also useful for running short or medium-sized `awk'
+   This format is also useful for running short or medium-sized `awk'
 programs from shell scripts, because it avoids the need for a separate
 file for the `awk' program.  A self-contained shell script is more
 reliable because there are no other files to misplace.
 
-*Note Very Simple::, presents several short, self-contained programs.
+   *note Very Simple::, presents several short, self-contained programs.
 
 
 File: gawk.info,  Node: Read Terminal,  Next: Long,  Prev: One-shot,  Up: Running gawk
@@ -1154,19 +1162,20 @@ end-of-file by typing `Ctrl-d'.  (On other operating systems, the
 end-of-file character may be different.  For example, on OS/2 and
 MS-DOS, it is `Ctrl-z'.)
 
-As an example, the following program prints a friendly piece of advice
-(from Douglas Adams's `The Hitchhiker's Guide to the Galaxy'), to keep
-you from worrying about the complexities of computer programming
+   As an example, the following program prints a friendly piece of
+advice (from Douglas Adams's `The Hitchhiker's Guide to the Galaxy'),
+to keep you from worrying about the complexities of computer programming
 (`BEGIN' is a feature we haven't discussed yet):
 
      $ awk "BEGIN { print \"Don't Panic!\" }"
      -| Don't Panic!
 
-This program does not read any input.  The `\' before each of the inner
-double quotes is necessary because of the shell's quoting rules--in
-particular because it mixes both single quotes and double quotes.(1)
+   This program does not read any input.  The `\' before each of the
+inner double quotes is necessary because of the shell's quoting
+rules--in particular because it mixes both single quotes and double
+quotes.(1)
 
-This next simple `awk' program emulates the `cat' utility; it copies
+   This next simple `awk' program emulates the `cat' utility; it copies
 whatever you type on the keyboard to its standard output (why this
 works is explained shortly).
 
@@ -1181,11 +1190,11 @@ works is explained shortly).
      -| What, me worry?
      Ctrl-d
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Although we generally recommend the use of single quotes around the
-program text, double quotes are needed here in order to put the single
-quote into the message.
+   (1) Although we generally recommend the use of single quotes around
+the program text, double quotes are needed here in order to put the
+single quote into the message.
 
 
 File: gawk.info,  Node: Long,  Next: Executable Scripts,  Prev: Read Terminal,  Up: Running gawk
@@ -1199,8 +1208,8 @@ tell `awk' to use that file for its program, you type:
 
      awk -f SOURCE-FILE INPUT-FILE1 INPUT-FILE2 ...
 
-The `-f' instructs the `awk' utility to get the `awk' program from the
-file SOURCE-FILE.  Any file name can be used for SOURCE-FILE.  For
+   The `-f' instructs the `awk' utility to get the `awk' program from
+the file SOURCE-FILE.  Any file name can be used for SOURCE-FILE.  For
 example, you could put the program:
 
      BEGIN { print "Don't Panic!" }
@@ -1220,9 +1229,10 @@ special characters.  Notice that in `advice', the `awk' program did not
 have single quotes around it.  The quotes are only needed for programs
 that are provided on the `awk' command line.
 
-If you want to identify your `awk' program files clearly as such, you
-can add the extension `.awk' to the file name.  This doesn't affect the
-execution of the `awk' program but it does make "housekeeping" easier.
+   If you want to identify your `awk' program files clearly as such,
+you can add the extension `.awk' to the file name.  This doesn't affect
+the execution of the `awk' program but it does make "housekeeping"
+easier.
 
 
 File: gawk.info,  Node: Executable Scripts,  Next: Comments,  Prev: Long,  Up: Running gawk
@@ -1251,7 +1261,7 @@ if you had typed `awk -f advice':
 variable (typically `$PATH').  If not, you may need to type `./advice'
 at the shell.)
 
-Self-contained `awk' scripts are useful when you want to write a
+   Self-contained `awk' scripts are useful when you want to write a
 program that users can invoke without their having to know that the
 program is written in `awk'.
 
@@ -1261,25 +1271,25 @@ Advanced Notes: Portability Issues with `#!'
 Some systems limit the length of the interpreter name to 32 characters.
 Often, this can be dealt with by using a symbolic link.
 
-You should not put more than one argument on the `#!' line after the
+   You should not put more than one argument on the `#!' line after the
 path to `awk'. It does not work. The operating system treats the rest
 of the line as a single argument and passes it to `awk'.  Doing this
 leads to confusing behavior--most likely a usage diagnostic of some
 sort from `awk'.
 
-Finally, the value of `ARGV[0]' (*note Built-in Variables::) varies
+   Finally, the value of `ARGV[0]' (*note Built-in Variables::) varies
 depending upon your operating system.  Some systems put `awk' there,
 some put the full pathname of `awk' (such as `/bin/awk'), and some put
 the name of your script (`advice').  Don't rely on the value of
 `ARGV[0]' to provide your script name.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The `#!' mechanism works on Linux systems, systems derived from the
-4.4-Lite Berkeley Software Distribution, and most commercial Unix
+   (1) The `#!' mechanism works on Linux systems, systems derived from
+the 4.4-Lite Berkeley Software Distribution, and most commercial Unix
 systems.
 
-(2) The line beginning with `#!' lists the full file name of an
+   (2) The line beginning with `#!' lists the full file name of an
 interpreter to run and an optional initial command-line argument to
 pass to that interpreter.  The operating system then runs the
 interpreter with the given argument and the full argument list of the
@@ -1290,7 +1300,7 @@ options to `awk', or data files, or both.
 
 File: gawk.info,  Node: Comments,  Next: Quoting,  Prev: Executable Scripts,  Up: Running gawk
 
-1.1.6 Comments in `awk' Programs
+1.1.5 Comments in `awk' Programs
 --------------------------------
 
 A "comment" is some text that is included in a program for the sake of
@@ -1299,51 +1309,52 @@ Comments can explain what the program does and how it works.  Nearly all
 programming languages have provisions for comments, as programs are
 typically hard to understand without them.
 
-In the `awk' language, a comment starts with the sharp sign character
-(`#') and continues to the end of the line.  The `#' does not have to
-be the first character on the line. The `awk' language ignores the rest
-of a line following a sharp sign.  For example, we could have put the
-following into `advice':
+   In the `awk' language, a comment starts with the sharp sign
+character (`#') and continues to the end of the line.  The `#' does not
+have to be the first character on the line. The `awk' language ignores
+the rest of a line following a sharp sign.  For example, we could have
+put the following into `advice':
 
      # This program prints a nice friendly message.  It helps
      # keep novice users from being afraid of the computer.
      BEGIN    { print "Don't Panic!" }
 
-You can put comment lines into keyboard-composed throwaway `awk'
+   You can put comment lines into keyboard-composed throwaway `awk'
 programs, but this usually isn't very useful; the purpose of a comment
 is to help you or another person understand the program when reading it
 at a later time.
 
-*Caution:* As mentioned in *Note One-shot::, you can enclose small to
-medium programs in single quotes, in order to keep your shell scripts
-self-contained.  When doing so, _don't_ put an apostrophe (i.e., a
-single quote) into a comment (or anywhere else in your program). The
-shell interprets the quote as the closing quote for the entire program.
-As a result, usually the shell prints a message about mismatched
-quotes, and if `awk' actually runs, it will probably print strange
-messages about syntax errors.  For example, look at the following:
+   *Caution:* As mentioned in *note One-shot::, you can enclose small
+to medium programs in single quotes, in order to keep your shell
+scripts self-contained.  When doing so, _don't_ put an apostrophe
+(i.e., a single quote) into a comment (or anywhere else in your
+program). The shell interprets the quote as the closing quote for the
+entire program. As a result, usually the shell prints a message about
+mismatched quotes, and if `awk' actually runs, it will probably print
+strange messages about syntax errors.  For example, look at the
+following:
 
      $ awk '{ print "hello" } # let's be cute'
      >
 
-The shell sees that the first two quotes match, and that a new quoted
-object begins at the end of the command line.  It therefore prompts
-with the secondary prompt, waiting for more input.  With Unix `awk',
-closing the quoted string produces this result:
+   The shell sees that the first two quotes match, and that a new
+quoted object begins at the end of the command line.  It therefore
+prompts with the secondary prompt, waiting for more input.  With Unix
+`awk', closing the quoted string produces this result:
 
      $ awk '{ print "hello" } # let's be cute'
      > '
      error--> awk: can't open file be
      error-->  source line number 1
 
-Putting a backslash before the single quote in `let's' wouldn't help,
+   Putting a backslash before the single quote in `let's' wouldn't help,
 since backslashes are not special inside single quotes.  The next
 node describes the shell's quoting rules.
 
 
 File: gawk.info,  Node: Quoting,  Prev: Comments,  Up: Running gawk
 
-1.1.7 Shell-Quoting Issues
+1.1.6 Shell-Quoting Issues
 --------------------------
 
 For short to medium length `awk' programs, it is most convenient to
@@ -1354,7 +1365,7 @@ writing it as part of a larger shell script:
 
      awk 'PROGRAM TEXT' INPUT-FILE1 INPUT-FILE2 ...
 
-Once you are working with the shell, it is helpful to have a basic
+   Once you are working with the shell, it is helpful to have a basic
 knowledge of shell quoting rules.  The following rules apply only to
 POSIX-compliant, Bourne-style shells (such as `bash', the GNU
 Bourne-Again Shell).  If you use `csh', you're on your own.
@@ -1371,7 +1382,7 @@ Bourne-Again Shell).  If you use `csh', you're on your own.
      quotes.  The shell does no interpretation of the quoted text,
      passing it on verbatim to the command.  It is _impossible_ to
      embed a single quote inside single-quoted text.  Refer back to
-     *Note Comments::, for an example of what happens if you try.
+     *note Comments::, for an example of what happens if you try.
 
    * Double quotes protect most things between the opening and closing
      quotes.  The shell does at least variable and command substitution
@@ -1383,7 +1394,7 @@ Bourne-Again Shell).  If you use `csh', you're on your own.
      the characters `$', ``', `\', and `"', all of which must be
      preceded by a backslash within double-quoted text if they are to
      be passed on literally to the program.  (The leading backslash is
-     stripped first.)  Thus, the example seen in *Note Read Terminal::,
+     stripped first.)  Thus, the example seen in *note Read Terminal::,
      is applicable:
 
           $ awk "BEGIN { print \"Don't Panic!\" }"
@@ -1407,7 +1418,7 @@ Bourne-Again Shell).  If you use `csh', you're on your own.
      of the program!  This results in syntax errors at best, and
      confusing behavior at worst.
 
-Mixing single and double quotes is difficult.  You have to resort to
+   Mixing single and double quotes is difficult.  You have to resort to
 shell quoting tricks, like this:
 
      $ awk 'BEGIN { print "Here is a single quote <'"'"'>" }'
@@ -1416,14 +1427,14 @@ shell quoting tricks, like this:
 This program consists of three concatenated quoted strings.  The first
 and the third are single-quoted, the second is double-quoted.
 
-This can be "simplified" to:
+   This can be "simplified" to:
 
      $ awk 'BEGIN { print "Here is a single quote <'\''>" }'
      -| Here is a single quote <'>
 
 Judge for yourself which of these two is the more readable.
 
-Another option is to use double quotes, escaping the embedded,
+   Another option is to use double quotes, escaping the embedded,
 `awk'-level double quotes:
 
      $ awk "BEGIN { print \"Here is a single quote <'>\" }"
@@ -1432,8 +1443,8 @@ Another option is to use double quotes, escaping the embedded,
 This option is also painful, because double quotes, backslashes, and
 dollar signs are very common in `awk' programs.
 
-A third option is to use the octal escape sequence equivalents for the
-single- and double-quote characters, like so:
+   A third option is to use the octal escape sequence equivalents for
+the single- and double-quote characters, like so:
 
      $ awk 'BEGIN { print "Here is a single quote <\47>" }'
      -| Here is a single quote <'>
@@ -1443,14 +1454,15 @@ single- and double-quote characters, like so:
 This works nicely, except that you should comment clearly what the
 escapes mean.
 
-A fourth option is to use command-line variable assignment, like this:
+   A fourth option is to use command-line variable assignment, like
+this:
 
      $ awk -v sq="'" 'BEGIN { print "Here is a single quote <" sq ">" }'
      -| Here is a single quote <'>
 
-If you really need both single and double quotes in your `awk' program,
-it is probably best to move it into a separate file, where the shell
-won't be part of the picture, and you can say what you mean.
+   If you really need both single and double quotes in your `awk'
+program, it is probably best to move it into a separate file, where the
+shell won't be part of the picture, and you can say what you mean.
 
 
 File: gawk.info,  Node: Sample Data Files,  Next: Very Simple,  Prev: Running gawk,  Up: Getting Started
@@ -1465,12 +1477,12 @@ The second data file, called `inventory-shipped', contains information
 about monthly shipments.  In both files, each line is considered to be
 one "record".
 
-In the data file `BBS-list', each record contains the name of a computer
-bulletin board, its phone number, the board's baud rate(s), and a code
-for the number of hours it is operational.  An `A' in the last column
-means the board operates 24 hours a day.  A `B' in the last column
-means the board only operates on evening and weekend hours.  A `C'
-means the board operates only on weekends:
+   In the data file `BBS-list', each record contains the name of a
+computer bulletin board, its phone number, the board's baud rate(s),
+and a code for the number of hours it is operational.  An `A' in the
+last column means the board operates 24 hours a day.  A `B' in the last
+column means the board only operates on evening and weekend hours.  A
+`C' means the board operates only on weekends:
 
      aardvark     555-5553     1200/300          B
      alpo-net     555-3412     2400/1200/300     A
@@ -1484,7 +1496,7 @@ means the board operates only on weekends:
      sdace        555-3430     2400/1200/300     A
      sabafoo      555-2127     1200/300          C
 
-The data file `inventory-shipped' represents information about
+   The data file `inventory-shipped' represents information about
 shipments during the year.  Each record contains the month, the number
 of green crates shipped, the number of red boxes shipped, the number of
 orange bags shipped, and the number of blue packages shipped,
@@ -1509,7 +1521,7 @@ and the first four months of the current year.
      Mar  24  75  70 495
      Apr  21  70  74 514
 
-If you are reading this in GNU Emacs using Info, you can copy the
+   If you are reading this in GNU Emacs using Info, you can copy the
 regions of text showing these sample files into your own test files.
 This way you can try out the examples shown in the remainder of this
 document.  You do this by using the command `M-x write-region' to copy
@@ -1518,7 +1530,7 @@ Miscellaneous File Operations: (emacs)Misc File Ops, for more
 information).  Using this information, create your own `BBS-list' and
 `inventory-shipped' files and practice what you learn in this Info file.
 
-If you are using the stand-alone version of Info, see *Note Extract
+   If you are using the stand-alone version of Info, see *note Extract
 Program::, for an `awk' program that extracts these data files from
 `gawk.texi', the Texinfo source file for this Info file.
 
@@ -1540,7 +1552,7 @@ When lines containing `foo' are found, they are printed because
 `print $0' means print the current line.  (Just `print' by itself means
 the same thing, so we could have written that instead.)
 
-You will notice that slashes (`/') surround the string `foo' in the
+   You will notice that slashes (`/') surround the string `foo' in the
 `awk' program.  The slashes indicate that `foo' is the pattern to
 search for.  This type of pattern is called a "regular expression",
 which is covered in more detail later (*note Regexp::).  The pattern is
@@ -1548,7 +1560,7 @@ allowed to match parts of words.  There are single quotes around the
 `awk' program so that the shell won't interpret any of it as special
 shell characters.
 
-Here is what this program prints:
+   Here is what this program prints:
 
      $ awk '/foo/ { print $0 }' BBS-list
      -| fooey        555-1234     2400/1200/300     B
@@ -1556,18 +1568,18 @@ Here is what this program prints:
      -| macfoo       555-6480     1200/300          A
      -| sabafoo      555-2127     1200/300          C
 
-In an `awk' rule, either the pattern or the action can be omitted, but
-not both.  If the pattern is omitted, then the action is performed for
-_every_ input line.  If the action is omitted, the default action is to
-print all lines that match the pattern.
+   In an `awk' rule, either the pattern or the action can be omitted,
+but not both.  If the pattern is omitted, then the action is performed
+for _every_ input line.  If the action is omitted, the default action
+is to print all lines that match the pattern.
 
-Thus, we could leave out the action (the `print' statement and the curly
-braces) in the previous example and the result would be the same: all
-lines matching the pattern `foo' are printed.  By comparison, omitting
-the `print' statement but retaining the curly braces makes an empty
-action that does nothing (i.e., no lines are printed).
+   Thus, we could leave out the action (the `print' statement and the
+curly braces) in the previous example and the result would be the same:
+all lines matching the pattern `foo' are printed.  By comparison,
+omitting the `print' statement but retaining the curly braces makes an
+empty action that does nothing (i.e., no lines are printed).
 
-Many practical `awk' programs are just a line or two.  Following is a
+   Many practical `awk' programs are just a line or two.  Following is a
 collection of useful, short programs to get you started.  Some of these
 programs contain constructs that haven't been covered yet. (The
 description of the program will give you a good idea of what is going
@@ -1650,11 +1662,11 @@ patterns match, then several actions are run in the order in which they
 appear in the `awk' program.  If no patterns match, then no actions are
 run.
 
-After processing all the rules that match the line (and perhaps there
-are none), `awk' reads the next line.  (However, *note Next Statement::,
-and also *note Nextfile Statement::).  This continues until the program
-reaches the end of the file.  For example, the following `awk' program
-contains two rules:
+   After processing all the rules that match the line (and perhaps
+there are none), `awk' reads the next line.  (However, *note Next
+Statement::, and also *note Nextfile Statement::).  This continues
+until the program reaches the end of the file.  For example, the
+following `awk' program contains two rules:
 
      /12/  { print $0 }
      /21/  { print $0 }
@@ -1664,11 +1676,11 @@ action.  The second rule has the string `21' as the pattern and also
 has `print $0' as the action.  Each rule's action is enclosed in its
 own pair of braces.
 
-This program prints every line that contains the string `12' _or_ the
-string `21'.  If a line contains both strings, it is printed twice,
+   This program prints every line that contains the string `12' _or_
+the string `21'.  If a line contains both strings, it is printed twice,
 once by each rule.
 
-This is what happens if we run this program on our two sample data
+   This is what happens if we run this program on our two sample data
 files, `BBS-list' and `inventory-shipped':
 
      $ awk '/12/ { print $0 }
@@ -1705,7 +1717,7 @@ understand all the details:
      ls -l | awk '$6 == "Nov" { sum += $5 }
                   END { print sum }'
 
-This command prints the total number of bytes in all the files in the
+   This command prints the total number of bytes in all the files in the
 current directory that were last modified in November (of any year).
 (1) The `ls -l' part of this example is a system command that gives you
 a listing of the files in a directory, including each file's size and
@@ -1728,7 +1740,7 @@ The sixth, seventh, and eighth fields contain the month, day, and time,
 respectively, that the file was last modified.  Finally, the ninth field
 contains the name of the file.(2)
 
-The `$6 == "Nov"' in our `awk' program is an expression that tests
+   The `$6 == "Nov"' in our `awk' program is an expression that tests
 whether the sixth field of the output from `ls -l' matches the string
 `Nov'.  Each time a line has the string `Nov' for its sixth field, the
 action `sum += $5' is performed.  This adds the fifth field (the file's
@@ -1737,29 +1749,29 @@ reading all the input lines, `sum' is the total of the sizes of the
 files whose lines matched the pattern.  (This works because `awk'
 variables are automatically initialized to zero.)
 
-After the last line of output from `ls' has been processed, the `END'
-rule executes and prints the value of `sum'.  In this example, the
-value of `sum' is 80600.
+   After the last line of output from `ls' has been processed, the
+`END' rule executes and prints the value of `sum'.  In this example,
+the value of `sum' is 80600.
 
-These more advanced `awk' techniques are covered in later sections
+   These more advanced `awk' techniques are covered in later sections
 (*note Action Overview::).  Before you can move on to more advanced
 `awk' programming, you have to know how `awk' interprets your input and
 displays your output.  By manipulating fields and using `print'
 statements, you can produce some very useful and impressive-looking
 reports.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) In the C shell (`csh'), you need to type a semicolon and then a
-backslash at the end of the first line; see *Note Statements/Lines::,
+   (1) In the C shell (`csh'), you need to type a semicolon and then a
+backslash at the end of the first line; see *note Statements/Lines::,
 for an explanation.  In a POSIX-compliant shell, such as the Bourne
 shell or `bash', you can type the example as shown.  If the command
 `echo $path' produces an empty output line, you are most likely using a
 POSIX-compliant shell.  Otherwise, you are probably using the C shell
 or a shell derived from it.
 
-(2) On some very old systems, you may need to use `ls -lg' to get this
-output.
+   (2) On some very old systems, you may need to use `ls -lg' to get
+this output.
 
 
 File: gawk.info,  Node: Statements/Lines,  Next: Other Features,  Prev: More Complex,  Up: Getting Started
@@ -1773,19 +1785,20 @@ separate rule, like this:
      awk '/12/  { print $0 }
           /21/  { print $0 }' BBS-list inventory-shipped
 
-However, `gawk' ignores newlines after any of the following symbols and
-keywords:
+   However, `gawk' ignores newlines after any of the following symbols
+and keywords:
 
      ,    {    ?    :    ||    &&    do    else
 
 A newline at any other point is considered the end of the statement.(1)
 
-If you would like to split a single statement into two lines at a point
-where a newline would terminate it, you can "continue" it by ending the
-first line with a backslash character (`\').  The backslash must be the
-final character on the line in order to be recognized as a continuation
-character.  A backslash is allowed anywhere in the statement, even in
-the middle of a string or regular expression.  For example:
+   If you would like to split a single statement into two lines at a
+point where a newline would terminate it, you can "continue" it by
+ending the first line with a backslash character (`\').  The backslash
+must be the final character on the line in order to be recognized as a
+continuation character.  A backslash is allowed anywhere in the
+statement, even in the middle of a string or regular expression.  For
+example:
 
      awk '/This regular expression is too long, so continue it\
       on the next line/ { print $1 }'
@@ -1804,8 +1817,8 @@ constant using backslash continuation.  Thus, for maximum portability
 of your `awk' programs, it is best not to split your lines in the
 middle of a regular expression or a string.
 
-*Caution:* _Backslash continuation does not work as described with the
-C shell._  It works for `awk' programs in files and for one-shot
+   *Caution:* _Backslash continuation does not work as described with
+the C shell._  It works for `awk' programs in files and for one-shot
 programs, _provided_ you are using a POSIX-compliant shell, such as the
 Unix Bourne shell or `bash'.  But the C shell behaves differently!
 There, you must use two backslashes in a row, followed by a newline.
@@ -1821,8 +1834,8 @@ program must be escaped with a backslash. To illustrate:
 Here, the `%' and `?' are the C shell's primary and secondary prompts,
 analogous to the standard shell's `$' and `>'.
 
-Compare the previous example to how it is done with a POSIX-compliant
-shell:
+   Compare the previous example to how it is done with a
+POSIX-compliant shell:
 
      $ awk 'BEGIN {
      >   print \
@@ -1830,12 +1843,12 @@ shell:
      > }'
      -| hello, world
 
-`awk' is a line-oriented language.  Each rule's action has to begin on
-the same line as the pattern.  To have the pattern and action on
+   `awk' is a line-oriented language.  Each rule's action has to begin
+on the same line as the pattern.  To have the pattern and action on
 separate lines, you _must_ use backslash continuation; there is no
 other option.
 
-Another thing to keep in mind is that backslash continuation and
+   Another thing to keep in mind is that backslash continuation and
 comments do not mix. As soon as `awk' sees the `#' that starts a
 comment, it ignores _everything_ on the rest of the line. For example:
 
@@ -1850,11 +1863,11 @@ onto the next line. However, the backslash-newline combination is never
 even noticed because it is "hidden" inside the comment. Thus, the
 `BEGIN' is noted as a syntax error.
 
-When `awk' statements within one rule are short, you might want to put
-more than one of them on a line.  This is accomplished by separating
-the statements with a semicolon (`;').  This also applies to the rules
-themselves.  Thus, the program shown at the start of this minor node
-could also be written this way:
+   When `awk' statements within one rule are short, you might want to
+put more than one of them on a line.  This is accomplished by
+separating the statements with a semicolon (`;').  This also applies to
+the rules themselves.  Thus, the program shown at the start of this
+minor node could also be written this way:
 
      /12/ { print $0 } ; /21/ { print $0 }
 
@@ -1863,12 +1876,12 @@ could also be written this way:
      language; it was added for consistency with the treatment of
      statements within an action.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The `?' and `:' referred to here is the three-operand conditional
-expression described in *Note Conditional Exp::.  Splitting lines after
-`?' and `:' is a minor `gawk' extension; if `--posix' is specified
-(*note Options::), then this extension is disabled.
+   (1) The `?' and `:' referred to here is the three-operand
+conditional expression described in *note Conditional Exp::.  Splitting
+lines after `?' and `:' is a minor `gawk' extension; if `--posix' is
+specified (*note Options::), then this extension is disabled.
 
 
 File: gawk.info,  Node: Other Features,  Next: When,  Prev: Statements/Lines,  Up: Getting Started
@@ -1881,14 +1894,14 @@ variables that your programs can use to get information from `awk'.
 There are other variables your program can set as well to control how
 `awk' processes your data.
 
-In addition, `awk' provides a number of built-in functions for doing
+   In addition, `awk' provides a number of built-in functions for doing
 common computational and string-related operations.  `gawk' provides
 built-in functions for working with timestamps, performing bit
 manipulation, and for runtime string translation.
 
-As we develop our presentation of the `awk' language, we introduce most
-of the variables and many of the functions. They are defined
-systematically in *Note Built-in Variables::, and *Note Built-in::.
+   As we develop our presentation of the `awk' language, we introduce
+most of the variables and many of the functions. They are defined
+systematically in *note Built-in Variables::, and *note Built-in::.
 
 
 File: gawk.info,  Node: When,  Prev: Other Features,  Up: Getting Started
@@ -1904,14 +1917,14 @@ is very useful for producing reports from large amounts of raw data,
 such as summarizing information from the output of other utility
 programs like `ls'.  (*Note More Complex::.)
 
-Programs written with `awk' are usually much smaller than they would be
-in other languages.  This makes `awk' programs easy to compose and use.
-Often, `awk' programs can be quickly composed at your terminal, used
-once, and thrown away.  Because `awk' programs are interpreted, you can
-avoid the (usually lengthy) compilation part of the typical
+   Programs written with `awk' are usually much smaller than they would
+be in other languages.  This makes `awk' programs easy to compose and
+use.  Often, `awk' programs can be quickly composed at your terminal,
+used once, and thrown away.  Because `awk' programs are interpreted, you
+can avoid the (usually lengthy) compilation part of the typical
 edit-compile-test-debug cycle of software development.
 
-Complex programs have been written in `awk', including a complete
+   Complex programs have been written in `awk', including a complete
 retargetable assembler for eight-bit microprocessors (*note Glossary::,
 for more information), and a microcode assembler for a special-purpose
 Prolog computer.  More recently, `gawk' was used for writing a Wiki
@@ -1920,7 +1933,7 @@ of such complexity, modern versions are more capable.  Even the Bell
 Labs version of `awk' has fewer predefined limits, and those that it
 has are much larger than they used to be.
 
-If you find yourself writing `awk' scripts of more than, say, a few
+   If you find yourself writing `awk' scripts of more than, say, a few
 hundred lines, you might consider using a different programming
 language.  Emacs Lisp is a good choice if you need sophisticated string
 or pattern matching capabilities.  The shell is also good at string and
@@ -1931,10 +1944,10 @@ of large programs.  Programs in these languages may require more lines
 of source code than the equivalent `awk' programs, but they are easier
 to maintain and usually run more efficiently.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Yet Another Wiki Clone
-(http://www.awk-scripting.de/cgi/wiki.cgi/yawk/).
+   (1) Yet Another Wiki Clone
+(http://www.awk-scripting.de/cgi-bin/wiki.cgi/yawk/).
 
 
 File: gawk.info,  Node: Regexp,  Next: Reading Files,  Prev: Getting Started,  Up: Top
@@ -1946,8 +1959,8 @@ A "regular expression", or "regexp", is a way of describing a set of
 strings.  Because regular expressions are such a fundamental part of
 `awk' programming, their format and use deserve a separate major node.
 
-A regular expression enclosed in slashes (`/') is an `awk' pattern that
-matches every input record whose text belongs to that set.  The
+   A regular expression enclosed in slashes (`/') is an `awk' pattern
+that matches every input record whose text belongs to that set.  The
 simplest regular expression is a sequence of letters, numbers, or both.
 Such a regexp matches any string that contains that sequence.  Thus,
 the regexp `foo' matches any string containing `foo'.  Therefore, the
@@ -1986,7 +1999,7 @@ it:
      -| 555-6480
      -| 555-2127
 
-`~' (tilde), `~' operator Regular expressions can also be used in
+   `~' (tilde), `~' operator Regular expressions can also be used in
 matching expressions.  These expressions allow you to specify the
 string to match against; it need not be the entire current input
 record.  The two operators `~' and `!~' perform regular expression
@@ -2006,16 +2019,16 @@ uppercase letter `J' somewhere in the first field:
      -| Jul  24  34  67 436
      -| Jan  21  36  64 620
 
-So does this:
+   So does this:
 
      awk '{ if ($1 ~ /J/) print }' inventory-shipped
 
-This next example is true if the expression EXP (taken as a character
-string) does _not_ match REGEXP:
+   This next example is true if the expression EXP (taken as a
+character string) does _not_ match REGEXP:
 
      EXP !~ /REGEXP/
 
-The following example matches, or selects, all input records whose
+   The following example matches, or selects, all input records whose
 first field _does not_ contain the uppercase letter `J':
 
      $ awk '$1 !~ /J/' inventory-shipped
@@ -2025,7 +2038,7 @@ first field _does not_ contain the uppercase letter `J':
      -| May  16  34  29 208
      ...
 
-When a regexp is enclosed in slashes, such as `/foo/', we call it a
+   When a regexp is enclosed in slashes, such as `/foo/', we call it a
 "regexp constant", much like `5.27' is a numeric constant and `"foo"'
 is a string constant.
 
@@ -2046,17 +2059,17 @@ double-quote character as a part of the string.  For example:
      $ awk 'BEGIN { print "He said \"hi!\" to her." }'
      -| He said "hi!" to her.
 
-The  backslash character itself is another character that cannot be
+   The  backslash character itself is another character that cannot be
 included normally; you must write `\\' to put one backslash in the
 string or regexp.  Thus, the string whose contents are the two
 characters `"' and `\' must be written `"\"\\"'.
 
-Backslash also represents unprintable characters such as TAB or
+   Backslash also represents unprintable characters such as TAB or
 newline.  While there is nothing to stop you from entering most
 unprintable characters directly in a string constant or regexp constant,
 they may look ugly.
 
-The following table lists all the escape sequences used in `awk' and
+   The following table lists all the escape sequences used in `awk' and
 what they represent. Unless noted otherwise, all these escape sequences
 apply to both string constants and regexp constants:
 
@@ -2113,27 +2126,27 @@ apply to both string constants and regexp constants:
      string, in order to tell `awk' to keep processing the rest of the
      string.
 
-In `gawk', a number of additional two-character sequences that begin
+   In `gawk', a number of additional two-character sequences that begin
 with a backslash have special meaning in regexps.  *Note GNU Regexp
 Operators::.
 
-In a regexp, a backslash before any character that is not in the
-previous list and not listed in *Note GNU Regexp Operators::, means
+   In a regexp, a backslash before any character that is not in the
+previous list and not listed in *note GNU Regexp Operators::, means
 that the next character should be taken literally, even if it would
 normally be a regexp operator.  For example, `/a\+b/' matches the three
 characters `a+b'.
 
-For complete portability, do not use a backslash before any character
-not shown in the previous list.
+   For complete portability, do not use a backslash before any
+character not shown in the previous list.
 
-To summarize:
+   To summarize:
 
    * The escape sequences in the table above are always processed first,
      for both string constants and regexp constants. This happens very
      early, as soon as `awk' reads your program.
 
    * `gawk' processes both regexp constants and dynamic regexps (*note
-     Computed Regexps::), for the special operators listed in *Note GNU
+     Computed Regexps::), for the special operators listed in *note GNU
      Regexp Operators::.
 
    * A backslash before any other character means to treat that
@@ -2162,12 +2175,12 @@ Advanced Notes: Escape Sequences for Metacharacters
 ---------------------------------------------------
 
 Suppose you use an octal or hexadecimal escape to represent a regexp
-metacharacter.  (See *Note Regexp Operators::.)  Does `awk' treat the
+metacharacter.  (See *note Regexp Operators::.)  Does `awk' treat the
 character as a literal character or as a regexp operator?
 
-Historically, such characters were taken literally.  (d.c.)  However,
-the POSIX standard indicates that they should be treated as real
-metacharacters, which is what `gawk' does.  In compatibility mode
+   Historically, such characters were taken literally.  (d.c.)
+However, the POSIX standard indicates that they should be treated as
+real metacharacters, which is what `gawk' does.  In compatibility mode
 (*note Options::), `gawk' treats the characters represented by octal
 and hexadecimal escape sequences literally when used in regexp
 constants. Thus, `/a\52b/' is equivalent to `/a\*b/'.
@@ -2182,12 +2195,12 @@ You can combine regular expressions with special characters, called
 "regular expression operators" or "metacharacters", to increase the
 power and versatility of regular expressions.
 
-The escape sequences described in *Note Escape Sequences::, are valid
-inside a regexp.  They are introduced by a `\' and are recognized and
-converted into corresponding real characters as the very first step in
-processing regexps.
+   The escape sequences described in *note Escape Sequences::, are
+valid inside a regexp.  They are introduced by a `\' and are recognized
+and converted into corresponding real characters as the very first step
+in processing regexps.
 
-Here is a list of metacharacters.  All characters that are not escape
+   Here is a list of metacharacters.  All characters that are not escape
 sequences and that are not listed in the table stand for themselves:
 
 `\'
@@ -2232,7 +2245,7 @@ sequences and that are not listed in the table stand for themselves:
      characters that are enclosed in the square brackets.  For example,
      `[MVX]' matches any one of the characters `M', `V', or `X' in a
      string.  A full discussion of what can be inside the square
-     brackets of a character list is given in *Note Character Lists::.
+     brackets of a character list is given in *note Character Lists::.
 
 `[^ ...]'
      This is a "complemented character list".  The first character after
@@ -2321,28 +2334,28 @@ sequences and that are not listed in the table stand for themselves:
      regexp constants are valid and work the way you want them to, using
      any version of `awk'.(2)
 
-In regular expressions, the `*', `+', and `?' operators, as well as the
-braces `{' and `}', have the highest precedence, followed by
+   In regular expressions, the `*', `+', and `?' operators, as well as
+the braces `{' and `}', have the highest precedence, followed by
 concatenation, and finally by `|'.  As in arithmetic, parentheses can
 change how operators are grouped.
 
-In POSIX `awk' and `gawk', the `*', `+', and `?' operators stand for
+   In POSIX `awk' and `gawk', the `*', `+', and `?' operators stand for
 themselves when there is nothing in the regexp that precedes them.  For
 example, `/+/' matches a literal plus sign.  However, many other
 versions of `awk' treat such a usage as a syntax error.
 
-If `gawk' is in compatibility mode (*note Options::), POSIX character
-classes and interval expressions are not available in regular
+   If `gawk' is in compatibility mode (*note Options::), POSIX
+character classes and interval expressions are not available in regular
 expressions.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) In other literature, you may see a character list referred to as
+   (1) In other literature, you may see a character list referred to as
 either a "character set", a "character class", or a "bracket
 expression".
 
-(2) Use two backslashes if you're using a string constant with a regexp
-operator or function.
+   (2) Use two backslashes if you're using a string constant with a
+regexp operator or function.
 
 
 File: gawk.info,  Node: Character Lists,  Next: GNU Regexp Operators,  Prev: Regexp Operators,  Up: Regexp
@@ -2361,61 +2374,49 @@ example.  To obtain the traditional interpretation of bracket
 expressions, you can use the C locale by setting the `LC_ALL'
 environment variable to the value `C'.
 
-To include one of the characters `\', `]', `-', or `^' in a character
-list, put a `\' in front of it.  For example:
+   To include one of the characters `\', `]', `-', or `^' in a
+character list, put a `\' in front of it.  For example:
 
      [d\]]
 
 matches either `d' or `]'.
 
-This treatment of `\' in character lists is compatible with other `awk'
-implementations and is also mandated by POSIX.  The regular expressions
-in `awk' are a superset of the POSIX specification for Extended Regular
-Expressions (EREs).  POSIX EREs are based on the regular expressions
-accepted by the traditional `egrep' utility.
+   This treatment of `\' in character lists is compatible with other
+`awk' implementations and is also mandated by POSIX.  The regular
+expressions in `awk' are a superset of the POSIX specification for
+Extended Regular Expressions (EREs).  POSIX EREs are based on the
+regular expressions accepted by the traditional `egrep' utility.
 
-"Character classes" are a new feature introduced in the POSIX standard.
-A character class is a special notation for describing lists of
-characters that have a specific attribute, but the actual characters
+   "Character classes" are a new feature introduced in the POSIX
+standard.  A character class is a special notation for describing lists
+of characters that have a specific attribute, but the actual characters
 can vary from country to country and/or from character set to character
 set.  For example, the notion of what is an alphabetic character
 differs between the United States and France.
 
-A character class is only valid in a regexp _inside_ the brackets of a
-character list.  Character classes consist of `[:', a keyword denoting
-the class, and `:]'.  *Note table-char-classes:: lists the character
-classes defined by the POSIX standard.
+   A character class is only valid in a regexp _inside_ the brackets of
+a character list.  Character classes consist of `[:', a keyword
+denoting the class, and `:]'.  *note table-char-classes:: lists the
+character classes defined by the POSIX standard.
 
 Class       Meaning
---------------------------------------------------------------------------
+-------------------------------------------------------------------------- 
 `[:alnum:]' Alphanumeric characters.
---------------------------------------------------------------------------
 `[:alpha:]' Alphabetic characters.
---------------------------------------------------------------------------
 `[:blank:]' Space and TAB characters.
---------------------------------------------------------------------------
 `[:cntrl:]' Control characters.
---------------------------------------------------------------------------
 `[:digit:]' Numeric characters.
---------------------------------------------------------------------------
 `[:graph:]' Characters that are both printable and visible.  (A space is
             printable but not visible, whereas an `a' is both.)
---------------------------------------------------------------------------
 `[:lower:]' Lowercase alphabetic characters.
---------------------------------------------------------------------------
 `[:print:]' Printable characters (characters that are not control
             characters).
---------------------------------------------------------------------------
 `[:punct:]' Punctuation characters (characters that are not letters,
             digits, control characters, or space characters).
---------------------------------------------------------------------------
 `[:space:]' Space characters (such as space, TAB, and formfeed, to name
             a few).
---------------------------------------------------------------------------
 `[:upper:]' Uppercase alphabetic characters.
---------------------------------------------------------------------------
 `[:xdigit:]'Characters that are hexadecimal digits.
---------------------------------------------------------------------------
 
 Table 2.1: POSIX Character Classes
 
@@ -2519,7 +2520,7 @@ GNU `\b' appears to be the lesser of two evils.
 
 No options
      In the default case, `gawk' provides all the facilities of POSIX
-     regexps and the GNU regexp operators described in *Note Regexp
+     regexps and the GNU regexp operators described in *note Regexp
      Operators::.  However, interval expressions are not supported.
 
 `--posix'
@@ -2532,7 +2533,8 @@ No options
      not special, interval expressions are not available, nor are the
      POSIX character classes (`[[:alnum:]]', etc.).  Characters
      described by octal and hexadecimal escape sequences are treated
-     literally, even if they represent regexp metacharacters.
+     literally, even if they represent regexp metacharacters.  Also,
+     `gawk' silently skips directories named on the command line.
 
 `--re-interval'
      Allow interval expressions in regexps, even if `--traditional' has
@@ -2566,12 +2568,13 @@ discussed yet; *note String Functions::).  For example:
 converts the first field to lowercase before matching against it.  This
 works in any POSIX-compliant `awk'.
 
-Another method, specific to `gawk', is to set the variable `IGNORECASE'
-to a nonzero value (*note Built-in Variables::).  When `IGNORECASE' is
-not zero, _all_ regexp and string operations ignore case.  Changing the
-value of `IGNORECASE' dynamically controls the case-sensitivity of the
-program as it runs.  Case is significant by default because
-`IGNORECASE' (like most variables) is initialized to zero:
+   Another method, specific to `gawk', is to set the variable
+`IGNORECASE' to a nonzero value (*note Built-in Variables::).  When
+`IGNORECASE' is not zero, _all_ regexp and string operations ignore
+case.  Changing the value of `IGNORECASE' dynamically controls the
+case-sensitivity of the program as it runs.  Case is significant by
+default because `IGNORECASE' (like most variables) is initialized to
+zero:
 
      x = "aB"
      if (x ~ /ab/) ...   # this test will fail
@@ -2579,40 +2582,40 @@ program as it runs.  Case is significant by default because
      IGNORECASE = 1
      if (x ~ /ab/) ...   # now it will succeed
 
-In general, you cannot use `IGNORECASE' to make certain rules
+   In general, you cannot use `IGNORECASE' to make certain rules
 case-insensitive and other rules case-sensitive, because there is no
 straightforward way to set `IGNORECASE' just for the pattern of a
 particular rule.(1) To do this, use either character lists or
 `tolower'.  However, one thing you can do with `IGNORECASE' only is
 dynamically turn case-sensitivity on or off for all the rules at once.
 
-`IGNORECASE' can be set on the command line or in a `BEGIN' rule (*note
-Other Arguments::; also *note Using BEGIN/END::).  Setting `IGNORECASE'
-from the command line is a way to make a program case-insensitive
-without having to edit it.
+   `IGNORECASE' can be set on the command line or in a `BEGIN' rule
+(*note Other Arguments::; also *note Using BEGIN/END::).  Setting
+`IGNORECASE' from the command line is a way to make a program
+case-insensitive without having to edit it.
 
-Prior to `gawk' 3.0, the value of `IGNORECASE' affected regexp
+   Prior to `gawk' 3.0, the value of `IGNORECASE' affected regexp
 operations only. It did not affect string comparison with `==', `!=',
 and so on.  Beginning with version 3.0, both regexp and string
 comparison operations are also affected by `IGNORECASE'.
 
-Beginning with `gawk' 3.0, the equivalences between upper- and
+   Beginning with `gawk' 3.0, the equivalences between upper- and
 lowercase characters are based on the ISO-8859-1 (ISO Latin-1)
 character set. This character set is a superset of the traditional 128
 ASCII characters, which also provides a number of characters suitable
 for use with European languages.
 
-As of `gawk' 3.1.4, the case equivalencies are fully locale-aware.
+   As of `gawk' 3.1.4, the case equivalences are fully locale-aware.
 They are based on the C `<ctype.h>' facilities, such as `isalpha()' and
 `toupper()'.
 
-The value of `IGNORECASE' has no effect if `gawk' is in compatibility
-mode (*note Options::).  Case is always significant in compatibility
-mode.
+   The value of `IGNORECASE' has no effect if `gawk' is in
+compatibility mode (*note Options::).  Case is always significant in
+compatibility mode.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Experienced C and C++ programmers will note that it is possible,
+   (1) Experienced C and C++ programmers will note that it is possible,
 using something like `IGNORECASE = 1 && /foObAr/ { ... }' and
 `IGNORECASE = 0 || /foobar/ { ... }'.  However, this is somewhat
 obscure and we don't recommend it.
@@ -2627,12 +2630,12 @@ Consider the following:
 
      echo aaaabcd | awk '{ sub(/a+/, "<A>"); print }'
 
-This example uses the `sub' function (which we haven't discussed yet;
+   This example uses the `sub' function (which we haven't discussed yet;
 *note String Functions::) to make a change to the input record. Here,
 the regexp `/a+/' indicates "one or more `a' characters," and the
 replacement text is `<A>'.
 
-The input contains four `a' characters.  `awk' (and POSIX) regular
+   The input contains four `a' characters.  `awk' (and POSIX) regular
 expressions always match the leftmost, _longest_ sequence of input
 characters that can match.  Thus, all four `a' characters are replaced
 with `<A>' in this example:
@@ -2640,7 +2643,7 @@ with `<A>' in this example:
      $ echo aaaabcd | awk '{ sub(/a+/, "<A>"); print }'
      -| <A>bcd
 
-For simple match/no-match tests, this is not so important. But when
+   For simple match/no-match tests, this is not so important. But when
 doing text matching and substitutions with the `match', `sub', `gsub',
 and `gensub' functions, it is very important.  *Note String Functions::,
 for more information on these functions.  Understanding this principle
@@ -2665,26 +2668,27 @@ that is computed in this way is called a "dynamic regexp":
 This sets `digits_regexp' to a regexp that describes one or more digits,
 and tests whether the input record matches this regexp.
 
-*Caution:* When using the `~' and `!~' operators, there is a difference
-between a regexp constant enclosed in slashes and a string constant
-enclosed in double quotes.  If you are going to use a string constant,
-you have to understand that the string is, in essence, scanned _twice_:
-the first time when `awk' reads your program, and the second time when
-it goes to match the string on the lefthand side of the operator with
-the pattern on the right.  This is true of any string-valued expression
-(such as `digits_regexp', shown previously), not just string constants.
-
-What difference does it make if the string is scanned twice? The answer
-has to do with escape sequences, and particularly with backslashes.  To
-get a backslash into a regular expression inside a string, you have to
-type two backslashes.
-
-For example, `/\*/' is a regexp constant for a literal `*'.  Only one
-backslash is needed.  To do the same thing with a string, you have to
-type `"\\*"'.  The first backslash escapes the second one so that the
-string actually contains the two characters `\' and `*'.
-
-Given that you can use both regexp and string constants to describe
+   *Caution:* When using the `~' and `!~' operators, there is a
+difference between a regexp constant enclosed in slashes and a string
+constant enclosed in double quotes.  If you are going to use a string
+constant, you have to understand that the string is, in essence,
+scanned _twice_: the first time when `awk' reads your program, and the
+second time when it goes to match the string on the lefthand side of
+the operator with the pattern on the right.  This is true of any
+string-valued expression (such as `digits_regexp', shown previously),
+not just string constants.
+
+   What difference does it make if the string is scanned twice? The
+answer has to do with escape sequences, and particularly with
+backslashes.  To get a backslash into a regular expression inside a
+string, you have to type two backslashes.
+
+   For example, `/\*/' is a regexp constant for a literal `*'.  Only
+one backslash is needed.  To do the same thing with a string, you have
+to type `"\\*"'.  The first backslash escapes the second one so that
+the string actually contains the two characters `\' and `*'.
+
+   Given that you can use both regexp and string constants to describe
 regular expressions, which should you use?  The answer is "regexp
 constants," for several reasons:
 
@@ -2715,15 +2719,15 @@ be used inside a character list for a dynamic regexp:
      error-->  context is
      error-->          >>>  <<<
 
-But a newline in a regexp constant works with no problem:
+   But a newline in a regexp constant works with no problem:
 
      $ awk '$0 ~ /[ \t\n]/'
      here is a sample line
      -| here is a sample line
      Ctrl-d
 
-`gawk' does not have this problem, and it isn't likely to occur often
-in practice, but it's worth noting for future reference.
+   `gawk' does not have this problem, and it isn't likely to occur
+often in practice, but it's worth noting for future reference.
 
 
 File: gawk.info,  Node: Locales,  Prev: Computed Regexps,  Up: Regexp
@@ -2737,7 +2741,7 @@ setting can affect the way regexp matching works, often in surprising
 ways.  In particular, many locales do case-insensitive matching, even
 when you may have specified characters of only one particular case.
 
-The following example uses the `sub' function, which does text
+   The following example uses the `sub' function, which does text
 replacement (*note String Functions::).  Here, the intent is to remove
 trailing uppercase characters:
 
@@ -2748,28 +2752,33 @@ This output is unexpected, since the `abc' at the end of
 `something1234abc' should not normally match `[A-Z]*'.  This result is
 due to the locale setting (and thus you may not see it on your system).
 There are two fixes.  The first is to use the POSIX character class
-`[[:upper:]]', instead of `[A-Z]'.  The second is to change the locale
+`[[:upper:]]', instead of `[A-Z]'.  (This is preferred, since then your
+program will work everywhere.)  The second is to change the locale
 setting in the environment, before running `gawk', by using the shell
 statements:
 
      LANG=C LC_ALL=C
      export LANG LC_ALL
 
-The setting `C' forces `gawk' to behave in the traditional Unix manner,
-where case distinctions do matter.  You may wish to put these
+   The setting `C' forces `gawk' to behave in the traditional Unix
+manner, where case distinctions do matter.  You may wish to put these
 statements into your shell startup file, e.g., `$HOME/.profile'.
 
-Similar considerations apply to other ranges.  For example, `["-/]' is
-perfectly valid in ASCII, but is not valid in many Unicode locales,
+   Similar considerations apply to other ranges.  For example, `["-/]'
+is perfectly valid in ASCII, but is not valid in many Unicode locales,
 such as `en_US.UTF-8'.  (In general, such ranges should be avoided;
 either list the characters individually, or use a POSIX character class
 such as `[[:punct:]]'.)
 
-For the normal case of `RS = "\n"', the locale is largely irrelevant.
-For other single byte record separators, using `LC_ALL=C' will give you
-much better performance when reading records.  Otherwise, `gawk' has to
-make several function calls, _per input character_ to find the record
-terminator.
+   For the normal case of `RS = "\n"', the locale is largely irrelevant.
+For other single-character record separators, using `LC_ALL=C' will
+give you much better performance when reading records.  Otherwise,
+`gawk' has to make several function calls, _per input character_ to
+find the record terminator.
+
+   Finally, the locale affects the value of the decimal point character
+used when `gawk' parses input data.  This is discussed in detail in
+*note Conversion::.
 
 
 File: gawk.info,  Node: Reading Files,  Next: Printing,  Prev: Regexp,  Up: Top
@@ -2785,13 +2794,13 @@ order, processing all the data from one before going on to the next.
 The name of the current input file can be found in the built-in variable
 `FILENAME' (*note Built-in Variables::).
 
-The input is read in units called "records", and is processed by the
+   The input is read in units called "records", and is processed by the
 rules of your program one record at a time.  By default, each record is
 one line.  Each record is automatically split into chunks called
 "fields".  This makes it more convenient for programs to work on the
 parts of a record.
 
-On rare occasions, you may need to use the `getline' command.  The
+   On rare occasions, you may need to use the `getline' command.  The
 `getline' command is valuable, both because it can do explicit input
 from any number of files, and because the files used with it do not
 have to be named on the `awk' command line (*note Getline::).
@@ -2822,19 +2831,20 @@ started.  Another built-in variable, `NR', is the total number of input
 records read so far from all data files.  It starts at zero, but is
 never automatically reset to zero.
 
-Records are separated by a character called the "record separator".  By
-default, the record separator is the newline character.  This is why
+   Records are separated by a character called the "record separator".
+By default, the record separator is the newline character.  This is why
 records are, by default, single lines.  A different character can be
 used for the record separator by assigning the character to the
 built-in variable `RS'.
 
-Like any other variable, the value of `RS' can be changed in the `awk'
-program with the assignment operator, `=' (*note Assignment Ops::).
-The new record-separator character should be enclosed in quotation
-marks, which indicate a string constant.  Often the right time to do
-this is at the beginning of execution, before any input is processed,
-so that the very first record is read with the proper separator.  To do
-this, use the special `BEGIN' pattern (*note BEGIN/END::).  For example:
+   Like any other variable, the value of `RS' can be changed in the
+`awk' program with the assignment operator, `=' (*note Assignment
+Ops::).  The new record-separator character should be enclosed in
+quotation marks, which indicate a string constant.  Often the right
+time to do this is at the beginning of execution, before any input is
+processed, so that the very first record is read with the proper
+separator.  To do this, use the special `BEGIN' pattern (*note
+BEGIN/END::).  For example:
 
      awk 'BEGIN { RS = "/" }
           { print $0 }' BBS-list
@@ -2888,37 +2898,38 @@ record is treated as part of the record for the `core' BBS; the newline
 separating them in the output is the original newline in the data file,
 not the one added by `awk' when it printed the record!
 
-Another way to change the record separator is on the command line,
+   Another way to change the record separator is on the command line,
 using the variable-assignment feature (*note Other Arguments::):
 
      awk '{ print $0 }' RS="/" BBS-list
 
 This sets `RS' to `/' before processing `BBS-list'.
 
-Using an unusual character such as `/' for the record separator
+   Using an unusual character such as `/' for the record separator
 produces correct behavior in the vast majority of cases.  However, the
 following (extreme) pipeline prints a surprising `1':
 
      $ echo | awk 'BEGIN { RS = "a" } ; { print NF }'
      -| 1
 
-There is one field, consisting of a newline.  The value of the built-in
-variable `NF' is the number of fields in the current record.
+   There is one field, consisting of a newline.  The value of the
+built-in variable `NF' is the number of fields in the current record.
 
-Reaching the end of an input file terminates the current input record,
-even if the last character in the file is not the character in `RS'.
-(d.c.)
+   Reaching the end of an input file terminates the current input
+record, even if the last character in the file is not the character in
+`RS'.  (d.c.)
 
-The empty string `""' (a string without any characters) has a special
-meaning as the value of `RS'. It means that records are separated by
-one or more blank lines and nothing else.  *Note Multiple Line::, for
-more details.
+   The empty string `""' (a string without any characters) has a
+special meaning as the value of `RS'. It means that records are
+separated by one or more blank lines and nothing else.  *Note Multiple
+Line::, for more details.
 
-If you change the value of `RS' in the middle of an `awk' run, the new
-value is used to delimit subsequent records, but the record currently
-being processed, as well as records already processed, are not affected.
+   If you change the value of `RS' in the middle of an `awk' run, the
+new value is used to delimit subsequent records, but the record
+currently being processed, as well as records already processed, are not
+affected.
 
-After the end of the record has been determined, `gawk' sets the
+   After the end of the record has been determined, `gawk' sets the
 variable `RT' to the text in the input that matched `RS'.  When using
 `gawk', the value of `RS' is not limited to a one-character string.  It
 can be any regular expression (*note Regexp::).  In general, each record
@@ -2930,14 +2941,14 @@ newline in the input), and the following record starts just after the
 end of this string (at the first character of the following line).  The
 newline, because it matches `RS', is not part of either record.
 
-When `RS' is a single character, `RT' contains the same single
+   When `RS' is a single character, `RT' contains the same single
 character. However, when `RS' is a regular expression, `RT' contains
 the actual input text that matched the regular expression.
 
-The following example illustrates both of these features.  It sets `RS'
-equal to a regular expression that matches either a newline or a series
-of one or more uppercase letters with optional leading and/or trailing
-whitespace:
+   The following example illustrates both of these features.  It sets
+`RS' equal to a regular expression that matches either a newline or a
+series of one or more uppercase letters with optional leading and/or
+trailing whitespace:
 
      $ echo record 1 AAAA record 2 BBBB record 3 |
      > gawk 'BEGIN { RS = "\n|( *[[:upper:]]+ *)" }
@@ -2952,13 +2963,13 @@ value of `RT' is a newline, and the `print' statement supplies its own
 terminating newline.  *Note Simple Sed::, for a more useful example of
 `RS' as a regexp and `RT'.
 
-If you set `RS' to a regular expression that allows optional trailing
-text, such as `RS = "abc(XYZ)?"' it is possible, due to implementation
-constraints, that `gawk' may match the leading part of the regular
-expression, but not the trailing part, particularly if the input text
-that could match the trailing part is fairly long.  `gawk' attempts to
-avoid this problem, but currently, there's no guarantee that this will
-never happen.
+   If you set `RS' to a regular expression that allows optional
+trailing text, such as `RS = "abc(XYZ)?"' it is possible, due to
+implementation constraints, that `gawk' may match the leading part of
+the regular expression, but not the trailing part, particularly if the
+input text that could match the trailing part is fairly long.  `gawk'
+attempts to avoid this problem, but currently, there's no guarantee
+that this will never happen.
 
      NOTE: Remember that in `awk', the `^' and `$' anchor
      metacharacters match the beginning and end of a _string_, and not
@@ -2968,7 +2979,7 @@ never happen.
      that happens to contain newline characters in it.  It is thus best
      to avoid anchor characters in the value of `RS'.
 
-The use of `RS' as a regular expression and the `RT' variable are
+   The use of `RS' as a regular expression and the `RT' variable are
 `gawk' extensions; they are not available in compatibility mode (*note
 Options::).  In compatibility mode, only the first character of the
 value of `RS' is used to determine the end of the record.
@@ -2982,28 +2993,28 @@ value that you know doesn't occur in the input file.  This is hard to
 do in a general way, such that a program always works for arbitrary
 input files.
 
-You might think that for text files, the NUL character, which consists
-of a character with all bits equal to zero, is a good value to use for
-`RS' in this case:
+   You might think that for text files, the NUL character, which
+consists of a character with all bits equal to zero, is a good value to
+use for `RS' in this case:
 
      BEGIN { RS = "\0" }  # whole file becomes one record?
 
-`gawk' in fact accepts this, and uses the NUL character for the record
-separator.  However, this usage is _not_ portable to other `awk'
+   `gawk' in fact accepts this, and uses the NUL character for the
+record separator.  However, this usage is _not_ portable to other `awk'
 implementations.
 
-All other `awk' implementations(1) store strings internally as C-style
-strings.  C strings use the NUL character as the string terminator.  In
-effect, this means that `RS = "\0"' is the same as `RS = ""'.
-(d.c.)
+   All other `awk' implementations(1) store strings internally as
+C-style strings.  C strings use the NUL character as the string
+terminator.  In effect, this means that `RS = "\0"' is the same as `RS
+= ""'.  (d.c.)
 
-The best way to treat a whole file as a single record is to simply read
-the file in, one record at a time, concatenating each record onto the
-end of the previous ones.
+   The best way to treat a whole file as a single record is to simply
+read the file in, one record at a time, concatenating each record onto
+the end of the previous ones.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) At least that we know about.
+   (1) At least that we know about.
 
 
 File: gawk.info,  Node: Fields,  Next: Nonconstant Fields,  Prev: Records,  Up: Reading Files
@@ -3019,12 +3030,12 @@ newlines;(1) other characters, such as formfeed, vertical tab, etc.
 that are considered whitespace by other languages, are _not_ considered
 whitespace by `awk'.
 
-The purpose of fields is to make it more convenient for you to refer to
-these pieces of the record.  You don't have to use them--you can
+   The purpose of fields is to make it more convenient for you to refer
+to these pieces of the record.  You don't have to use them--you can
 operate on the whole record if you want--but fields are what make
 simple `awk' programs so powerful.
 
-A dollar-sign (`$') is used to refer to a field in an `awk' program,
+   A dollar-sign (`$') is used to refer to a field in an `awk' program,
 followed by the number of the field you want.  Thus, `$1' refers to the
 first field, `$2' to the second, and so on.  (Unlike the Unix shells,
 the field numbers are not limited to single digits.  `$127' is the one
@@ -3038,17 +3049,17 @@ Here the first field, or `$1', is `This', the second field, or `$2', is
 Because there is no space between the `e' and the `.', the period is
 considered part of the seventh field.
 
-`NF' is a built-in variable whose value is the number of fields in the
-current record.  `awk' automatically updates the value of `NF' each
+   `NF' is a built-in variable whose value is the number of fields in
+the current record.  `awk' automatically updates the value of `NF' each
 time it reads a record.  No matter how many fields there are, the last
 field in a record can be represented by `$NF'.  So, `$NF' is the same
 as `$7', which is `example.'.  If you try to reference a field beyond
 the last one (such as `$8' when the record has only seven fields), you
 get the empty string.  (If used in a numeric operation, you get zero.)
 
-The use of `$0', which looks like a reference to the "zero-th" field, is
-a special case: it represents the whole input record when you are not
-interested in specific fields.  Here are some more examples:
+   The use of `$0', which looks like a reference to the "zero-th"
+field, is a special case: it represents the whole input record when you
+are not interested in specific fields.  Here are some more examples:
 
      $ awk '$1 ~ /foo/ { print $0 }' BBS-list
      -| fooey        555-1234     2400/1200/300     B
@@ -3061,7 +3072,7 @@ field contains the string `foo'.  The operator `~' is called a
 "matching operator" (*note Regexp Usage::); it tests whether a string
 (here, the field `$1') matches a given regular expression.
 
-By contrast, the following example looks for `foo' in _the entire
+   By contrast, the following example looks for `foo' in _the entire
 record_ and prints the first field and the last field for each matching
 input record:
 
@@ -3071,9 +3082,9 @@ input record:
      -| macfoo A
      -| sabafoo C
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) In POSIX `awk', newlines are not considered whitespace for
+   (1) In POSIX `awk', newlines are not considered whitespace for
 separating fields.
 
 
@@ -3099,23 +3110,24 @@ another example of using expressions as field numbers:
 
      awk '{ print $(2*2) }' BBS-list
 
-`awk' evaluates the expression `(2*2)' and uses its value as the number
-of the field to print.  The `*' sign represents multiplication, so the
-expression `2*2' evaluates to four.  The parentheses are used so that
-the multiplication is done before the `$' operation; they are necessary
-whenever there is a binary operator in the field-number expression.
-This example, then, prints the hours of operation (the fourth field)
-for every line of the file `BBS-list'.  (All of the `awk' operators are
-listed, in order of decreasing precedence, in *Note Precedence::.)
-
-If the field number you compute is zero, you get the entire record.
+   `awk' evaluates the expression `(2*2)' and uses its value as the
+number of the field to print.  The `*' sign represents multiplication,
+so the expression `2*2' evaluates to four.  The parentheses are used so
+that the multiplication is done before the `$' operation; they are
+necessary whenever there is a binary operator in the field-number
+expression.  This example, then, prints the hours of operation (the
+fourth field) for every line of the file `BBS-list'.  (All of the `awk'
+operators are listed, in order of decreasing precedence, in *note
+Precedence::.)
+
+   If the field number you compute is zero, you get the entire record.
 Thus, `$(2-2)' has the same value as `$0'.  Negative field numbers are
 not allowed; trying to reference one usually terminates the program.
 (The POSIX standard does not define what happens when you reference a
 negative field number.  `gawk' notices this and terminates your
 program.  Other `awk' implementations may behave differently.)
 
-As mentioned in *Note Fields::, `awk' stores the current record's
+   As mentioned in *note Fields::, `awk' stores the current record's
 number of fields in the built-in variable `NF' (also *note Built-in
 Variables::).  The expression `$NF' is not a special feature--it is the
 direct consequence of evaluating `NF' and using its value as a field
@@ -3146,15 +3158,15 @@ three minus ten: `$3 - 10'.  (*Note Arithmetic Ops::.)  Then it prints
 the original and new values for field three.  (Someone in the warehouse
 made a consistent mistake while inventorying the red boxes.)
 
-For this to work, the text in field `$3' must make sense as a number;
-the string of characters must be converted to a number for the computer
-to do arithmetic on it.  The number resulting from the subtraction is
-converted back to a string of characters that then becomes field three.
-*Note Conversion::.
+   For this to work, the text in field `$3' must make sense as a
+number; the string of characters must be converted to a number for the
+computer to do arithmetic on it.  The number resulting from the
+subtraction is converted back to a string of characters that then
+becomes field three.  *Note Conversion::.
 
-When the value of a field is changed (as perceived by `awk'), the text
-of the input record is recalculated to contain the new field where the
-old one was.  In other words, `$0' changes to reflect the altered
+   When the value of a field is changed (as perceived by `awk'), the
+text of the input record is recalculated to contain the new field where
+the old one was.  In other words, `$0' changes to reflect the altered
 field.  Thus, this program prints a copy of the input file, with 10
 subtracted from the second field of each line:
 
@@ -3164,8 +3176,8 @@ subtracted from the second field of each line:
      -| Mar 5 24 34 228
      ...
 
-It is also possible to also assign contents to fields that are out of
-range.  For example:
+   It is also possible to also assign contents to fields that are out
+of range.  For example:
 
      $ awk '{ $6 = ($5 + $4 + $3 + $2)
      >        print $6 }' inventory-shipped
@@ -3179,20 +3191,20 @@ We've just created `$6', whose value is the sum of fields `$2', `$3',
 `inventory-shipped', `$6' represents the total number of parcels
 shipped for a particular month.
 
-Creating a new field changes `awk''s internal copy of the current input
-record, which is the value of `$0'.  Thus, if you do `print $0' after
-adding a field, the record printed includes the new field, with the
-appropriate number of field separators between it and the previously
+   Creating a new field changes `awk''s internal copy of the current
+input record, which is the value of `$0'.  Thus, if you do `print $0'
+after adding a field, the record printed includes the new field, with
+the appropriate number of field separators between it and the previously
 existing fields.
 
-This recomputation affects and is affected by `NF' (the number of
+   This recomputation affects and is affected by `NF' (the number of
 fields; *note Fields::).  For example, the value of `NF' is set to the
 number of the highest field you create.  The exact format of `$0' is
 also affected by a feature that has not been discussed yet: the "output
 field separator", `OFS', used to separate the fields (*note Output
 Separators::).
 
-Note, however, that merely _referencing_ an out-of-range field does
+   Note, however, that merely _referencing_ an out-of-range field does
 _not_ change the value of either `$0' or `NF'.  Referencing an
 out-of-range field only produces an empty string.  For example:
 
@@ -3206,9 +3218,9 @@ out of range.  (*Note If Statement::, for more information about
 `awk''s `if-else' statements.  *Note Typing and Comparison::, for more
 information about the `!=' operator.)
 
-It is important to note that making an assignment to an existing field
-changes the value of `$0' but does not change the value of `NF', even
-when you assign the empty string to a field.  For example:
+   It is important to note that making an assignment to an existing
+field changes the value of `$0' but does not change the value of `NF',
+even when you assign the empty string to a field.  For example:
 
      $ echo a b c d | awk '{ OFS = ":"; $2 = ""
      >                       print $0; print NF }'
@@ -3228,7 +3240,7 @@ The intervening field, `$5', is created with an empty value (indicated
 by the second pair of adjacent colons), and `NF' is updated with the
 value six.
 
-Decrementing `NF' throws away the values of the fields after the new
+   Decrementing `NF' throws away the values of the fields after the new
 value of `NF' and recomputes `$0'.  (d.c.)  Here is an example:
 
      $ echo a b c d e f | awk '{ print "NF =", NF;
@@ -3236,10 +3248,10 @@ value of `NF' and recomputes `$0'.  (d.c.)  Here is an example:
      -| NF = 6
      -| a b c
 
-*Caution:* Some versions of `awk' don't rebuild `$0' when `NF' is
+   *Caution:* Some versions of `awk' don't rebuild `$0' when `NF' is
 decremented. Caveat emptor.
 
-Finally, there are times when it is convenient to force `awk' to
+   Finally, there are times when it is convenient to force `awk' to
 rebuild the entire record, using the current value of the fields and
 `OFS'.  To do this, use the seemingly innocuous assignment:
 
@@ -3249,11 +3261,11 @@ rebuild the entire record, using the current value of the fields and
 This forces `awk' rebuild the record.  It does help to add a comment,
 as we've shown here.
 
-There is a flip side to the relationship between `$0' and the fields.
-Any assignment to `$0' causes the record to be reparsed into fields
-using the _current_ value of `FS'.  This also applies to any built-in
-function that updates `$0', such as `sub' and `gsub' (*note String
-Functions::).
+   There is a flip side to the relationship between `$0' and the
+fields.  Any assignment to `$0' causes the record to be reparsed into
+fields using the _current_ value of `FS'.  This also applies to any
+built-in function that updates `$0', such as `sub' and `gsub' (*note
+String Functions::).
 
 
 File: gawk.info,  Node: Field Separators,  Next: Constant Size,  Prev: Changing Fields,  Up: Reading Files
@@ -3268,26 +3280,27 @@ File: gawk.info,  Node: Field Separators,  Next: Constant Size,  Prev: Changing
 * Command Line Field Separator:: Setting `FS' from the command-line.
 * Field Splitting Summary::      Some final points and a summary table.
 
-The "field separator", which is either a single character or a regular
-expression, controls the way `awk' splits an input record into fields.
-`awk' scans the input record for character sequences that match the
-separator; the fields themselves are the text between the matches.
+   The "field separator", which is either a single character or a
+regular expression, controls the way `awk' splits an input record into
+fields.  `awk' scans the input record for character sequences that
+match the separator; the fields themselves are the text between the
+matches.
 
-In the examples that follow, we use the bullet symbol (*) to represent
-spaces in the output.  If the field separator is `oo', then the
-following line:
+   In the examples that follow, we use the bullet symbol (*) to
+represent spaces in the output.  If the field separator is `oo', then
+the following line:
 
      moo goo gai pan
 
 is split into three fields: `m', `*g', and `*gai*pan'.  Note the
 leading spaces in the values of the second and third fields.
 
-The field separator is represented by the built-in variable `FS'.
+   The field separator is represented by the built-in variable `FS'.
 Shell programmers take note:  `awk' does _not_ use the name `IFS' that
 is used by the POSIX-compliant shells (such as the Unix Bourne shell,
 `sh', or `bash').
 
-The value of `FS' can be changed in the `awk' program with the
+   The value of `FS' can be changed in the `awk' program with the
 assignment operator, `=' (*note Assignment Ops::).  Often the right
 time to do this is at the beginning of execution before any input has
 been processed, so that the very first record is read with the proper
@@ -3303,7 +3316,7 @@ Given the input line:
 
 this `awk' program extracts and prints the string `*29*Oak*St.'.
 
-Sometimes the input data contains separator characters that don't
+   Sometimes the input data contains separator characters that don't
 separate fields the way you thought they would.  For instance, the
 person's name in the example we just used might have a title or suffix
 attached, such as:
@@ -3317,7 +3330,7 @@ characters carefully to prevent such problems.  (If the data is not in
 a form that is easy to process, perhaps you can massage it first with a
 separate `awk' program.)
 
-Fields are normally separated by whitespace sequences (spaces, tabs,
+   Fields are normally separated by whitespace sequences (spaces, tabs,
 and newlines), not by single spaces.  Two spaces in a row do not
 delimit an empty field.  The default value of the field separator `FS'
 is a string containing a single space, `" "'.  If `awk' interpreted
@@ -3327,7 +3340,7 @@ The reason this does not happen is that a single space as the value of
 `FS' is a special case--it is taken to specify the default manner of
 delimiting fields.
 
-If `FS' is any other single character, such as `","', then each
+   If `FS' is any other single character, such as `","', then each
 occurrence of that character separates two fields.  Two consecutive
 occurrences delimit an empty field.  If the character occurs at the
 beginning or the end of the line, that too delimits an empty field.  The
@@ -3353,18 +3366,19 @@ space and a TAB into a field separator.  (`\t' is an "escape sequence"
 that stands for a TAB; *note Escape Sequences::, for the complete list
 of similar escape sequences.)
 
-For a less trivial example of a regular expression, try using single
+   For a less trivial example of a regular expression, try using single
 spaces to separate fields the way single commas are used.  `FS' can be
 set to `"[ ]"' (left bracket, space, right bracket).  This regular
 expression matches a single space and nothing else (*note Regexp::).
 
-There is an important difference between the two cases of `FS = " "' (a
-single space) and `FS = "[ \t\n]+"' (a regular expression matching one
-or more spaces, tabs, or newlines).  For both values of `FS', fields
-are separated by "runs" (multiple adjacent occurrences) of spaces, tabs,
-and/or newlines.  However, when the value of `FS' is `" "', `awk' first
-strips leading and trailing whitespace from the record and then decides
-where the fields are.  For example, the following pipeline prints `b':
+   There is an important difference between the two cases of `FS = " "'
+(a single space) and `FS = "[ \t\n]+"' (a regular expression matching
+one or more spaces, tabs, or newlines).  For both values of `FS',
+fields are separated by "runs" (multiple adjacent occurrences) of
+spaces, tabs, and/or newlines.  However, when the value of `FS' is
+`" "', `awk' first strips leading and trailing whitespace from the
+record and then decides where the fields are.  For example, the
+following pipeline prints `b':
 
      $ echo ' a b c d ' | awk '{ print $2 }'
      -| b
@@ -3378,8 +3392,8 @@ letter):
 
 In this case, the first field is "null" or empty.
 
-The stripping of leading and trailing whitespace also comes into play
-whenever `$0' is recomputed.  For instance, study this pipeline:
+   The stripping of leading and trailing whitespace also comes into
+play whenever `$0' is recomputed.  For instance, study this pipeline:
 
      $ echo '   a b c d' | awk '{ print; $2 = $2; print }'
      -|    a b c d
@@ -3412,8 +3426,8 @@ record becomes a separate field.  For example:
      -| Field 2 is
      -| Field 3 is b
 
-Traditionally, the behavior of `FS' equal to `""' was not defined.  In
-this case, most versions of Unix `awk' simply treat the entire record
+   Traditionally, the behavior of `FS' equal to `""' was not defined.
+In this case, most versions of Unix `awk' simply treat the entire record
 as only having one field.  (d.c.)  In compatibility mode (*note
 Options::), if `FS' is the null string, then `gawk' also behaves this
 way.
@@ -3436,7 +3450,7 @@ command-line options: the `-F' and `-f' options have nothing to do with
 each other.  You can use both options at the same time to set the `FS'
 variable _and_ get an `awk' program from a file.
 
-The value used for the argument to `-F' is processed in exactly the
+   The value used for the argument to `-F' is processed in exactly the
 same way as assignments to the built-in variable `FS'.  Any special
 characters in the field separator must be escaped appropriately.  For
 example, to use a `\' as the field separator on the command line, you
@@ -3450,22 +3464,22 @@ Because `\' is used for quoting in the shell, `awk' sees `-F\\'.  Then
 Sequences::), finally yielding a single `\' to use for the field
 separator.
 
-As a special case, in compatibility mode (*note Options::), if the
+   As a special case, in compatibility mode (*note Options::), if the
 argument to `-F' is `t', then `FS' is set to the TAB character.  If you
 type `-F\t' at the shell, without any quotes, the `\' gets deleted, so
 `awk' figures that you really want your fields to be separated with
 tabs and not `t's.  Use `-v FS="t"' or `-F"[t]"' on the command line if
 you really do want to separate your fields with `t's.
 
-For example, let's use an `awk' program file called `baud.awk' that
+   For example, let's use an `awk' program file called `baud.awk' that
 contains the pattern `/300/' and the action `print $1':
 
      /300/   { print $1 }
 
-Let's also set `FS' to be the `-' character and run the program on the
-file `BBS-list'.  The following command prints a list of the names of
-the bulletin boards that operate at 300 baud and the first three digits
-of their phone numbers:
+   Let's also set `FS' to be the `-' character and run the program on
+the file `BBS-list'.  The following command prints a list of the names
+of the bulletin boards that operate at 300 baud and the first three
+digits of their phone numbers:
 
      $ awk -F- -f baud.awk BBS-list
      -| aardvark     555
@@ -3485,23 +3499,23 @@ looked like this:
 
      alpo-net     555-3412     2400/1200/300     A
 
-The `-' as part of the system's name was used as the field separator,
-instead of the `-' in the phone number that was originally intended.
-This demonstrates why you have to be careful in choosing your field and
-record separators.
+   The `-' as part of the system's name was used as the field
+separator, instead of the `-' in the phone number that was originally
+intended.  This demonstrates why you have to be careful in choosing
+your field and record separators.
 
-Perhaps the most common use of a single character as the field
+   Perhaps the most common use of a single character as the field
 separator occurs when processing the Unix system password file.  On
 many Unix systems, each user has a separate entry in the system password
 file, one line per user.  The information in these lines is separated
-by colons.  The first field is the user's logon name and the second is
+by colons.  The first field is the user's login name and the second is
 the user's (encrypted or shadow) password.  A password file entry might
 look like this:
 
      arnold:xyzzy:2076:10:Arnold Robbins:/home/arnold:/bin/bash
 
-The following program searches the system password file and prints the
-entries for users who have no password:
+   The following program searches the system password file and prints
+the entries for users who have no password:
 
      awk -F: '$2 == ""' /etc/passwd
 
@@ -3520,8 +3534,8 @@ occurrences of any two characters."  If instead you want fields to be
 separated by a literal period followed by any single character, use `FS
 = "\\.."'.
 
-The following table summarizes how fields are split, based on the value
-of `FS' (`==' means "is equal to"):
+   The following table summarizes how fields are split, based on the
+value of `FS' (`==' means "is equal to"):
 
 `FS == " "'
      Fields are separated by runs of whitespace.  Leading and trailing
@@ -3552,12 +3566,12 @@ this means that if you change the value of `FS' after a record is read,
 the value of the fields (i.e., how they were split) should reflect the
 old value of `FS', not the new one.
 
-However, many implementations of `awk' do not work this way.  Instead,
-they defer splitting the fields until a field is actually referenced.
-The fields are split using the _current_ value of `FS'!  (d.c.)  This
-behavior can be difficult to diagnose. The following example
-illustrates the difference between the two methods.  (The `sed'(1)
-command prints just the first line of `/etc/passwd'.)
+   However, many implementations of `awk' do not work this way.
+Instead, they defer splitting the fields until a field is actually
+referenced.  The fields are split using the _current_ value of `FS'!
+(d.c.)  This behavior can be difficult to diagnose. The following
+example illustrates the difference between the two methods.  (The
+`sed'(1) command prints just the first line of `/etc/passwd'.)
 
      sed 1q /etc/passwd | awk '{ FS = ":" ; print $1 }'
 
@@ -3588,9 +3602,9 @@ alphabetic character while ignoring case, use a regexp that will do it
 for you.  E.g., `FS = "[c]"'.  In this case, `IGNORECASE' will take
 effect.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The `sed' utility is a "stream editor."  Its behavior is also
+   (1) The `sed' utility is a "stream editor."  Its behavior is also
 defined by the POSIX standard.
 
 
@@ -3608,21 +3622,22 @@ nature arises in the input for old Fortran programs where numbers are
 run together, or in the output of programs that did not anticipate the
 use of their output as input for other programs.
 
-An example of the latter is a table where all the columns are lined up
-by the use of a variable number of spaces and _empty fields are just
+   An example of the latter is a table where all the columns are lined
+up by the use of a variable number of spaces and _empty fields are just
 spaces_.  Clearly, `awk''s normal field splitting based on `FS' does
 not work well in this case.  Although a portable `awk' program can use
 a series of `substr' calls on `$0' (*note String Functions::), this is
 awkward and inefficient for a large number of fields.
 
-The splitting of an input record into fixed-width fields is specified by
-assigning a string containing space-separated numbers to the built-in
-variable `FIELDWIDTHS'.  Each number specifies the width of the field,
-_including_ columns between fields.  If you want to ignore the columns
-between fields, you can specify the width as a separate field that is
-subsequently ignored.  It is a fatal error to supply a field width that
-is not a positive number.  The following data is the output of the Unix
-`w' utility.  It is useful to illustrate the use of `FIELDWIDTHS':
+   The splitting of an input record into fixed-width fields is
+specified by assigning a string containing space-separated numbers to
+the built-in variable `FIELDWIDTHS'.  Each number specifies the width
+of the field, _including_ columns between fields.  If you want to
+ignore the columns between fields, you can specify the width as a
+separate field that is subsequently ignored.  It is a fatal error to
+supply a field width that is not a positive number.  The following data
+is the output of the Unix `w' utility.  It is useful to illustrate the
+use of `FIELDWIDTHS':
 
       10:06pm  up 21 days, 14:04,  23 users
      User     tty       login  idle   JCPU   PCPU  what
@@ -3635,8 +3650,8 @@ is not a positive number.  The following data is the output of the Unix
      brent    ttyp0    26Jun91  4:46  26:46   4:41  bash
      dave     ttyq4    26Jun9115days     46     46  wnewmail
 
-The following program takes the above input, converts the idle time to
-number of seconds, and prints out the first two fields and the
+   The following program takes the above input, converts the idle time
+to number of seconds, and prints out the first two fields and the
 calculated idle time:
 
      NOTE: This program uses a number of `awk' features that haven't
@@ -3658,7 +3673,7 @@ calculated idle time:
          print $1, $2, idle
      }
 
-Running the program on the data produces the following results:
+   Running the program on the data produces the following results:
 
      hzuo      ttyV0  0
      hzang     ttyV3  50
@@ -3669,21 +3684,21 @@ Running the program on the data produces the following results:
      brent     ttyp0  286
      dave      ttyq4  1296000
 
-Another (possibly more practical) example of fixed-width input data is
-the input from a deck of balloting cards.  In some parts of the United
-States, voters mark their choices by punching holes in computer cards.
-These cards are then processed to count the votes for any particular
-candidate or on any particular issue.  Because a voter may choose not to
-vote on some issue, any column on the card may be empty.  An `awk'
-program for processing such data could use the `FIELDWIDTHS' feature to
-simplify reading the data.  (Of course, getting `gawk' to run on a
-system with card readers is another story!)
-
-Assigning a value to `FS' causes `gawk' to use `FS' for field splitting
-again.  Use `FS = FS' to make this happen, without having to know the
-current value of `FS'.  In order to tell which kind of field splitting
-is in effect, use `PROCINFO["FS"]' (*note Auto-set::).  The value is
-`"FS"' if regular field splitting is being used, or it is
+   Another (possibly more practical) example of fixed-width input data
+is the input from a deck of balloting cards.  In some parts of the
+United States, voters mark their choices by punching holes in computer
+cards.  These cards are then processed to count the votes for any
+particular candidate or on any particular issue.  Because a voter may
+choose not to vote on some issue, any column on the card may be empty.
+An `awk' program for processing such data could use the `FIELDWIDTHS'
+feature to simplify reading the data.  (Of course, getting `gawk' to
+run on a system with card readers is another story!)
+
+   Assigning a value to `FS' causes `gawk' to use `FS' for field
+splitting again.  Use `FS = FS' to make this happen, without having to
+know the current value of `FS'.  In order to tell which kind of field
+splitting is in effect, use `PROCINFO["FS"]' (*note Auto-set::).  The
+value is `"FS"' if regular field splitting is being used, or it is
 `"FIELDWIDTHS"' if fixed-width field splitting is being used:
 
      if (PROCINFO["FS"] == "FS")
@@ -3691,7 +3706,7 @@ is in effect, use `PROCINFO["FS"]' (*note Auto-set::).  The value is
      else
          FIXED-WIDTH FIELD SPLITTING ...
 
-This information is useful when writing a function that needs to
+   This information is useful when writing a function that needs to
 temporarily change `FS' or `FIELDWIDTHS', read some records, and then
 restore the original settings (*note Passwd Functions::, for an example
 of such a function).
@@ -3706,23 +3721,23 @@ In some databases, a single line cannot conveniently hold all the
 information in one entry.  In such cases, you can use multiline
 records.  The first step in doing this is to choose your data format.
 
-One technique is to use an unusual character or string to separate
+   One technique is to use an unusual character or string to separate
 records.  For example, you could use the formfeed character (written
 `\f' in `awk', as in C) to separate them, making each record a page of
 the file.  To do this, just set the variable `RS' to `"\f"' (a string
 containing the formfeed character).  Any other character could equally
 well be used, as long as it won't be part of the data in a record.
 
-Another technique is to have blank lines separate records.  By a special
-dispensation, an empty string as the value of `RS' indicates that
-records are separated by one or more blank lines.  When `RS' is set to
-the empty string, each record always ends at the first blank line
+   Another technique is to have blank lines separate records.  By a
+special dispensation, an empty string as the value of `RS' indicates
+that records are separated by one or more blank lines.  When `RS' is set
+to the empty string, each record always ends at the first blank line
 encountered.  The next record doesn't start until the first nonblank
 line that follows.  No matter how many blank lines appear in a row, they
 all act as one record separator.  (Blank lines must be completely
 empty; lines that contain only whitespace do not count.)
 
-You can achieve the same effect as `RS = ""' by assigning the string
+   You can achieve the same effect as `RS = ""' by assigning the string
 `"\n\n+"' to `RS'. This regexp matches the newline at the end of the
 record and one or more blank lines after the record.  In addition, a
 regular expression always matches the longest possible sequence when
@@ -3731,21 +3746,21 @@ doesn't start until the first nonblank line that follows--no matter how
 many blank lines appear in a row, they are considered one record
 separator.
 
-There is an important difference between `RS = ""' and `RS = "\n\n+"'.
-In the first case, leading newlines in the input data file are ignored,
-and if a file ends without extra blank lines after the last record, the
-final newline is removed from the record.  In the second case, this
-special processing is not done.  (d.c.)
+   There is an important difference between `RS = ""' and `RS =
+"\n\n+"'. In the first case, leading newlines in the input data file
+are ignored, and if a file ends without extra blank lines after the
+last record, the final newline is removed from the record.  In the
+second case, this special processing is not done.  (d.c.)
 
-Now that the input is separated into records, the second step is to
+   Now that the input is separated into records, the second step is to
 separate the fields in the record.  One way to do this is to divide each
 of the lines into fields in the normal manner.  This happens by default
 as the result of a special feature.  When `RS' is set to the empty
-string, _and_ `FS' is a set to a single character, the newline
-character _always_ acts as a field separator.  This is in addition to
-whatever field separations result from `FS'.(1)
+string, _and_ `FS' is set to a single character, the newline character
+_always_ acts as a field separator.  This is in addition to whatever
+field separations result from `FS'.(1)
 
-The original motivation for this special exception was probably to
+   The original motivation for this special exception was probably to
 provide useful behavior in the default case (i.e., `FS' is equal to
 `" "').  This feature can be a problem if you really don't want the
 newline character to separate fields, because there is no way to
@@ -3756,12 +3771,12 @@ special feature in a different way, by making `FS' into a regexp for
 that single character.  For example, if the field separator is a
 percent character, instead of `FS = "%"', use `FS = "[%]"'.
 
-Another way to separate fields is to put each field on a separate line:
-to do this, just set the variable `FS' to the string `"\n"'.  (This
-single character seperator matches a single newline.)  A practical
-example of a data file organized this way might be a mailing list,
-where each entry is separated by blank lines.  Consider a mailing list
-in a file named `addresses', which looks like this:
+   Another way to separate fields is to put each field on a separate
+line: to do this, just set the variable `FS' to the string `"\n"'.
+(This single character separator matches a single newline.)  A
+practical example of a data file organized this way might be a mailing
+list, where each entry is separated by blank lines.  Consider a mailing
+list in a file named `addresses', which looks like this:
 
      Jane Doe
      123 Main Street
@@ -3787,7 +3802,7 @@ A simple program to process this file is as follows:
            print ""
      }
 
-Running the program produces the following output:
+   Running the program produces the following output:
 
      $ awk -f addrs.awk addresses
      -| Name is: Jane Doe
@@ -3800,7 +3815,7 @@ Running the program produces the following output:
      -|
      ...
 
-*Note Labels Program::, for a more realistic program that deals with
+   *Note Labels Program::, for a more realistic program that deals with
 address lists.  The following table summarizes how records are split,
 based on the value of `RS'.  (`==' means "is equal to.")
 
@@ -3814,10 +3829,10 @@ based on the value of `RS'.  (`==' means "is equal to.")
      Multiple successive occurrences delimit empty records.
 
 `RS == ""'
-     Records are separated by runs of blank lines.  The newline
-     character always serves as a field separator, in addition to
-     whatever value `FS' may have. Leading and trailing newlines in a
-     file are ignored.
+     Records are separated by runs of blank lines.  When `FS' is a
+     single character, then the newline character always serves as a
+     field separator, in addition to whatever value `FS' may have.
+     Leading and trailing newlines in a file are ignored.
 
 `RS == REGEXP'
      Records are separated by occurrences of characters that match
@@ -3825,12 +3840,12 @@ based on the value of `RS'.  (`==' means "is equal to.")
      records.  (This is a `gawk' extension; it is not specified by the
      POSIX standard.)
 
-In all cases, `gawk' sets `RT' to the input text that matched the value
-specified by `RS'.
+   In all cases, `gawk' sets `RT' to the input text that matched the
+value specified by `RS'.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) When `FS' is the null string (`""') or a regexp, this special
+   (1) When `FS' is the null string (`""') or a regexp, this special
 feature of `RS' does not apply.  It does apply to the default field
 separator of a single space: `FS = " "'.
 
@@ -3846,20 +3861,20 @@ output from another program) or from the files specified on the command
 line.  The `awk' language has a special built-in command called
 `getline' that can be used to read input under your explicit control.
 
-The `getline' command is used in several different ways and should
+   The `getline' command is used in several different ways and should
 _not_ be used by beginners.  The examples that follow the explanation
 of the `getline' command include material that has not been covered
 yet.  Therefore, come back and study the `getline' command _after_ you
 have reviewed the rest of this Info file and have a good knowledge of
 how `awk' works.
 
-The `getline' command returns one if it finds a record and zero if it
-encounters the end of the file.  If there is some error in getting a
+   The `getline' command returns one if it finds a record and zero if
+it encounters the end of the file.  If there is some error in getting a
 record, such as a file that cannot be opened, then `getline' returns
 -1.  In this case, `gawk' sets the variable `ERRNO' to a string
 describing the error that occurred.
 
-In the following examples, COMMAND stands for a string value that
+   In the following examples, COMMAND stands for a string value that
 represents a shell command.
 
 * Menu:
@@ -3902,7 +3917,6 @@ processing on the next record _right now_.  For example:
                          print m > "/dev/stderr"
                          exit
                     }
-                    t = -1
                     u = index($0, "*/")
                }
                # substr expression will be "" if */
@@ -3912,14 +3926,14 @@ processing on the next record _right now_.  For example:
           print $0
      }
 
-This `awk' program deletes all C-style comments (`/* ...  */') from the
+   This `awk' program deletes C-style comments (`/* ...  */') from the
 input.  By replacing the `print $0' with other statements, you could
 perform more complicated processing on the decommented input, such as
 searching for matches of a regular expression.  (This program has a
 subtle problem--it does not work if one comment ends and another begins
 on the same line.)
 
-This form of the `getline' command sets `NF', `NR', `FNR', and the
+   This form of the `getline' command sets `NF', `NR', `FNR', and the
 value of `$0'.
 
      NOTE: The new value of `$0' is used to test the patterns of any
@@ -3965,10 +3979,10 @@ and produces these results:
      phore
      free
 
-The `getline' command used in this way sets only the variables `NR' and
-`FNR' (and of course, VAR).  The record is not split into fields, so
-the values of the fields (including `$0') and the value of `NF' do not
-change.
+   The `getline' command used in this way sets only the variables `NR'
+and `FNR' (and of course, VAR).  The record is not split into fields,
+so the values of the fields (including `$0') and the value of `NF' do
+not change.
 
 
 File: gawk.info,  Node: Getline/File,  Next: Getline/Variable/File,  Prev: Getline/Variable,  Up: Getline
@@ -3991,17 +4005,17 @@ with a value equal to 10 in the current input file:
               print
      }
 
-Because the main input stream is not used, the values of `NR' and `FNR'
-are not changed. However, the record it reads is split into fields in
-the normal manner, so the values of `$0' and the other fields are
-changed, resulting in a new value of `NF'.
+   Because the main input stream is not used, the values of `NR' and
+`FNR' are not changed. However, the record it reads is split into
+fields in the normal manner, so the values of `$0' and the other fields
+are changed, resulting in a new value of `NF'.
 
-According to POSIX, `getline < EXPRESSION' is ambiguous if EXPRESSION
-contains unparenthesized operators other than `$'; for example,
-`getline < dir "/" file' is ambiguous because the concatenation
-operator is not parenthesized.  You should write it as `getline < (dir
-"/" file)' if you want your program to be portable to other `awk'
-implementations.
+   According to POSIX, `getline < EXPRESSION' is ambiguous if
+EXPRESSION contains unparenthesized operators other than `$'; for
+example, `getline < dir "/" file' is ambiguous because the
+concatenation operator is not parenthesized.  You should write it as
+`getline < (dir "/" file)' if you want your program to be portable to
+other `awk' implementations.
 
 
 File: gawk.info,  Node: Getline/Variable/File,  Next: Getline/Pipe,  Prev: Getline/File,  Up: Getline
@@ -4013,7 +4027,7 @@ Use `getline VAR < FILE' to read input from the file FILE, and put it
 in the variable VAR.  As above, FILE is a string-valued expression that
 specifies the file from which to read.
 
-In this version of `getline', none of the built-in variables are
+   In this version of `getline', none of the built-in variables are
 changed and the record is not split into fields.  The only variable
 changed is VAR.  For example, the following program copies all the
 input files to the output, except for records that say
@@ -4029,15 +4043,15 @@ file FILENAME:
                print
      }
 
-Note here how the name of the extra input file is not built into the
+   Note here how the name of the extra input file is not built into the
 program; it is taken directly from the data, specifically from the
 second field on the `@include' line.
 
-The `close' function is called to ensure that if two identical
+   The `close' function is called to ensure that if two identical
 `@include' lines appear in the input, the entire specified file is
 included twice.  *Note Close Files And Pipes::.
 
-One deficiency of this program is that it does not process nested
+   One deficiency of this program is that it does not process nested
 `@include' statements (i.e., `@include' statements in included files)
 the way a true macro preprocessor would.  *Note Igawk Program::, for a
 program that does handle nested `@include' statements.
@@ -4090,16 +4104,25 @@ Notice that this program ran the command `who' and printed the previous
 result.  (If you try this program yourself, you will of course get
 different results, depending upon who is logged in on your system.)
 
-This variation of `getline' splits the record into fields, sets the
+   This variation of `getline' splits the record into fields, sets the
 value of `NF', and recomputes the value of `$0'.  The values of `NR'
 and `FNR' are not changed.
 
-According to POSIX, `EXPRESSION | getline' is ambiguous if EXPRESSION
-contains unparenthesized operators other than `$'--for example,
-`"echo " "date" | getline' is ambiguous because the concatenation
-operator is not parenthesized.  You should write it as `("echo "
-"date") | getline' if you want your program to be portable to other
-`awk' implementations.
+   According to POSIX, `EXPRESSION | getline' is ambiguous if
+EXPRESSION contains unparenthesized operators other than `$'--for
+example, `"echo " "date" | getline' is ambiguous because the
+concatenation operator is not parenthesized.  You should write it as
+`("echo " "date") | getline' if you want your program to be portable to
+other `awk' implementations.
+
+     NOTE: Unfortunately, `gawk' has not been consistent in its
+     treatment of a construct like `"echo " "date" | getline'. Up to
+     and including version 3.1.1 of `gawk', it was treated as `("echo "
+     "date") | getline'.  (This how Unix `awk' behaves.)  From 3.1.2
+     through 3.1.5, it was treated as `"echo " ("date" | getline)'.
+     (This is how `mawk' behaves.)  Starting with version 3.1.6, the
+     earlier behavior was reinstated.  In short, _always_ use explicit
+     parentheses, and then you won't have to worry.
 
 
 File: gawk.info,  Node: Getline/Variable/Pipe,  Next: Getline/Coprocess,  Prev: Getline/Pipe,  Up: Getline
@@ -4118,10 +4141,10 @@ following program reads the current date and time into the variable
           print "Report printed on " current_time
      }
 
-In this version of `getline', none of the built-in variables are
+   In this version of `getline', none of the built-in variables are
 changed and the record is not split into fields.
 
-According to POSIX, `EXPRESSION | getline VAR' is ambiguous if
+   According to POSIX, `EXPRESSION | getline VAR' is ambiguous if
 EXPRESSION contains unparenthesized operators other than `$'; for
 example, `"echo " "date" | getline VAR' is ambiguous because the
 concatenation operator is not parenthesized. You should write it as
@@ -4138,9 +4161,9 @@ Input into `getline' from a pipe is a one-way operation.  The command
 that is started with `COMMAND | getline' only sends data _to_ your
 `awk' program.
 
-On occasion, you might want to send data to another program for
-processing and then read the results back.  `gawk' allows you start a
-"coprocess", with which two-way communications are possible.  This is
+   On occasion, you might want to send data to another program for
+processing and then read the results back.  `gawk' allows you to start
+a "coprocess", with which two-way communications are possible.  This is
 done with the `|&' operator.  Typically, you write data to the
 coprocess first and then read results back, as shown in the following:
 
@@ -4149,12 +4172,12 @@ coprocess first and then read results back, as shown in the following:
 
 which sends a query to `db_server' and then reads the results.
 
-The values of `NR' and `FNR' are not changed, because the main input
+   The values of `NR' and `FNR' are not changed, because the main input
 stream is not used.  However, the record is split into fields in the
 normal manner, thus changing the values of `$0', of the other fields,
 and of `NF'.
 
-Coprocesses are an advanced feature. They are discussed here only
+   Coprocesses are an advanced feature. They are discussed here only
 because this is the minor node on `getline'.  *Note Two-way I/O::,
 where coprocesses are discussed in more detail.
 
@@ -4168,11 +4191,11 @@ When you use `COMMAND |& getline VAR', the output from the coprocess
 COMMAND is sent through a two-way pipe to `getline' and into the
 variable VAR.
 
-In this version of `getline', none of the built-in variables are
+   In this version of `getline', none of the built-in variables are
 changed and the record is not split into fields.  The only variable
 changed is VAR.
 
-Coprocesses are an advanced feature. They are discussed here only
+   Coprocesses are an advanced feature. They are discussed here only
 because this is the minor node on `getline'.  *Note Two-way I/O::,
 where coprocesses are discussed in more detail.
 
@@ -4216,27 +4239,19 @@ File: gawk.info,  Node: Getline Summary,  Prev: Getline Notes,  Up: Getline
 3.8.10 Summary of `getline' Variants
 ------------------------------------
 
-*Note table-getline-variants:: summarizes the eight variants of
+*note table-getline-variants:: summarizes the eight variants of
 `getline', listing which built-in variables are set by each one.
 
 Variant                   Effect
---------------------------------------------------------------------------
+-------------------------------------------------------------------------- 
 `getline'                 Sets `$0', `NF', `FNR', and `NR'
---------------------------------------------------------------------------
 `getline' VAR             Sets VAR, `FNR', and `NR'
---------------------------------------------------------------------------
 `getline <' FILE          Sets `$0' and `NF'
---------------------------------------------------------------------------
 `getline VAR < FILE'      Sets VAR
---------------------------------------------------------------------------
 COMMAND `| getline'       Sets `$0' and `NF'
---------------------------------------------------------------------------
 COMMAND `| getline' VAR   Sets VAR
---------------------------------------------------------------------------
 COMMAND `|& getline'      Sets `$0' and `NF'.  This is a `gawk' extension
---------------------------------------------------------------------------
 COMMAND `|& getline' VAR  Sets VAR.  This is a `gawk' extension
---------------------------------------------------------------------------
 
 Table 3.1: getline Variants and What They Set
 
@@ -4252,7 +4267,7 @@ and the `printf' statement for fancier formatting.  The `print'
 statement is not limited when computing _which_ values to print.
 However, with two exceptions, you cannot specify _how_ to print
 them--how many columns, whether to use exponential notation or not, and
-so on.  (For the exceptions, *note Output Separators::, and *Note
+so on.  (For the exceptions, *note Output Separators::, and *note
 OFMT::.)  For printing with specifications, you need the `printf'
 statement (*note Printf::).
 
@@ -4293,15 +4308,15 @@ parentheses are necessary if any of the item expressions uses the `>'
 relational operator; otherwise it could be confused with a redirection
 (*note Redirection::).
 
-The items to print can be constant strings or numbers, fields of the
+   The items to print can be constant strings or numbers, fields of the
 current record (such as `$1'), variables, or any `awk' expression.
 Numeric values are converted to strings and then printed.
 
-The simple statement `print' with no items is equivalent to `print $0':
-it prints the entire current record.  To print a blank line, use `print
-""', where `""' is the empty string.  To print a fixed piece of text,
-use a string constant, such as `"Don't Panic"', as one item.  If you
-forget to use the double-quote characters, your text is taken as an
+   The simple statement `print' with no items is equivalent to `print
+$0': it prints the entire current record.  To print a blank line, use
+`print ""', where `""' is the empty string.  To print a fixed piece of
+text, use a string constant, such as `"Don't Panic"', as one item.  If
+you forget to use the double-quote characters, your text is taken as an
 `awk' expression, and you will probably get an error.  Keep in mind
 that a space is printed between any two items.
 
@@ -4317,17 +4332,18 @@ contains a newline, the newline is output along with the rest of the
 string.  A single `print' statement can make any number of lines this
 way.
 
-The following is an example of printing a string that contains embedded
-newlines (the `\n' is an escape sequence, used to represent the newline
-character; *note Escape Sequences::):
+   The following is an example of printing a string that contains
+embedded newlines (the `\n' is an escape sequence, used to represent
+the newline character; *note Escape Sequences::):
 
      $ awk 'BEGIN { print "line one\nline two\nline three" }'
      -| line one
      -| line two
      -| line three
 
-The next example, which is run on the `inventory-shipped' file, prints
-the first two fields of each input record, with a space between them:
+   The next example, which is run on the `inventory-shipped' file,
+prints the first two fields of each input record, with a space between
+them:
 
      $ awk '{ print $1, $2 }' inventory-shipped
      -| Jan 13
@@ -4335,7 +4351,7 @@ the first two fields of each input record, with a space between them:
      -| Mar 15
      ...
 
-A common mistake in using the `print' statement is to omit the comma
+   A common mistake in using the `print' statement is to omit the comma
 between two items.  This often has the effect of making the items run
 together in the output, with no space.  The reason for this is that
 juxtaposing two string expressions in `awk' means to concatenate them.
@@ -4347,7 +4363,7 @@ Here is the same program, without the comma:
      -| Mar15
      ...
 
-To someone unfamiliar with the `inventory-shipped' file, neither
+   To someone unfamiliar with the `inventory-shipped' file, neither
 example's output makes much sense.  A heading line at the beginning
 would make it clearer.  Let's add some headings to our table of months
 (`$1') and green crates shipped (`$2').  We do this using the `BEGIN'
@@ -4374,7 +4390,7 @@ fields:
                   print "----- ------" }
                 { print $1, "     ", $2 }' inventory-shipped
 
-Lining up columns this way can get pretty complicated when there are
+   Lining up columns this way can get pretty complicated when there are
 many columns to fix.  Counting spaces for two or three columns is
 simple, but any more than this can take up a lot of time. This is why
 the `printf' statement was created (*note Printf::); one of its
@@ -4398,15 +4414,15 @@ space is only the default.  Any string of characters may be used as the
 initial value of this variable is the string `" "'--that is, a single
 space.
 
-The output from an entire `print' statement is called an "output
+   The output from an entire `print' statement is called an "output
 record".  Each `print' statement outputs one output record, and then
 outputs a string called the "output record separator" (or `ORS').  The
 initial value of `ORS' is the string `"\n"'; i.e., a newline character.
 Thus, each `print' statement normally makes a separate line.
 
-In order to change how output fields and records are separated, assign
-new values to the variables `OFS' and `ORS'.  The usual place to do
-this is in the `BEGIN' rule (*note BEGIN/END::), so that it happens
+   In order to change how output fields and records are separated,
+assign new values to the variables `OFS' and `ORS'.  The usual place to
+do this is in the `BEGIN' rule (*note BEGIN/END::), so that it happens
 before any input is processed.  It can also be done with assignments on
 the command line, before the names of the input files, or using the
 `-v' command-line option (*note Options::).  The following example
@@ -4422,8 +4438,8 @@ semicolon, with a blank line added after each newline:
      -| barfly;555-7685
      ...
 
-If the value of `ORS' does not contain a newline, the program's output
-is run together on a single line.
+   If the value of `ORS' does not contain a newline, the program's
+output is run together on a single line.
 
 
 File: gawk.info,  Node: OFMT,  Next: Printf,  Prev: Output Separators,  Up: Printing
@@ -4438,14 +4454,14 @@ that string.  `awk' uses the `sprintf' function to do this conversion
 `sprintf' function accepts a "format specification" that tells it how
 to format numbers (or strings), and that there are a number of
 different ways in which numbers can be formatted.  The different format
-specifications are discussed more fully in *Note Control Letters::.
+specifications are discussed more fully in *note Control Letters::.
 
-The built-in variable `OFMT' contains the default format specification
-that `print' uses with `sprintf' when it wants to convert a number to a
-string for printing.  The default value of `OFMT' is `"%.6g"'.  The way
-`print' prints numbers can be changed by supplying different format
-specifications as the value of `OFMT', as shown in the following
-example:
+   The built-in variable `OFMT' contains the default format
+specification that `print' uses with `sprintf' when it wants to convert
+a number to a string for printing.  The default value of `OFMT' is
+`"%.6g"'.  The way `print' prints numbers can be changed by supplying
+different format specifications as the value of `OFMT', as shown in the
+following example:
 
      $ awk 'BEGIN {
      >   OFMT = "%.0f"  # print numbers as integers (rounds)
@@ -4488,23 +4504,23 @@ A simple `printf' statement looks like this:
      printf FORMAT, ITEM1, ITEM2, ...
 
 The entire list of arguments may optionally be enclosed in parentheses.
-The parentheses are necessary if any of the item expressions use the
-`>' relational operator; otherwise, it can be confused with a
-redirection (*note Redirection::).
+The parentheses are necessary if any of the item expressions use the `>'
+relational operator; otherwise, it can be confused with a redirection
+(*note Redirection::).
 
-The difference between `printf' and `print' is the FORMAT argument.
+   The difference between `printf' and `print' is the FORMAT argument.
 This is an expression whose value is taken as a string; it specifies
 how to output each of the other arguments.  It is called the "format
 string".
 
-The format string is very similar to that in the ISO C library function
-`printf'.  Most of FORMAT is text to output verbatim.  Scattered among
-this text are "format specifiers"--one per item.  Each format specifier
-says to output the next item in the argument list at that place in the
-format.
+   The format string is very similar to that in the ISO C library
+function `printf'.  Most of FORMAT is text to output verbatim.
+Scattered among this text are "format specifiers"--one per item.  Each
+format specifier says to output the next item in the argument list at
+that place in the format.
 
-The `printf' statement does not automatically append a newline to its
-output.  It outputs only what the format string specifies.  So if a
+   The `printf' statement does not automatically append a newline to
+its output.  It outputs only what the format string specifies.  So if a
 newline is needed, you must include one in the format string.  The
 output separator variables `OFS' and `ORS' have no effect on `printf'
 statements. For example:
@@ -4562,7 +4578,7 @@ width.  Here is a list of the format-control letters:
 
      On systems supporting IEEE 754 floating point format, values
      representing negative infinity are formatted as `-inf' or
-     `-infinity', and positive infinity as `inf' and `-infinity'.  The
+     `-infinity', and positive infinity as `inf' and `infinity'.  The
      special "not a number" value formats as `-nan' or `nan'.
 
 `%F'
@@ -4570,7 +4586,7 @@ width.  Here is a list of the format-control letters:
      using uppercase letters.
 
      The `%F' format is a POSIX extension to ISO C; not all systems
-     support.  On those that don't, `gawk' uses `%f' instead.
+     support it.  On those that don't, `gawk' uses `%f' instead.
 
 `%g, %G'
      These print a number in either scientific notation or in
@@ -4600,8 +4616,8 @@ width.  Here is a list of the format-control letters:
 
      NOTE: When using the integer format-control letters for values
      that are outside the range of the widest C integer type, `gawk'
-     switches to the the `%g' format specifier. If `--lint' is provided
-     on the command line (*note Options::), `gawk' warns about this.
+     switches to the `%g' format specifier. If `--lint' is provided on
+     the command line (*note Options::), `gawk' warns about this.
      Other versions of `awk' may print invalid values or do something
      else entirely.  (d.c.)
 
@@ -4671,26 +4687,26 @@ which they may appear:
      effect when the field width is wider than the value to print.
 
 `''
-     A single quote or apostrohe character is a POSIX extension to ISO
+     A single quote or apostrophe character is a POSIX extension to ISO
      C.  It indicates that the integer part of a floating point value,
      or the entire part of an integer decimal value, should have a
      thousands-separator character in it.  This only works in locales
      that support such characters.  For example:
 
-          $ cat thousands.awk                                     Show source program
+          $ cat thousands.awk          Show source program
           -| BEGIN { printf "%'d\n", 1234567 }
-          $ LC_ALL=C gawk -f thousands.awk                        Run it in "C" locale
-          -| 1234567
-          $ LC_ALL=en_US.UTF-8 gawk -f thousands.awk              Run in US English UTF locale
-          -| 1,234,567
+          $ LC_ALL=C gawk -f thousands.awk
+          -| 1234567                   Results in "C" locale
+          $ LC_ALL=en_US.UTF-8 gawk -f thousands.awk
+          -| 1,234,567                 Results in US English UTF locale
 
      For more information about locales and internationalization issues,
-     see *Note Locales::.
+     see *note Locales::.
 
           NOTE: The `'' flag is a nice feature, but its use complicates
-          things: it now becomes difficult to use it in command-line
+          things: it becomes difficult to use it in command-line
           programs.  For information on appropriate quoting tricks, see
-          *Note Quoting::.
+          *note Quoting::.
 
 `WIDTH'
      This is a number specifying the desired minimum width of a field.
@@ -4737,7 +4753,7 @@ which they may appear:
 
      prints `foob'.
 
-The C library `printf''s dynamic WIDTH and PREC capability (for
+   The C library `printf''s dynamic WIDTH and PREC capability (for
 example, `"%*.*s"') is supported.  Instead of supplying explicit WIDTH
 and/or PREC values in the format string, they are passed in the
 argument list.  For example:
@@ -4764,7 +4780,7 @@ string, like so:
 
 This is not particularly easy to read but it does work.
 
-C programmers may be used to supplying additional `l', `L', and `h'
+   C programmers may be used to supplying additional `l', `L', and `h'
 modifiers in `printf' format strings. These are not valid in `awk'.
 Most `awk' implementations silently ignore these modifiers.  If
 `--lint' is provided on the command line (*note Options::), `gawk'
@@ -4800,16 +4816,16 @@ an aligned two-column table of names and phone numbers, as shown here:
      -| sdace      555-3430
      -| sabafoo    555-2127
 
-In this case, the phone numbers had to be printed as strings because
+   In this case, the phone numbers had to be printed as strings because
 the numbers are separated by a dash.  Printing the phone numbers as
 numbers would have produced just the first three digits: `555'.  This
 would have been pretty confusing.
 
-It wasn't necessary to specify a width for the phone numbers because
+   It wasn't necessary to specify a width for the phone numbers because
 they are last on their lines.  They don't need to have spaces after
 them.
 
-The table could be made to look even nicer by adding headings to the
+   The table could be made to look even nicer by adding headings to the
 tops of the columns.  This is done using the `BEGIN' pattern (*note
 BEGIN/END::) so that the headers are only printed once, at the
 beginning of the `awk' program:
@@ -4818,7 +4834,7 @@ beginning of the `awk' program:
                   print "----      ------" }
           { printf "%-10s %s\n", $1, $2 }' BBS-list
 
-The above example mixed `print' and `printf' statements in the same
+   The above example mixed `print' and `printf' statements in the same
 program.  Using just `printf' statements can produce the same results:
 
      awk 'BEGIN { printf "%-10s %s\n", "Name", "Number"
@@ -4829,15 +4845,15 @@ Printing each column heading with the same format specification used
 for the column elements ensures that the headings are aligned just like
 the columns.
 
-The fact that the same format specification is used three times can be
-emphasized by storing it in a variable, like this:
+   The fact that the same format specification is used three times can
+be emphasized by storing it in a variable, like this:
 
      awk 'BEGIN { format = "%-10s %s\n"
                   printf format, "Name", "Number"
                   printf format, "----", "------" }
           { printf format, $1, $2 }' BBS-list
 
-At this point, it would be a worthwhile exercise to use the `printf'
+   At this point, it would be a worthwhile exercise to use the `printf'
 statement to line up the headings and table data for the
 `inventory-shipped' example that was covered earlier in the minor node
 on the `print' statement (*note Print::).
@@ -4852,11 +4868,11 @@ So far, the output from `print' and `printf' has gone to the standard
 output, usually the terminal.  Both `print' and `printf' can also send
 their output to other places.  This is called "redirection".
 
-A redirection appears after the `print' or `printf' statement.
+   A redirection appears after the `print' or `printf' statement.
 Redirections in `awk' are written just like redirections in shell
 commands, except that they are written inside the `awk' program.
 
-There are four forms of output redirection: output to a file, output
+   There are four forms of output redirection: output to a file, output
 appended to a file, output through a pipe to another command, and output
 to a coprocess.  They are all shown for the `print' statement, but they
 work identically for `printf':
@@ -4929,7 +4945,7 @@ work identically for `printf':
      The message is built using string concatenation and saved in the
      variable `m'.  It's then sent down the pipeline to the `mail'
      program.  (The parentheses group the items to concatenate--see
-     *Note Concatenation::.)
+     *note Concatenation::.)
 
      The `close' function is called here because it's a good idea to
      close the pipe as soon as all the intended output has been sent to
@@ -4937,9 +4953,9 @@ work identically for `printf':
 
      This example also illustrates the use of a variable to represent a
      FILE or COMMAND--it is not necessary to always use a string
-     constant.  Using a variable is generally a good idea, because
-     `awk' requires that the string value be spelled identically every
-     time.
+     constant.  Using a variable is generally a good idea, because (if
+     you mean to refer to that same file or command) `awk' requires
+     that the string value be spelled identically every time.
 
 `print ITEMS |& COMMAND'
      This type of redirection prints the items to the input of COMMAND.
@@ -4949,15 +4965,16 @@ work identically for `printf':
      the `awk' program.
 
      This feature is a `gawk' extension, and is not available in POSIX
-     `awk'.  *Note Two-way I/O::, for a more complete discussion.
+     `awk'.  *Note Getline/Coprocess::, for a brief discussion.  *Note
+     Two-way I/O::, for a more complete discussion.
 
-Redirecting output using `>', `>>', `|', or `|&' asks the system to
+   Redirecting output using `>', `>>', `|', or `|&' asks the system to
 open a file, pipe, or coprocess only if the particular FILE or COMMAND
 you specify has not already been written to by your program or if it
 has been closed since it was last written to.
 
-It is a common error to use `>' redirection for the first `print' to a
-file, and then to use `>>' for subsequent output:
+   It is a common error to use `>' redirection for the first `print' to
+a file, and then to use `>>' for subsequent output:
 
      # clear the file
      print "Don't panic" > "guide.txt"
@@ -4968,12 +4985,15 @@ file, and then to use `>>' for subsequent output:
 This is indeed how redirections must be used from the shell.  But in
 `awk', it isn't necessary.  In this kind of case, a program should use
 `>' for all the `print' statements, since the output file is only
-opened once.
+opened once. (It happens that if you mix `>' and `>>' that output is
+produced in the expected order. However, mixing the operators for the
+same file is definitely poor style, and is confusing to readers of your
+program.)
 
-Many `awk' implementations limit the number of pipelines that an `awk'
-program may have open to just one!  In `gawk', there is no such limit.
-`gawk' allows a program to open as many pipelines as the underlying
-operating system permits.
+   Many `awk' implementations limit the number of pipelines that an
+`awk' program may have open to just one!  In `gawk', there is no such
+limit.  `gawk' allows a program to open as many pipelines as the
+underlying operating system permits.
 
 Advanced Notes: Piping into `sh'
 --------------------------------
@@ -4988,10 +5008,10 @@ lowercase.  The following program is both simple and efficient:
 
      END { close("sh") }
 
-The `tolower' function returns its argument string with all uppercase
-characters converted to lowercase (*note String Functions::).  The
-program builds up a list of command lines, using the `mv' utility to
-rename the files.  It then sends the list to the shell for execution.
+   The `tolower' function returns its argument string with all
+uppercase characters converted to lowercase (*note String Functions::).
+The program builds up a list of command lines, using the `mv' utility
+to rename the files.  It then sends the list to the shell for execution.
 
 
 File: gawk.info,  Node: Special Files,  Next: Close Files And Pipes,  Prev: Redirection,  Up: Printing
@@ -5025,7 +5045,7 @@ and `|' operators.  Standard error is typically used for writing error
 messages; the reason there are two separate streams, standard output
 and standard error, is so that they can be redirected separately.
 
-In other implementations of `awk', the only way to write an error
+   In other implementations of `awk', the only way to write an error
 message to standard error in an `awk' program is as follows:
 
      print "Serious error detected!" | "cat 1>&2"
@@ -5044,7 +5064,7 @@ happens, writing to the terminal is not correct.  In fact, if `awk' is
 run from a background job, it may not have a terminal at all.  Then
 opening `/dev/tty' fails.
 
-`gawk' provides special file names for accessing the three standard
+   `gawk' provides special file names for accessing the three standard
 streams, as well as any other inherited open files.  If the file name
 matches one of these special names when `gawk' redirects input or
 output, then it directly uses the stream that the file name stands for.
@@ -5066,14 +5086,14 @@ been ported to, not just those that are POSIX-compliant:
      the shell).  Unless special pains are taken in the shell from which
      `gawk' is invoked, only descriptors 0, 1, and 2 are available.
 
-The file names `/dev/stdin', `/dev/stdout', and `/dev/stderr' are
+   The file names `/dev/stdin', `/dev/stdout', and `/dev/stderr' are
 aliases for `/dev/fd/0', `/dev/fd/1', and `/dev/fd/2', respectively.
 However, they are more self-explanatory.  The proper way to write an
 error message in a `gawk' program is to use `/dev/stderr', like this:
 
      print "Serious error detected!" > "/dev/stderr"
 
-Note the use of quotes around the file name.  Like any other
+   Note the use of quotes around the file name.  Like any other
 redirection, the value must be a string.  It is a common error to omit
 the quotes, which leads to confusing results.
 
@@ -5126,9 +5146,9 @@ Pipes::).  The file names are:
      returned by the `getgroups' system call.  (Multiple groups may not
      be supported on all systems.)
 
-These special file names may be used on the command line as data files,
-as well as for I/O redirections within an `awk' program.  They may not
-be used as source files with the `-f' option.
+   These special file names may be used on the command line as data
+files, as well as for I/O redirections within an `awk' program.  They
+may not be used as source files with the `-f' option.
 
      NOTE: The special files that provide process-related information
      are now considered obsolete and will disappear entirely in the
@@ -5148,12 +5168,12 @@ using a special file name of the form:
 
      `/inet/PROTOCOL/LOCAL-PORT/REMOTE-HOST/REMOTE-PORT'
 
-The PROTOCOL is one of `tcp', `udp', or `raw', and the other fields
+   The PROTOCOL is one of `tcp', `udp', or `raw', and the other fields
 represent the other essential pieces of information for making a
 networking connection.  These file names are used with the `|&'
 operator for communicating with a coprocess (*note Two-way I/O::).
 This is an advanced feature, mentioned here only for completeness.
-Full discussion is delayed until *Note TCP/IP Networking::.
+Full discussion is delayed until *note TCP/IP Networking::.
 
 
 File: gawk.info,  Node: Special Caveats,  Prev: Special Network,  Up: Special Files
@@ -5181,9 +5201,9 @@ names that `gawk' provides:
      any of the files related to file descriptors 0, 1, and 2.  Doing
      so results in unpredictable behavior.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Older versions of `gawk' would interpret these names internally
+   (1) Older versions of `gawk' would interpret these names internally
 only if the system did not actually have a `/dev/fd' directory or any
 of the other special files listed earlier.  Usually this didn't make a
 difference, but sometimes it did; thus, it was decided to make `gawk''s
@@ -5203,15 +5223,15 @@ time only.  At that time, the first record of input is read from that
 file or command.  The next time the same file or command is used with
 `getline', another record is read from it, and so on.
 
-Similarly, when a file or pipe is opened for output, the file name or
+   Similarly, when a file or pipe is opened for output, the file name or
 command associated with it is remembered by `awk', and subsequent
 writes to the same file or command are appended to the previous writes.
 The file or pipe stays open until `awk' exits.
 
-This implies that special steps are necessary in order to read the same
-file again from the beginning, or to rerun a shell command (rather than
-reading more output from the same command).  The `close' function makes
-these things possible:
+   This implies that special steps are necessary in order to read the
+same file again from the beginning, or to rerun a shell command (rather
+than reading more output from the same command).  The `close' function
+makes these things possible:
 
      close(FILENAME)
 
@@ -5219,9 +5239,9 @@ or:
 
      close(COMMAND)
 
-The argument FILENAME or COMMAND can be any expression.  Its value must
-_exactly_ match the string that was used to open the file or start the
-command (spaces and other "irrelevant" characters included). For
+   The argument FILENAME or COMMAND can be any expression.  Its value
+must _exactly_ match the string that was used to open the file or start
+the command (spaces and other "irrelevant" characters included). For
 example, if you open a pipe with this:
 
      "sort -r names" | getline foo
@@ -5230,13 +5250,13 @@ then you must close it with this:
 
      close("sort -r names")
 
-Once this function call is executed, the next `getline' from that file
-or command, or the next `print' or `printf' to that file or command,
-reopens the file or reruns the command.  Because the expression that
-you use to close a file or pipeline must exactly match the expression
-used to open the file or run the command, it is good practice to use a
-variable to store the file name or command.  The previous example
-becomes the following:
+   Once this function call is executed, the next `getline' from that
+file or command, or the next `print' or `printf' to that file or
+command, reopens the file or reruns the command.  Because the
+expression that you use to close a file or pipeline must exactly match
+the expression used to open the file or run the command, it is good
+practice to use a variable to store the file name or command.  The
+previous example becomes the following:
 
      sortcom = "sort -r names"
      sortcom | getline foo
@@ -5271,9 +5291,9 @@ programs.  Here are some of the reasons for closing an output file:
      the program closes the pipe after each line of output, then each
      line makes a separate message.
 
-If you use more files than the system allows you to have open, `gawk'
-attempts to multiplex the available open files among your data files.
-`gawk''s ability to do this depends upon the facilities of your
+   If you use more files than the system allows you to have open,
+`gawk' attempts to multiplex the available open files among your data
+files.  `gawk''s ability to do this depends upon the facilities of your
 operating system, so it may not always work.  It is therefore both good
 practice and good portability advice to always use `close' on your
 files when you are done with them.  In fact, if you are using a lot of
@@ -5289,32 +5309,32 @@ consider something like this:
          # need close(command) here
      }
 
-This example creates a new pipeline based on data in _each_ record.
+   This example creates a new pipeline based on data in _each_ record.
 Without the call to `close' indicated in the comment, `awk' creates
 child processes to run the commands, until it eventually runs out of
 file descriptors for more pipelines.
 
-Even though each command has finished (as indicated by the end-of-file
-return status from `getline'), the child process is not terminated;(1)
-more importantly, the file descriptor for the pipe is not closed and
-released until `close' is called or `awk' exits.
+   Even though each command has finished (as indicated by the
+end-of-file return status from `getline'), the child process is not
+terminated;(1) more importantly, the file descriptor for the pipe is
+not closed and released until `close' is called or `awk' exits.
 
-`close' will silently do nothing if given an argument that does not
+   `close' will silently do nothing if given an argument that does not
 represent a file, pipe or coprocess that was opened with a redirection.
 
-Note also that `close(FILENAME)' has no "magic" effects on the implicit
-loop that reads through the files named on the command line.  It is,
-more likely, a close of a file that was never opened, so `awk' silently
-does nothing.
+   Note also that `close(FILENAME)' has no "magic" effects on the
+implicit loop that reads through the files named on the command line.
+It is, more likely, a close of a file that was never opened, so `awk'
+silently does nothing.
 
-When using the `|&' operator to communicate with a coprocess, it is
+   When using the `|&' operator to communicate with a coprocess, it is
 occasionally useful to be able to close one end of the two-way pipe
 without closing the other.  This is done by supplying a second argument
 to `close'.  As in any other call to `close', the first argument is the
 name of the command or special file used to start the coprocess.  The
 second argument should be a string, with either of the values `"to"' or
 `"from"'.  Case does not matter.  As this is an advanced feature, a
-more complete discussion is delayed until *Note Two-way I/O::, which
+more complete discussion is delayed until *note Two-way I/O::, which
 discusses it in more detail and gives an example.
 
 Advanced Notes: Using `close''s Return Value
@@ -5328,30 +5348,32 @@ statement.  It is a syntax error to try and use the return value from
      command | getline info
      retval = close(command)  # syntax error in most Unix awks
 
-`gawk' treats `close' as a function.  The return value is -1 if the
+   `gawk' treats `close' as a function.  The return value is -1 if the
 argument names something that was never opened with a redirection, or
 if there is a system problem closing the file or process.  In these
 cases, `gawk' sets the built-in variable `ERRNO' to a string describing
 the problem.
 
-In `gawk', when closing a pipe or coprocess (input or output), the
+   In `gawk', when closing a pipe or coprocess (input or output), the
 return value is the exit status of the command.(2) Otherwise, it is the
 return value from the system's `close' or `fclose' C functions when
 closing input or output files, respectively.  This value is zero if the
 close succeeds, or -1 if it fails.
 
-The POSIX standard is very vague; it says that `close' returns zero on
-success and non-zero otherwise.  In general, different implementations
-vary in what they report when closing pipes; thus the return value
-cannot be used portably.  (d.c.)
+   The POSIX standard is very vague; it says that `close' returns zero
+on success and non-zero otherwise.  In general, different
+implementations vary in what they report when closing pipes; thus the
+return value cannot be used portably.  (d.c.)
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The technical terminology is rather morbid.  The finished child is
-called a "zombie," and cleaning up after it is referred to as "reaping."
+   (1) The technical terminology is rather morbid.  The finished child
+is called a "zombie," and cleaning up after it is referred to as
+"reaping."
 
-(2) This is a full 16-bit value as returned by the `wait' system call.
-See the system manual pages for information on how to decode this value.
+   (2) This is a full 16-bit value as returned by the `wait' system
+call. See the system manual pages for information on how to decode this
+value.
 
 
 File: gawk.info,  Node: Expressions,  Next: Patterns and Actions,  Prev: Printing,  Up: Top
@@ -5364,7 +5386,7 @@ actions.  An expression evaluates to a value that you can print, test,
 or pass to a function.  Additionally, an expression can assign a new
 value to a variable or a field by using an assignment operator.
 
-An expression can serve as a pattern or action statement on its own.
+   An expression can serve as a pattern or action statement on its own.
 Most other kinds of statements contain one or more expressions that
 specify the data on which to operate.  As in other languages,
 expressions in `awk' include variables, array references, constants,
@@ -5406,9 +5428,9 @@ The simplest type of expression is the "constant", which always has the
 same value.  There are three types of constants: numeric, string, and
 regular expression.
 
-Each is used in the appropriate context when you need a data value that
-isn't going to change.  Numeric constants can have different forms, but
-are stored identically internally.
+   Each is used in the appropriate context when you need a data value
+that isn't going to change.  Numeric constants can have different
+forms, but are stored identically internally.
 
 * Menu:
 
@@ -5431,7 +5453,7 @@ the same value:
      1.05e+2
      1050e-1
 
-A string constant consists of a sequence of characters enclosed in
+   A string constant consists of a sequence of characters enclosed in
 double-quotation marks.  For example:
 
      "parrot"
@@ -5442,9 +5464,9 @@ eight-bit ASCII characters including ASCII NUL (character code zero).
 Other `awk' implementations may have difficulty with some character
 codes.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The internal representation of all numbers, including integers,
+   (1) The internal representation of all numbers, including integers,
 uses double-precision floating-point numbers.  On most modern systems,
 these are in IEEE 754 standard format.
 
@@ -5466,8 +5488,8 @@ usually irrelevant; hexadecimal `a' and `A' have the same value.)
 Thus, `11', in hexadecimal, is 1 times 16 plus 1, which equals 17 in
 decimal.
 
-Just by looking at plain `11', you can't tell what base it's in.  So,
-in C, C++, and other languages derived from C, there is a special
+   Just by looking at plain `11', you can't tell what base it's in.
+So, in C, C++, and other languages derived from C, there is a special
 notation to help signify the base.  Octal numbers start with a leading
 `0', and hexadecimal numbers start with a leading `0x' or `0X':
 
@@ -5480,17 +5502,17 @@ notation to help signify the base.  Octal numbers start with a leading
 `0x11'
      Hexadecimal 11, decimal value 17.
 
-This example shows the difference:
+   This example shows the difference:
 
      $ gawk 'BEGIN { printf "%d, %d, %d\n", 011, 11, 0x11 }'
      -| 9, 11, 17
 
-Being able to use octal and hexadecimal constants in your programs is
-most useful when working with data that cannot be represented
+   Being able to use octal and hexadecimal constants in your programs
+is most useful when working with data that cannot be represented
 conveniently as characters or as regular numbers, such as binary data
 of various sorts.
 
-`gawk' allows the use of octal and hexadecimal constants in your
+   `gawk' allows the use of octal and hexadecimal constants in your
 program text.  However, such numbers in the input data are not treated
 differently; doing so by default would break old programs.  (If you
 really need to do this, use the `--non-decimal-data' command-line
@@ -5498,18 +5520,18 @@ option; *note Nondecimal Data::.)  If you have octal or hexadecimal
 data, you can use the `strtonum' function (*note String Functions::) to
 convert the data into a number.  Most of the time, you will want to use
 octal or hexadecimal constants when working with the built-in bit
-manipulation functions; see *Note Bitwise Functions::, for more
+manipulation functions; see *note Bitwise Functions::, for more
 information.
 
-Unlike some early C implementations, `8' and `9' are not valid in octal
-constants; e.g., `gawk' treats `018' as decimal 18:
+   Unlike some early C implementations, `8' and `9' are not valid in
+octal constants; e.g., `gawk' treats `018' as decimal 18:
 
      $ gawk 'BEGIN { print "021 is", 021 ; print 018 }'
      -| 021 is 17
      -| 18
 
-Octal and hexadecimal source code constants are a `gawk' extension.  If
-`gawk' is in compatibility mode (*note Options::), they are not
+   Octal and hexadecimal source code constants are a `gawk' extension.
+If `gawk' is in compatibility mode (*note Options::), they are not
 available.
 
 Advanced Notes: A Constant's Base Does Not Affect Its Value
@@ -5526,7 +5548,7 @@ for conversion of numbers to strings:
 
 File: gawk.info,  Node: Regexp Constants,  Prev: Nondecimal-numbers,  Up: Constants
 
-5.1.4 Regular Expression Constants
+5.1.3 Regular Expression Constants
 ----------------------------------
 
 A regexp constant is a regular expression description enclosed in
@@ -5579,7 +5601,7 @@ assigns either zero or one to the variable `matches', depending upon
 the contents of the current input record.  This feature of the language
 has never been well documented until the POSIX specification.
 
-Constant regular expressions are also used as the first argument for
+   Constant regular expressions are also used as the first argument for
 the `gensub', `sub', and `gsub' functions, and as the second argument
 of the `match' function (*note String Functions::).  Modern
 implementations of `awk', including `gawk', allow the third argument of
@@ -5604,8 +5626,8 @@ For example:
          ...
      }
 
-In this example, the programmer wants to pass a regexp constant to the
-user-defined function `mysub', which in turn passes it on to either
+   In this example, the programmer wants to pass a regexp constant to
+the user-defined function `mysub', which in turn passes it on to either
 `sub' or `gsub'.  However, what really happens is that the `pat'
 parameter is either one or zero, depending upon whether or not `$0'
 matches `/hi/'.  `gawk' issues a warning when it sees a regexp constant
@@ -5642,20 +5664,20 @@ a variable must be a sequence of letters, digits, or underscores, and
 it may not begin with a digit.  Case is significant in variable names;
 `a' and `A' are distinct variables.
 
-A variable name is a valid expression by itself; it represents the
+   A variable name is a valid expression by itself; it represents the
 variable's current value.  Variables are given new values with
 "assignment operators", "increment operators", and "decrement
 operators".  *Note Assignment Ops::.
 
-A few variables have special built-in meanings, such as `FS' (the field
-separator), and `NF' (the number of fields in the current input
+   A few variables have special built-in meanings, such as `FS' (the
+field separator), and `NF' (the number of fields in the current input
 record).  *Note Built-in Variables::, for a list of the built-in
 variables.  These built-in variables can be used and assigned just like
 all other variables, but their values are also used or changed
 automatically by `awk'.  All built-in variables' names are entirely
 uppercase.
 
-Variables in `awk' can be assigned either numeric or string values.
+   Variables in `awk' can be assigned either numeric or string values.
 The kind of value a variable holds can change over the life of a
 program.  By default, variables are initialized to the empty string,
 which is zero if converted to a number.  There is no need to
@@ -5705,7 +5727,7 @@ second field is printed in lines from `BBS-list':
      -| 555-3412
      ...
 
-Command-line arguments are made available for explicit examination by
+   Command-line arguments are made available for explicit examination by
 the `awk' program in the `ARGV' array (*note ARGC and ARGV::).  `awk'
 processes the values of command-line assignments for escape sequences
 (*note Escape Sequences::).  (d.c.)
@@ -5731,7 +5753,7 @@ variables `two' and `three' are converted to strings and concatenated
 together.  The resulting string is converted back to the number 23, to
 which 4 is then added.
 
-If, for some reason, you need to force a number to be converted to a
+   If, for some reason, you need to force a number to be converted to a
 string, concatenate the empty string, `""', with that number.  To force
 a string to be converted to a number, add zero to that string.  A
 string is converted to a number by interpreting any numeric prefix of
@@ -5739,24 +5761,24 @@ the string as numerals: `"2.5"' converts to 2.5, `"1e3"' converts to
 1000, and `"25fix"' has a numeric value of 25.  Strings that can't be
 interpreted as valid numbers convert to zero.
 
-The exact manner in which numbers are converted into strings is
+   The exact manner in which numbers are converted into strings is
 controlled by the `awk' built-in variable `CONVFMT' (*note Built-in
 Variables::).  Numbers are converted using the `sprintf' function with
 `CONVFMT' as the format specifier (*note String Functions::).
 
-`CONVFMT''s default value is `"%.6g"', which prints a value with at
+   `CONVFMT''s default value is `"%.6g"', which prints a value with at
 least six significant digits.  For some applications, you might want to
 change it to specify more precision.  On most modern machines, 17
 digits is enough to capture a floating-point number's value exactly,
 most of the time.(1)
 
-Strange results can occur if you set `CONVFMT' to a string that doesn't
-tell `sprintf' how to format floating-point numbers in a useful way.
-For example, if you forget the `%' in the format, `awk' converts all
-numbers to the same constant string.  As a special case, if a number is
-an integer, then the result of converting it to a string is _always_ an
-integer, no matter what the value of `CONVFMT' may be.  Given the
-following code fragment:
+   Strange results can occur if you set `CONVFMT' to a string that
+doesn't tell `sprintf' how to format floating-point numbers in a useful
+way.  For example, if you forget the `%' in the format, `awk' converts
+all numbers to the same constant string.  As a special case, if a
+number is an integer, then the result of converting it to a string is
+_always_ an integer, no matter what the value of `CONVFMT' may be.
+Given the following code fragment:
 
      CONVFMT = "%2.2f"
      a = 12
@@ -5764,7 +5786,7 @@ following code fragment:
 
 `b' has the value `"12"', not `"12.00"'.  (d.c.)
 
-Prior to the POSIX standard, `awk' used the value of `OFMT' for
+   Prior to the POSIX standard, `awk' used the value of `OFMT' for
 converting numbers to strings.  `OFMT' specifies the output format to
 use when printing numbers with `print'.  `CONVFMT' was introduced in
 order to separate the semantics of conversion from the semantics of
@@ -5776,24 +5798,23 @@ older implementations of `awk'.  We recommend that instead of changing
 your programs, just port `gawk' itself.  *Note Print::, for more
 information on the `print' statement.
 
-Finally, once again, where you are can matter when it comes to
-converting between numbers and strings.  In *Note Locales::, we
-mentioned that the local character set and language (the locale) can
-affect how `gawk' matches characters.  The locale also affects numeric
-formats.  In particular, for `awk' programs, it affects the decimal
-point character.  The `"C"' locale, and most English-language locales,
-use the period character (`.') as the decimal point.  However, many (if
-not most) European and non-English locales use the comma (`,') as the
-decimal point character.
-
-The POSIX standard says that `awk' always uses the period as the decimal
-point when reading the `awk' program source code, and for command-line
-variable assignments (*note Other Arguments::).  However, when
-interpreting input data, for `print' and `printf' output, and for
+   And, once again, where you are can matter when it comes to converting
+between numbers and strings.  In *note Locales::, we mentioned that the
+local character set and language (the locale) can affect how `gawk'
+matches characters.  The locale also affects numeric formats.  In
+particular, for `awk' programs, it affects the decimal point character.
+The `"C"' locale, and most English-language locales, use the period
+character (`.') as the decimal point.  However, many (if not most)
+European and non-English locales use the comma (`,') as the decimal
+point character.
+
+   The POSIX standard says that `awk' always uses the period as the
+decimal point when reading the `awk' program source code, and for
+command-line variable assignments (*note Other Arguments::).  However,
+when interpreting input data, for `print' and `printf' output, and for
 number to string conversion, the local decimal point character is used.
-As of version 3.1.3, `gawk' fully complies with this aspect of the
-standard.  Here are some examples indicating the difference in behavior,
-on a GNU/Linux system:
+Here are some examples indicating the difference in behavior, on a
+GNU/Linux system:
 
      $ gawk 'BEGIN { printf "%g\n", 3.1415927 }'
      -| 3.14159
@@ -5809,10 +5830,38 @@ the decimal point separator.  In the normal `"C"' locale, `gawk' treats
 `4,321' as `4', while in the Danish locale, it's treated as the full
 number, `4.321'.
 
----------- Footnotes ----------
+   For version 3.1.3 through 3.1.5, `gawk' fully complied with this
+aspect of the standard.  However, many users in non-English locales
+complained about this behavior, since their data used a period as the
+decimal point.  Beginning in version 3.1.6, the default behavior was
+restored to use a period as the decimal point character.  You can use
+the `--use-lc-numeric' option (*note Options::) to force `gawk' to use
+the locale's decimal point character.  (`gawk' also uses the locale's
+decimal point character when in POSIX mode, either via `--posix', or
+the `POSIXLY_CORRECT' environment variable.)
+
+   The following table describes the cases in which the locale's decimal
+point character is used and when a period is used. Some of these
+features have not been described yet.
+
+Feature     Default        `--posix' or `--use-lc-numeric'
+------------------------------------------------------------ 
+`%'g'       Use locale     Use locale
+`%g'        Use period     Use locale
+Input       Use period     Use locale
+`strtonum'  Use period     Use locale
+
+Table 5.1: Locale Decimal Point versus A Period
+
+   Finally, modern day formal standards and IEEE standard floating point
+representation can have an unusual but important effect on the way
+`gawk' converts some special string values to numbers.  The details are
+presented in *note POSIX Floating Point Problems::.
+
+   ---------- Footnotes ----------
 
-(1) Pathological cases can require up to 752 digits (!), but we doubt
-that you need to worry about this.
+   (1) Pathological cases can require up to 752 digits (!), but we
+doubt that you need to worry about this.
 
 
 File: gawk.info,  Node: Arithmetic Ops,  Next: Concatenation,  Prev: Conversion,  Up: Expressions
@@ -5824,9 +5873,9 @@ The `awk' language uses the common arithmetic operators when evaluating
 expressions.  All of these arithmetic operators follow normal
 precedence rules and work as you would expect them to.
 
-The following example uses a file named `grades', which contains a list
-of student names as well as three test scores per student (it's a small
-class):
+   The following example uses a file named `grades', which contains a
+list of student names as well as three test scores per student (it's a
+small class):
 
      Pat   100 97 58
      Sandy  84 72 93
@@ -5841,8 +5890,8 @@ scores:
      -| Sandy 83
      -| Chris 84.3333
 
-The following list provides the arithmetic operators in `awk', in order
-from the highest precedence to the lowest:
+   The following list provides the arithmetic operators in `awk', in
+order from the highest precedence to the lowest:
 
 `- X'
      Negation.
@@ -5876,24 +5925,24 @@ from the highest precedence to the lowest:
 `X - Y'
      Subtraction.
 
-Unary plus and minus have the same precedence, the multiplication
+   Unary plus and minus have the same precedence, the multiplication
 operators all have the same precedence, and addition and subtraction
 have the same precedence.
 
-When computing the remainder of `X % Y', the quotient is rounded toward
-zero to an integer and multiplied by Y. This result is subtracted from
-X; this operation is sometimes known as "trunc-mod."  The following
-relation always holds:
+   When computing the remainder of `X % Y', the quotient is rounded
+toward zero to an integer and multiplied by Y. This result is
+subtracted from X; this operation is sometimes known as "trunc-mod."
+The following relation always holds:
 
      b * int(a / b) + (a % b) == a
 
-One possibly undesirable effect of this definition of remainder is that
-`X % Y' is negative if X is negative.  Thus:
+   One possibly undesirable effect of this definition of remainder is
+that `X % Y' is negative if X is negative.  Thus:
 
      -17 % 8 = -1
 
-In other `awk' implementations, the signedness of the remainder may be
-machine-dependent.
+   In other `awk' implementations, the signedness of the remainder may
+be machine-dependent.
 
      NOTE: The POSIX standard only specifies the use of `^' for
      exponentiation.  For maximum portability, do not use the `**'
@@ -5908,39 +5957,40 @@ File: gawk.info,  Node: Concatenation,  Next: Assignment Ops,  Prev: Arithmetic
      It seemed like a good idea at the time.
      Brian Kernighan
 
-There is only one string operation: concatenation.  It does not have a
-specific operator to represent it.  Instead, concatenation is performed
-by writing expressions next to one another, with no operator.  For
-example:
+   There is only one string operation: concatenation.  It does not have
+a specific operator to represent it.  Instead, concatenation is
+performed by writing expressions next to one another, with no operator.
+For example:
 
      $ awk '{ print "Field number one: " $1 }' BBS-list
      -| Field number one: aardvark
      -| Field number one: alpo-net
      ...
 
-Without the space in the string constant after the `:', the line runs
-together.  For example:
+   Without the space in the string constant after the `:', the line
+runs together.  For example:
 
      $ awk '{ print "Field number one:" $1 }' BBS-list
      -| Field number one:aardvark
      -| Field number one:alpo-net
      ...
 
-Because string concatenation does not have an explicit operator, it is
-often necessary to insure that it happens at the right time by using
-parentheses to enclose the items to concatenate.  For example, the
-following code fragment does not concatenate `file' and `name' as you
-might expect:
+   Because string concatenation does not have an explicit operator, it
+is often necessary to insure that it happens at the right time by using
+parentheses to enclose the items to concatenate.  For example, you
+might expect that the following code fragment concatenates `file' and
+`name':
 
      file = "file"
      name = "name"
      print "something meaningful" > file name
 
-It is necessary to use the following:
+This produces a syntax error with Unix `awk'.(1) It is necessary to use
+the following:
 
      print "something meaningful" > (file name)
 
-Parentheses should be used around concatenation in all but the most
+   Parentheses should be used around concatenation in all but the most
 common contexts, such as on the righthand side of `='.  Be careful
 about the kinds of expressions used in string concatenation.  In
 particular, the order of evaluation of expressions used for
@@ -5961,25 +6011,30 @@ counter-intuitive.  Consider this example:
      $ awk 'BEGIN { print -12 " " -24 }'
      -| -12-24
 
-This "obviously" is concatenating -12, a space, and -24.  But where did
-the space disappear to?  The answer lies in the combination of operator
-precedences and `awk''s automatic conversion rules.  To get the desired
-result, write the program in the following manner:
+   This "obviously" is concatenating -12, a space, and -24.  But where
+did the space disappear to?  The answer lies in the combination of
+operator precedences and `awk''s automatic conversion rules.  To get
+the desired result, write the program in the following manner:
 
      $ awk 'BEGIN { print -12 " " (-24) }'
      -| -12 -24
 
-This forces `awk' to treat the `-' on the `-24' as unary.  Otherwise,
-it's parsed as follows:
+   This forces `awk' to treat the `-' on the `-24' as unary.
+Otherwise, it's parsed as follows:
 
          -12 (`" "' - 24)
      => -12 (0 - 24)
      => -12 (-24)
      => -12-24
 
-As mentioned earlier, when doing concatenation, _parenthesize_.
+   As mentioned earlier, when doing concatenation, _parenthesize_.
 Otherwise, you're never quite sure what you'll get.
 
+   ---------- Footnotes ----------
+
+   (1) It happens that `gawk' and `mawk' "get it right," but you should
+not rely on this.
+
 
 File: gawk.info,  Node: Assignment Ops,  Next: Increment Ops,  Prev: Concatenation,  Up: Expressions
 
@@ -5992,11 +6047,12 @@ variable `z':
 
      z = 1
 
-After this expression is executed, the variable `z' has the value one.
-Whatever old value `z' had before the assignment is forgotten.
+   After this expression is executed, the variable `z' has the value
+one.  Whatever old value `z' had before the assignment is forgotten.
 
-Assignments can also store string values.  For example, the following
-stores the value `"this food is good"' in the variable `message':
+   Assignments can also store string values.  For example, the
+following stores the value `"this food is good"' in the variable
+`message':
 
      thing = "food"
      predicate = "good"
@@ -6011,7 +6067,7 @@ An assignment operator is different; it does produce a value, but even
 if you ignore it, the assignment still makes itself felt through the
 alteration of the variable.  We call this a "side effect".
 
-The lefthand operand of an assignment need not be a variable (*note
+   The lefthand operand of an assignment need not be a variable (*note
 Variables::); it can also be a field (*note Changing Fields::) or an
 array element (*note Arrays::).  These are all called "lvalues", which
 means they can appear on the lefthand side of an assignment operator.
@@ -6019,7 +6075,7 @@ The righthand operand may be any expression; it produces the new value
 that the assignment stores in the specified variable, field, or array
 element. (Such values are called "rvalues".)
 
-It is important to note that variables do _not_ have permanent types.
+   It is important to note that variables do _not_ have permanent types.
 A variable's type is simply the type of whatever value it happens to
 hold at the moment.  In the following program fragment, the variable
 `foo' has a numeric value at first, and a string value later on:
@@ -6032,7 +6088,7 @@ hold at the moment.  In the following program fragment, the variable
 When the second assignment gives `foo' a string value, the fact that it
 previously had a numeric value is forgotten.
 
-String values that do not begin with a digit have a numeric value of
+   String values that do not begin with a digit have a numeric value of
 zero. After executing the following code, the value of `foo' is five:
 
      foo = "a string"
@@ -6043,10 +6099,10 @@ zero. After executing the following code, the value of `foo' is five:
      examples illustrate how `awk' works, _not_ how you should write
      your programs!
 
-An assignment is an expression, so it has a value--the same value that
-is assigned.  Thus, `z = 1' is an expression with the value one.  One
-consequence of this is that you can write multiple assignments together,
-such as:
+   An assignment is an expression, so it has a value--the same value
+that is assigned.  Thus, `z = 1' is an expression with the value one.
+One consequence of this is that you can write multiple assignments
+together, such as:
 
      x = y = z = 5
 
@@ -6055,13 +6111,13 @@ and `z').  It does so because the value of `z = 5', which is five, is
 stored into `y' and then the value of `y = z = 5', which is five, is
 stored into `x'.
 
-Assignments may be used anywhere an expression is called for.  For
+   Assignments may be used anywhere an expression is called for.  For
 example, it is valid to write `x != (y = 1)' to set `y' to one, and
 then test whether `x' equals one.  But this style tends to make
 programs hard to read; such nesting of assignments should be avoided,
 except perhaps in a one-shot program.
 
-Aside from `=', there are several other assignment operators that do
+   Aside from `=', there are several other assignment operators that do
 arithmetic with the old value of the variable.  For example, the
 operator `+=' computes a new value by adding the righthand value to the
 old value of the variable.  Thus, the following assignment adds five to
@@ -6075,8 +6131,8 @@ This is equivalent to the following:
 
 Use whichever makes the meaning of your program clearer.
 
-There are situations where using `+=' (or any assignment operator) is
-_not_ the same as simply repeating the lefthand operand in the
+   There are situations where using `+=' (or any assignment operator)
+is _not_ the same as simply repeating the lefthand operand in the
 righthand expression.  For example:
 
      # Thanks to Pat Rankin for this example
@@ -6093,7 +6149,7 @@ righthand expression.  For example:
 The indices of `bar' are practically guaranteed to be different, because
 `rand' returns different values each time it is called.  (Arrays and
 the `rand' function haven't been covered yet.  *Note Arrays::, and see
-*Note Numeric Functions::, for more information).  This example
+*note Numeric Functions::, for more information).  This example
 illustrates an important fact about assignment operators: the lefthand
 expression is only evaluated _once_.  It is up to the implementation as
 to which expression is evaluated first, the lefthand or the righthand.
@@ -6104,29 +6160,22 @@ Consider this example:
 
 The value of `a[3]' could be either two or four.
 
-*Note table-assign-ops:: lists the arithmetic assignment operators.  In
-each case, the righthand operand is an expression whose value is
+   *note table-assign-ops:: lists the arithmetic assignment operators.
+In each case, the righthand operand is an expression whose value is
 converted to a number.
 
 Operator               Effect
---------------------------------------------------------------------------
+-------------------------------------------------------------------------- 
 LVALUE `+=' INCREMENT  Adds INCREMENT to the value of LVALUE.
---------------------------------------------------------------------------
 LVALUE `-=' DECREMENT  Subtracts DECREMENT from the value of LVALUE.
---------------------------------------------------------------------------
 LVALUE `*='            Multiplies the value of LVALUE by COEFFICIENT.
-COEFFICIENT
---------------------------------------------------------------------------
+COEFFICIENT            
 LVALUE `/=' DIVISOR    Divides the value of LVALUE by DIVISOR.
---------------------------------------------------------------------------
 LVALUE `%=' MODULUS    Sets LVALUE to its remainder by MODULUS.
---------------------------------------------------------------------------
-LVALUE `^=' POWER
---------------------------------------------------------------------------
+LVALUE `^=' POWER      
 LVALUE `**=' POWER     Raises LVALUE to the power POWER.
---------------------------------------------------------------------------
 
-Table 5.1: Arithmetic Assignment Operators
+Table 5.2: Arithmetic Assignment Operators
 
      NOTE: Only the `^=' operator is specified by POSIX.  For maximum
      portability, do not use the `**=' operator.
@@ -6148,8 +6197,8 @@ A workaround is:
 
      awk '/[=]=/' /dev/null
 
-`gawk' does not have this problem, nor do the other freely available
-versions described in *Note Other Versions::.
+   `gawk' does not have this problem, nor do the other freely available
+versions described in *note Other Versions::.
 
 
 File: gawk.info,  Node: Increment Ops,  Next: Truth Values,  Prev: Assignment Ops,  Up: Expressions
@@ -6162,7 +6211,7 @@ a variable by one.  An assignment operator can do the same thing, so
 the increment operators add no power to the `awk' language; however,
 they are convenient abbreviations for very common operations.
 
-The operator used for adding one is written `++'.  It can be used to
+   The operator used for adding one is written `++'.  It can be used to
 increment a variable either before or after taking its value.  To
 pre-increment a variable `v', write `++v'.  This adds one to the value
 of `v'--that new value is also the value of the expression. (The
@@ -6175,18 +6224,18 @@ four, but it changes the value of `foo' to five.  In other words, the
 operator returns the old value of the variable, but with the side
 effect of incrementing it.
 
-The post-increment `foo++' is nearly the same as writing `(foo += 1) -
-1'.  It is not perfectly equivalent because all numbers in `awk' are
+   The post-increment `foo++' is nearly the same as writing `(foo += 1)
+- 1'.  It is not perfectly equivalent because all numbers in `awk' are
 floating-point--in floating-point, `foo + 1 - 1' does not necessarily
 equal `foo'.  But the difference is minute as long as you stick to
 numbers that are fairly small (less than 10e12).
 
-Fields and array elements are incremented just like variables.  (Use
+   Fields and array elements are incremented just like variables.  (Use
 `$(i++)' when you want to do a field reference and a variable increment
 at the same time.  The parentheses are necessary because of the
 precedence of the field reference operator `$'.)
 
-The decrement operator `--' works just like `++', except that it
+   The decrement operator `--' works just like `++', except that it
 subtracts one instead of adding it.  As with `++', it can be used before
 the lvalue to pre-decrement or after it to post-decrement.  Following
 is a summary of increment and decrement expressions:
@@ -6227,15 +6276,15 @@ Or something even stranger?
      b += ++b + b++
      print b
 
-In other words, when do the various side effects prescribed by the
+   In other words, when do the various side effects prescribed by the
 postfix operators (`b++') take effect?  When side effects happen is
 "implementation defined".  In other words, it is up to the particular
 version of `awk'.  The result for the first example may be 12 or 13,
 and for the second, it may be 22 or 23.
 
-In short, doing things like this is not recommended and definitely not
-anything that you can rely upon for portability.  You should avoid such
-things in your own programs.
+   In short, doing things like this is not recommended and definitely
+not anything that you can rely upon for portability.  You should avoid
+such things in your own programs.
 
 
 File: gawk.info,  Node: Truth Values,  Next: Typing and Comparison,  Prev: Increment Ops,  Up: Expressions
@@ -6261,7 +6310,7 @@ value' three times:
             print "A strange truth value"
      }
 
-There is a surprising consequence of the "nonzero or non-null" rule:
+   There is a surprising consequence of the "nonzero or non-null" rule:
 the string constant `"0"' is actually true, because it is non-null.
 (d.c.)
 
@@ -6274,9 +6323,21 @@ File: gawk.info,  Node: Typing and Comparison,  Next: Boolean Ops,  Prev: Truth
      The Guide is definitive. Reality is frequently inaccurate.
      The Hitchhiker's Guide to the Galaxy
 
-Unlike other programming languages, `awk' variables do not have a fixed
-type. Instead, they can be either a number or a string, depending upon
-the value that is assigned to them.
+   Unlike other programming languages, `awk' variables do not have a
+fixed type. Instead, they can be either a number or a string, depending
+upon the value that is assigned to them.  We look now at how variables
+are typed, and how `awk' compares variables.
+
+* Menu:
+
+* Variable Typing::             String type versus numeric type.
+* Comparison Operators::        The comparison operators.
+
+
+File: gawk.info,  Node: Variable Typing,  Next: Comparison Operators,  Up: Typing and Comparison
+
+5.10.1 String Type Versus Numeric Type
+--------------------------------------
 
 The 1992 POSIX standard introduced the concept of a "numeric string",
 which is simply a string that looks like a number--for example,
@@ -6300,16 +6361,17 @@ these rules:
    * Attributes propagate across assignments but are not changed by any
      use.
 
-The last rule is particularly important. In the following program, `a'
-has numeric type, even though it is later used in a string operation:
+   The last rule is particularly important. In the following program,
+`a' has numeric type, even though it is later used in a string
+operation:
 
      BEGIN {
-              a = 12.345
-              b = a " is a cute number"
-              print b
+          a = 12.345
+          b = a " is a cute number"
+          print b
      }
 
-When two operands are compared, either string comparison or numeric
+   When two operands are compared, either string comparison or numeric
 comparison may be used. This depends upon the attributes of the
 operands, according to the following symmetric matrix:
 
@@ -6324,45 +6386,75 @@ operands, according to the following symmetric matrix:
      STRNUM  |       string          numeric         numeric
      -------+---------------------------------------------
 
-The basic idea is that user input that looks numeric--and _only_ user
-input--should be treated as numeric, even though it is actually made of
-characters and is therefore also a string.  Thus, for example, the
-string constant `" +3.14"' is a string, even though it looks numeric,
-and is _never_ treated as number for comparison purposes.
+   The basic idea is that user input that looks numeric--and _only_
+user input--should be treated as numeric, even though it is actually
+made of characters and is therefore also a string.  Thus, for example,
+the string constant `" +3.14"', when it appears in program source code,
+is a string--even though it looks numeric--and is _never_ treated as
+number for comparison purposes.
 
-In short, when one operand is a "pure" string, such as a string
+   In short, when one operand is a "pure" string, such as a string
 constant, then a string comparison is performed.  Otherwise, a numeric
 comparison is performed.(1)
 
+   This point bears additional emphasis: All user input is made of
+characters, and so is first and foremost of STRING type; input strings
+that look numeric are additionally given the STRNUM attribute.  Thus,
+the six-character input string ` +3.14' receives the STRNUM attribute.
+In contrast, the eight-character literal `" +3.14"' appearing in
+program text is a string constant.  The following examples print `1'
+when the comparison between the two different constants is true, `0'
+otherwise:
+
+     $ echo ' +3.14' | gawk '{ print $0 == " +3.14" }'    True
+     -| 1
+     $ echo ' +3.14' | gawk '{ print $0 == "+3.14" }'     False
+     -| 0
+     $ echo ' +3.14' | gawk '{ print $0 == "3.14" }'      False
+     -| 0
+     $ echo ' +3.14' | gawk '{ print $0 == 3.14 }'        True
+     -| 1
+     $ echo ' +3.14' | gawk '{ print $1 == " +3.14" }'    False
+     -| 0
+     $ echo ' +3.14' | gawk '{ print $1 == "+3.14" }'     True
+     -| 1
+     $ echo ' +3.14' | gawk '{ print $1 == "3.14" }'      False
+     -| 0
+     $ echo ' +3.14' | gawk '{ print $1 == 3.14 }'        True
+     -| 1
+
+   ---------- Footnotes ----------
+
+   (1) The POSIX standard has been revised.  The revised standard's
+rules for typing and comparison are the same as just described for
+`gawk'.
+
+
+File: gawk.info,  Node: Comparison Operators,  Prev: Variable Typing,  Up: Typing and Comparison
+
+5.10.2 Comparison Operators
+---------------------------
+
 "Comparison expressions" compare strings or numbers for relationships
 such as equality.  They are written using "relational operators", which
-are a superset of those in C.  *Note table-relational-ops:: describes
+are a superset of those in C.  *note table-relational-ops:: describes
 them.
 
 Expression         Result
---------------------------------------------------------------------------
+-------------------------------------------------------------------------- 
 X `<' Y            True if X is less than Y.
---------------------------------------------------------------------------
 X `<=' Y           True if X is less than or equal to Y.
---------------------------------------------------------------------------
 X `>' Y            True if X is greater than Y.
---------------------------------------------------------------------------
 X `>=' Y           True if X is greater than or equal to Y.
---------------------------------------------------------------------------
 X `==' Y           True if X is equal to Y.
---------------------------------------------------------------------------
 X `!=' Y           True if X is not equal to Y.
---------------------------------------------------------------------------
 X `~' Y            True if the string X matches the regexp denoted by Y.
---------------------------------------------------------------------------
 X `!~' Y           True if the string X does not match the regexp
                    denoted by Y.
---------------------------------------------------------------------------
 SUBSCRIPT `in'     True if the array ARRAY has an element with the
 ARRAY              subscript SUBSCRIPT.
---------------------------------------------------------------------------
 
-Table 5.2: Relational Operators
+Table 5.3: Relational Operators
 
    Comparison expressions have the value one if true and zero if false.
 When comparing operands of mixed types, numeric operands are converted
@@ -6387,7 +6479,7 @@ Unless `b' happens to be zero or the null string, the `if' part of the
 test always succeeds.  Because the operators are so similar, this kind
 of error is very difficult to spot when scanning the source code.
 
-The following table of expressions illustrates the kind of comparison
+   The following table of expressions illustrates the kind of comparison
 `gawk' performs, as well as what the result of the comparison is:
 
 `1.5 <= 2.0'
@@ -6411,7 +6503,7 @@ The following table of expressions illustrates the kind of comparison
 `a == b'
      string comparison (false)
 
-In the next example:
+   In the next example:
 
      $ echo 1e2 3 | awk '{ print ($1 < $2) ? "true" : "false" }'
      -| false
@@ -6434,26 +6526,21 @@ By contrast:
 has the value one if `x' contains `foo', such as `"Oh, what a fool am
 I!"'.
 
-The righthand operand of the `~' and `!~' operators may be either a
+   The righthand operand of the `~' and `!~' operators may be either a
 regexp constant (`/.../') or an ordinary expression. In the latter
 case, the value of the expression as a string is used as a dynamic
 regexp (*note Regexp Usage::; also *note Computed Regexps::).
 
-In modern implementations of `awk', a constant regular expression in
+   In modern implementations of `awk', a constant regular expression in
 slashes by itself is also an expression.  The regexp `/REGEXP/' is an
 abbreviation for the following comparison expression:
 
      $0 ~ /REGEXP/
 
-One special place where `/foo/' is _not_ an abbreviation for `$0 ~
+   One special place where `/foo/' is _not_ an abbreviation for `$0 ~
 /foo/' is when it is the righthand operand of `~' or `!~'.  *Note Using
 Constant Regexps::, where this is discussed in more detail.
 
----------- Footnotes ----------
-
-(1) The POSIX standard is under revision.  The revised standard's rules
-for typing and comparison are the same as just described for `gawk'.
-
 
 File: gawk.info,  Node: Boolean Ops,  Next: Conditional Exp,  Prev: Typing and Comparison,  Up: Expressions
 
@@ -6467,14 +6554,14 @@ The truth value of the Boolean expression is computed by combining the
 truth values of the component expressions.  Boolean expressions are
 also referred to as "logical expressions".  The terms are equivalent.
 
-Boolean expressions can be used wherever comparison and matching
+   Boolean expressions can be used wherever comparison and matching
 expressions can be used.  They can be used in `if', `while', `do', and
 `for' statements (*note Statements::).  They have numeric values (one
 if true, zero if false) that come into play if the result of the
 Boolean expression is stored in a variable or used in arithmetic.
 
-In addition, every Boolean expression is also a valid pattern, so you
-can use one as a pattern to control the execution of rules.  The
+   In addition, every Boolean expression is also a valid pattern, so
+you can use one as a pattern to control the execution of rules.  The
 Boolean operators are:
 
 `BOOLEAN1 && BOOLEAN2'
@@ -6498,8 +6585,8 @@ Boolean operators are:
           if ($0 ~ /2400/ || $0 ~ /foo/) print
 
      The subexpression BOOLEAN2 is evaluated only if BOOLEAN1 is false.
-     This can make a difference when BOOLEAN2 contains expressions
-     that have side effects.
+     This can make a difference when BOOLEAN2 contains expressions that
+     have side effects.
 
 `! BOOLEAN'
      True if BOOLEAN is false.  For example, the following program
@@ -6509,23 +6596,24 @@ Boolean operators are:
           BEGIN { if (! ("HOME" in ENVIRON))
                          print "no home!" }
 
-     (The `in' operator is described in *Note Reference to Elements::.)
+     (The `in' operator is described in *note Reference to Elements::.)
 
-The `&&' and `||' operators are called "short-circuit" operators
+   The `&&' and `||' operators are called "short-circuit" operators
 because of the way they work.  Evaluation of the full expression is
 "short-circuited" if the result can be determined part way through its
 evaluation.
 
-Statements that use `&&' or `||' can be continued simply by putting a
-newline after them.  But you cannot put a newline in front of either of
-these operators without using backslash continuation (*note
+   Statements that use `&&' or `||' can be continued simply by putting
+a newline after them.  But you cannot put a newline in front of either
+of these operators without using backslash continuation (*note
 Statements/Lines::).
 
-The actual value of an expression using the `!' operator is either one
-or zero, depending upon the truth value of the expression it is applied
-to.  The `!' operator is often useful for changing the sense of a flag
-variable from false to true and back again. For example, the following
-program is one way to print lines in between special bracketing lines:
+   The actual value of an expression using the `!' operator is either
+one or zero, depending upon the truth value of the expression it is
+applied to.  The `!' operator is often useful for changing the sense of
+a flag variable from false to true and back again. For example, the
+following program is one way to print lines in between special
+bracketing lines:
 
      $1 == "START"   { interested = ! interested; next }
      interested == 1 { print }
@@ -6536,14 +6624,19 @@ initialized to zero, which is also false.  When a line is seen whose
 first field is `START', the value of `interested' is toggled to true,
 using `!'. The next rule prints lines as long as `interested' is true.
 When a line is seen whose first field is `END', `interested' is toggled
-back to false.
+back to false.(1)
 
-     NOTE: The `next' statement is discussed in *Note Next Statement::.
+     NOTE: The `next' statement is discussed in *note Next Statement::.
      `next' tells `awk' to skip the rest of the rules, get the next
      record, and start processing the rules over again at the top.  The
      reason it's there is to avoid printing the bracketing `START' and
      `END' lines.
 
+   ---------- Footnotes ----------
+
+   (1) This program has a bug; it prints lines starting with `END'. How
+would you fix it?
+
 
 File: gawk.info,  Node: Conditional Exp,  Next: Function Calls,  Prev: Boolean Ops,  Up: Expressions
 
@@ -6566,7 +6659,7 @@ following expression produces the absolute value of `x':
 
      x >= 0 ? x : -x
 
-Each time the conditional expression is computed, only one of
+   Each time the conditional expression is computed, only one of
 IF-TRUE-EXP and IF-FALSE-EXP is used; the other is ignored.  This is
 important when the expressions have side effects.  For example, this
 conditional expression examines element `i' of either array `a' or
@@ -6578,7 +6671,7 @@ This is guaranteed to increment `i' exactly once, because each time
 only one of the two increment expressions is executed and the other is
 not.  *Note Arrays::, for more information about arrays.
 
-As a minor `gawk' extension, a statement that uses `?:' can be
+   As a minor `gawk' extension, a statement that uses `?:' can be
 continued simply by putting a newline after either character.  However,
 putting a newline in front of either character does not work without
 using backslash continuation (*note Statements/Lines::).  If `--posix'
@@ -6594,14 +6687,14 @@ A "function" is a name for a particular calculation.  This enables you
 to ask for it by name at any point in the program.  For example, the
 function `sqrt' computes the square root of a number.
 
-A fixed set of functions are "built-in", which means they are available
-in every `awk' program.  The `sqrt' function is one of these.  *Note
-Built-in::, for a list of built-in functions and their descriptions.
-In addition, you can define functions for use in your program.  *Note
-User-defined::, for instructions on how to do this.
+   A fixed set of functions are "built-in", which means they are
+available in every `awk' program.  The `sqrt' function is one of these.
+*Note Built-in::, for a list of built-in functions and their
+descriptions.  In addition, you can define functions for use in your
+program.  *Note User-defined::, for instructions on how to do this.
 
-The way to use a function is with a "function call" expression, which
-consists of the function name followed immediately by a list of
+   The way to use a function is with a "function call" expression,
+which consists of the function name followed immediately by a list of
 "arguments" in parentheses.  The arguments are expressions that provide
 the raw materials for the function's calculations.  When there is more
 than one argument, they are separated by commas.  If there are no
@@ -6612,32 +6705,32 @@ examples show function calls with and without arguments:
      atan2(y, x)            two arguments
      rand()                 no arguments
 
-*Caution:* Do not put any space between the function name and the
+   *Caution:* Do not put any space between the function name and the
 open-parenthesis!  A user-defined function name looks just like the
 name of a variable--a space would make the expression look like
 concatenation of a variable with an expression inside parentheses.
 
-With built-in functions, space before the parenthesis is harmless, but
-it is best not to get into the habit of using space to avoid mistakes
-with user-defined functions.  Each function expects a particular number
-of arguments.  For example, the `sqrt' function must be called with a
-single argument, the number of which to take the square root:
+   With built-in functions, space before the parenthesis is harmless,
+but it is best not to get into the habit of using space to avoid
+mistakes with user-defined functions.  Each function expects a
+particular number of arguments.  For example, the `sqrt' function must
+be called with a single argument, the number of which to take the
+square root:
 
      sqrt(ARGUMENT)
 
-Some of the built-in functions have one or more optional arguments.  If
-those arguments are not supplied, the functions use a reasonable
+   Some of the built-in functions have one or more optional arguments.
+If those arguments are not supplied, the functions use a reasonable
 default value.  *Note Built-in::, for full details.  If arguments are
 omitted in calls to user-defined functions, then those arguments are
 treated as local variables and initialized to the empty string (*note
 User-defined::).
 
-Like every other expression, the function call has a value, which is
+   Like every other expression, the function call has a value, which is
 computed by the function based on the arguments you give it.  In this
 example, the value of `sqrt(ARGUMENT)' is the square root of ARGUMENT.
-A function can also have side effects, such as assigning values to
-certain variables or doing I/O.  The following program reads numbers,
-one number per line, and prints the square root of each one:
+The following program reads numbers, one number per line, and prints the
+square root of each one:
 
      $ awk '{ print "The square root of", $1, "is", sqrt($1) }'
      1
@@ -6648,6 +6741,28 @@ one number per line, and prints the square root of each one:
      -| The square root of 5 is 2.23607
      Ctrl-d
 
+   A function can also have side effects, such as assigning values to
+certain variables or doing I/O.  This program shows how the `match'
+function (*note String Functions::) changes the variables `RSTART' and
+`RLENGTH':
+
+     {
+         if (match($1, $2))
+             print RSTART, RLENGTH
+         else
+             print "no match"
+     }
+
+Here is a sample run:
+
+     $ awk -f matchit.awk
+     aaccdd  c+
+     -| 3 2
+     foo     bar
+     -| no match
+     abcdefg e
+     -| 5 1
+
 
 File: gawk.info,  Node: Precedence,  Prev: Function Calls,  Up: Expressions
 
@@ -6659,7 +6774,7 @@ different operators appear close by in one expression.  For example,
 `*' has higher precedence than `+'; thus, `a + b * c' means to multiply
 `b' and `c', and then add `a' to the product (i.e., `a + (b * c)').
 
-The normal precedence of the operators can be overruled by using
+   The normal precedence of the operators can be overruled by using
 parentheses.  Think of the precedence rules as saying where the
 parentheses are assumed to be.  In fact, it is wise to always use
 parentheses whenever there is an unusual combination of operators,
@@ -6668,20 +6783,25 @@ precedence is in this case.  Even experienced programmers occasionally
 forget the exact rules, which leads to mistakes.  Explicit parentheses
 help prevent any such mistakes.
 
-When operators of equal precedence are used together, the leftmost
+   When operators of equal precedence are used together, the leftmost
 operator groups first, except for the assignment, conditional, and
 exponentiation operators, which group in the opposite order.  Thus, `a
 - b + c' groups as `(a - b) + c' and `a = b = c' groups as `a = (b =
 c)'.
 
-The precedence of prefix unary operators does not matter as long as only
-unary operators are involved, because there is only one way to interpret
-them: innermost first.  Thus, `$++i' means `$(++i)' and `++$x' means
-`++($x)'.  However, when another operator follows the operand, then the
-precedence of the unary operators can matter.  `$x^2' means `($x)^2',
-but `-x^2' means `-(x^2)', because `-' has lower precedence than `^',
-whereas `$' has higher precedence.  This table presents `awk''s
-operators, in order of highest to lowest precedence:
+   Normally the precedence of prefix unary operators does not matter,
+because there is only one way to interpret them: innermost first.
+Thus, `$++i' means `$(++i)' and `++$x' means `++($x)'.  However, when
+another operator follows the operand, then the precedence of the unary
+operators can matter.  `$x^2' means `($x)^2', but `-x^2' means
+`-(x^2)', because `-' has lower precedence than `^', whereas `$' has
+higher precedence.  Also, operators cannot be combined in a way that
+violates the precedence rules; for example, `$$0++--' is not a valid
+expression because the first `$' has higher precedence than the `++';
+to avoid the problem the expression can be rewritten as `$($0++)--'.
+
+   This table presents `awk''s operators, in order of highest to lowest
+precedence:
 
 `(...)'
      Grouping.
@@ -6699,7 +6819,7 @@ operators, in order of highest to lowest precedence:
      Unary plus, minus, logical "not."
 
 `* / %'
-     Multiplication, division, modulus.
+     Multiplication, division, remainder.
 
 `+ -'
      Addition, subtraction.
@@ -6757,7 +6877,7 @@ with an associated action.  This major node describes how you build
 patterns and actions, what kinds of things you can do within actions,
 and `awk''s built-in variables.
 
-The pattern-action rules and the statements available for use within
+   The pattern-action rules and the statements available for use within
 actions form the core of `awk' programming.  In a sense, everything
 covered up to here has been the foundation that programs are built on
 top of.  Now it's time to start building something useful.
@@ -6785,7 +6905,7 @@ File: gawk.info,  Node: Pattern Overview,  Next: Using Shell Variables,  Up: Pat
 * BEGIN/END::                   Specifying initialization and cleanup rules.
 * Empty::                       The empty pattern, which matches every record.
 
-Patterns in `awk' control the execution of rules--a rule is executed
+   Patterns in `awk' control the execution of rules--a rule is executed
 when its pattern matches the current input record.  The following is a
 summary of the types of `awk' patterns:
 
@@ -6838,8 +6958,8 @@ against a new input record.  If the expression uses fields such as
 otherwise, it depends on only what has happened so far in the execution
 of the `awk' program.
 
-Comparison expressions, using the comparison operators described in
-*Note Typing and Comparison::, are a very common kind of pattern.
+   Comparison expressions, using the comparison operators described in
+*note Typing and Comparison::, are a very common kind of pattern.
 Regexp matching and nonmatching are also very common expressions.  The
 left operand of the `~' and `!~' operators is a string.  The right
 operand is either a constant regular expression enclosed in slashes
@@ -6860,12 +6980,12 @@ which accepts any record with a first field that contains `foo':
      -| 555-6480
      -| 555-2127
 
-A regexp constant as a pattern is also a special case of an expression
-pattern.  The expression `/foo/' has the value one if `foo' appears in
-the current input record. Thus, as a pattern, `/foo/' matches any
-record containing `foo'.
+   A regexp constant as a pattern is also a special case of an
+expression pattern.  The expression `/foo/' has the value one if `foo'
+appears in the current input record. Thus, as a pattern, `/foo/'
+matches any record containing `foo'.
 
-Boolean expressions are also commonly used as patterns.  Whether the
+   Boolean expressions are also commonly used as patterns.  Whether the
 pattern matches an input record depends on whether its subexpressions
 match.  For example, the following command prints all the records in
 `BBS-list' that contain both `2400' and `foo':
@@ -6873,7 +6993,7 @@ match.  For example, the following command prints all the records in
      $ awk '/2400/ && /foo/' BBS-list
      -| fooey        555-1234     2400/1200/300     B
 
-The following command prints all records in `BBS-list' that contain
+   The following command prints all records in `BBS-list' that contain
 _either_ `2400' or `foo' (or both, of course):
 
      $ awk '/2400/ || /foo/' BBS-list
@@ -6885,7 +7005,7 @@ _either_ `2400' or `foo' (or both, of course):
      -| sdace        555-3430     2400/1200/300     A
      -| sabafoo      555-2127     1200/300          C
 
-The following command prints all records in `BBS-list' that do _not_
+   The following command prints all records in `BBS-list' that do _not_
 contain the string `foo':
 
      $ awk '! /foo/' BBS-list
@@ -6897,12 +7017,12 @@ contain the string `foo':
      -| core         555-2912     1200/300          C
      -| sdace        555-3430     2400/1200/300     A
 
-The subexpressions of a Boolean operator in a pattern can be constant
-regular expressions, comparisons, or any other `awk' expressions.  Range
-patterns are not expressions, so they cannot appear inside Boolean
-patterns.  Likewise, the special patterns `BEGIN' and `END', which
-never match any input record, are not expressions and cannot appear
-inside Boolean patterns.
+   The subexpressions of a Boolean operator in a pattern can be
+constant regular expressions, comparisons, or any other `awk'
+expressions.  Range patterns are not expressions, so they cannot appear
+inside Boolean patterns.  Likewise, the special patterns `BEGIN' and
+`END', which never match any input record, are not expressions and
+cannot appear inside Boolean patterns.
 
 
 File: gawk.info,  Node: Ranges,  Next: BEGIN/END,  Prev: Expression Patterns,  Up: Pattern Overview
@@ -6920,7 +7040,7 @@ following:
 
 prints every record in `myfile' between `on'/`off' pairs, inclusive.
 
-A range pattern starts out by matching BEGPAT against every input
+   A range pattern starts out by matching BEGPAT against every input
 record.  When a record matches BEGPAT, the range pattern is "turned on"
 and the range pattern matches this record as well.  As long as the
 range pattern stays turned on, it automatically matches every input
@@ -6929,12 +7049,12 @@ record; when this succeeds, the range pattern is turned off again for
 the following record.  Then the range pattern goes back to checking
 BEGPAT against each record.
 
-The record that turns on the range pattern and the one that turns it
+   The record that turns on the range pattern and the one that turns it
 off both match the range pattern.  If you don't want to operate on
 these records, you can write `if' statements in the rule's action to
 distinguish them from the records you are interested in.
 
-It is possible for a pattern to be turned on and off by the same
+   It is possible for a pattern to be turned on and off by the same
 record. If the record satisfies both conditions, then the action is
 executed for just that record.  For example, suppose there is text
 between two identical markers (e.g., the `%' symbol), each on its own
@@ -6955,13 +7075,13 @@ a flag:
      /^%$/     { skip = ! skip; next }
      skip == 1 { next } # skip lines with `skip' set
 
-In a range pattern, the comma (`,') has the lowest precedence of all
+   In a range pattern, the comma (`,') has the lowest precedence of all
 the operators (i.e., it is evaluated last).  Thus, the following
 program attempts to combine a range pattern with another, simpler test:
 
      echo Yes | awk '/1/,/2/ || /Yes/'
 
-The intent of this program is `(/1/,/2/) || /Yes/'.  However, `awk'
+   The intent of this program is `(/1/,/2/) || /Yes/'.  However, `awk'
 interprets this as `/1/, (/2/ || /Yes/)'.  This cannot be changed or
 worked around; range patterns do not combine with other patterns:
 
@@ -7007,7 +7127,7 @@ input is read.  For example:
      -| Analysis of "foo"
      -| "foo" appears 4 times.
 
-This program finds the number of records in the input file `BBS-list'
+   This program finds the number of records in the input file `BBS-list'
 that contain the string `foo'.  The `BEGIN' rule prints a title for the
 report.  There is no need to use the `BEGIN' rule to initialize the
 counter `n' to zero, since `awk' does this automatically (*note
@@ -7015,11 +7135,11 @@ Variables::).  The second rule increments the variable `n' every time a
 record containing the pattern `foo' is read.  The `END' rule prints the
 value of `n' at the end of the run.
 
-The special patterns `BEGIN' and `END' cannot be used in ranges or with
-Boolean operators (indeed, they cannot be used with any operators).  An
-`awk' program may have multiple `BEGIN' and/or `END' rules.  They are
-executed in the order in which they appear: all the `BEGIN' rules at
-startup and all the `END' rules at termination.  `BEGIN' and `END'
+   The special patterns `BEGIN' and `END' cannot be used in ranges or
+with Boolean operators (indeed, they cannot be used with any operators).
+An `awk' program may have multiple `BEGIN' and/or `END' rules.  They
+are executed in the order in which they appear: all the `BEGIN' rules
+at startup and all the `END' rules at termination.  `BEGIN' and `END'
 rules may be intermixed with other rules.  This feature was added in
 the 1987 version of `awk' and is included in the POSIX standard.  The
 original (1978) version of `awk' required the `BEGIN' rule to be placed
@@ -7028,7 +7148,7 @@ end, and only allowed one of each.  This is no longer required, but it
 is a good idea to follow this template in terms of program organization
 and readability.
 
-Multiple `BEGIN' and `END' rules are useful for writing library
+   Multiple `BEGIN' and `END' rules are useful for writing library
 functions, because each library file can have its own `BEGIN' and/or
 `END' rule to do its own initialization and/or cleanup.  The order in
 which library functions are named on the command line controls the
@@ -7038,15 +7158,15 @@ the order in which they are executed doesn't matter.  *Note Options::,
 for more information on using library functions.  *Note Library
 Functions::, for a number of useful library functions.
 
-If an `awk' program has only a `BEGIN' rule and no other rules, then
+   If an `awk' program has only a `BEGIN' rule and no other rules, then
 the program exits after the `BEGIN' rule is run.(1)  However, if an
 `END' rule exists, then the input is read, even if there are no other
 rules in the program.  This is necessary in case the `END' rule checks
 the `FNR' and `NR' variables.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The original version of `awk' used to keep reading and ignoring
+   (1) The original version of `awk' used to keep reading and ignoring
 input until the end of the file was seen.
 
 
@@ -7065,17 +7185,17 @@ give `$0' a real value is to execute a `getline' command without a
 variable (*note Getline::).  Another way is simply to assign a value to
 `$0'.
 
-The second point is similar to the first but from the other direction.
-Traditionally, due largely to implementation issues, `$0' and `NF' were
-_undefined_ inside an `END' rule.  The POSIX standard specifies that
-`NF' is available in an `END' rule. It contains the number of fields
-from the last input record.  Most probably due to an oversight, the
-standard does not say that `$0' is also preserved, although logically
-one would think that it should be.  In fact, `gawk' does preserve the
-value of `$0' for use in `END' rules.  Be aware, however, that Unix
-`awk', and possibly other implementations, do not.
-
-The third point follows from the first two.  The meaning of `print'
+   The second point is similar to the first but from the other
+direction.  Traditionally, due largely to implementation issues, `$0'
+and `NF' were _undefined_ inside an `END' rule.  The POSIX standard
+specifies that `NF' is available in an `END' rule. It contains the
+number of fields from the last input record.  Most probably due to an
+oversight, the standard does not say that `$0' is also preserved,
+although logically one would think that it should be.  In fact, `gawk'
+does preserve the value of `$0' for use in `END' rules.  Be aware,
+however, that Unix `awk', and possibly other implementations, do not.
+
+   The third point follows from the first two.  The meaning of `print'
 inside a `BEGIN' or `END' rule is the same as always: `print $0'.  If
 `$0' is the null string, then this prints an empty line.  Many long
 time `awk' programmers use an unadorned `print' in `BEGIN' and `END'
@@ -7085,11 +7205,11 @@ idea in `END' rules, at least in `gawk'.  It is also poor style, since
 if an empty line is needed in the output, the program should print one
 explicitly.
 
-Finally, the `next' and `nextfile' statements are not allowed in a
+   Finally, the `next' and `nextfile' statements are not allowed in a
 `BEGIN' rule, because the implicit
 read-a-record-and-match-against-the-rules loop has not started yet.
 Similarly, those statements are not valid in an `END' rule, since all
-the input has been read.  (*Note Next Statement::, and see *Note
+the input has been read.  (*Note Next Statement::, and see *note
 Nextfile Statement::.)
 
 
@@ -7117,7 +7237,7 @@ hold a pattern that the `awk' program searches for.  There are two ways
 to get the value of the shell variable into the body of the `awk'
 program.
 
-The most common method is to use shell quoting to substitute the
+   The most common method is to use shell quoting to substitute the
 variable's value into the program inside the script.  For example, in
 the following program:
 
@@ -7131,12 +7251,12 @@ concatenated together to form the program.  The first part is
 double-quoted, which allows substitution of the `pattern' variable
 inside the quotes.  The second part is single-quoted.
 
-Variable substitution via quoting works, but can be potentially messy.
-It requires a good understanding of the shell's quoting rules (*note
-Quoting::), and it's often difficult to correctly match up the quotes
-when reading the program.
+   Variable substitution via quoting works, but can be potentially
+messy.  It requires a good understanding of the shell's quoting rules
+(*note Quoting::), and it's often difficult to correctly match up the
+quotes when reading the program.
 
-A better method is to use `awk''s variable assignment feature (*note
+   A better method is to use `awk''s variable assignment feature (*note
 Assignment Options::) to assign the shell variable's value to an `awk'
 variable's value.  Then use dynamic regexps to match the pattern (*note
 Computed Regexps::).  The following shows how to redo the previous
@@ -7175,8 +7295,8 @@ outline, an `awk' program generally looks like this:
      function NAME(ARGS) { ... }
      ...
 
-An action consists of one or more `awk' "statements", enclosed in curly
-braces (`{...}').  Each statement specifies one thing to do.  The
+   An action consists of one or more `awk' "statements", enclosed in
+curly braces (`{...}').  Each statement specifies one thing to do.  The
 statements are separated by newlines or semicolons.  The curly braces
 around an action must be used even if the action contains only one
 statement, or if it contains no statements at all.  However, if you
@@ -7186,7 +7306,7 @@ action is equivalent to `{ print $0 }':
      /foo/  { }     match `foo', do nothing -- empty action
      /foo/          match `foo', print the record -- omitted action
 
-The following types of statements are supported in `awk':
+   The following types of statements are supported in `awk':
 
 Expressions
      Call functions or assign values to variables (*note
@@ -7225,7 +7345,7 @@ File: gawk.info,  Node: Statements,  Next: Built-in Variables,  Prev: Action Ove
 flow of execution in `awk' programs.  Most of the control statements in
 `awk' are patterned on similar statements in C.
 
-All the control statements start with special keywords, such as `if'
+   All the control statements start with special keywords, such as `if'
 and `while', to distinguish them from simple expressions.  Many control
 statements contain other statements.  For example, the `if' statement
 contains another statement that may or may not be executed.  The
@@ -7274,7 +7394,7 @@ following:
      else
          print "x is odd"
 
-In this example, if the expression `x % 2 == 0' is true (that is, if
+   In this example, if the expression `x % 2 == 0' is true (that is, if
 the value of `x' is evenly divisible by two), then the first `print'
 statement is executed; otherwise, the second `print' statement is
 executed.  If the `else' keyword appears on the same line as THEN-BODY
@@ -7331,11 +7451,11 @@ tests whether `i' is less than or equal to three.  This is true when
 increments the value of `i' and the loop repeats.  The loop terminates
 when `i' reaches four.
 
-A newline is not required between the condition and the body; however
-using one makes the program clearer unless the body is a compound
-statement or else is very simple.  The newline after the open-brace
-that begins the compound statement is not required either, but the
-program is harder to read without it.
+   A newline is not required between the condition and the body;
+however using one makes the program clearer unless the body is a
+compound statement or else is very simple.  The newline after the
+open-brace that begins the compound statement is not required either,
+but the program is harder to read without it.
 
 
 File: gawk.info,  Node: Do Statement,  Next: For Statement,  Prev: While Statement,  Up: Statements
@@ -7351,7 +7471,7 @@ the CONDITION is true.  It looks like this:
        BODY
      while (CONDITION)
 
-Even if the CONDITION is false at the start, the BODY is executed at
+   Even if the CONDITION is false at the start, the BODY is executed at
 least once (and only once, unless executing BODY makes CONDITION true).
 Contrast this with the corresponding `while' statement:
 
@@ -7388,8 +7508,8 @@ loop.  The general form of the `for' statement looks like this:
 The INITIALIZATION, CONDITION, and INCREMENT parts are arbitrary `awk'
 expressions, and BODY stands for any `awk' statement.
 
-The `for' statement starts by executing INITIALIZATION.  Then, as long
-as the CONDITION is true, it repeatedly executes BODY and then
+   The `for' statement starts by executing INITIALIZATION.  Then, as
+long as the CONDITION is true, it repeatedly executes BODY and then
 INCREMENT.  Typically, INITIALIZATION sets a variable to either zero or
 one, INCREMENT adds one to it, and CONDITION compares it against the
 desired number of iterations.  For example:
@@ -7401,18 +7521,19 @@ desired number of iterations.  For example:
 This prints the first three fields of each input record, with one field
 per line.
 
-It isn't possible to set more than one variable in the INITIALIZATION
-part without using a multiple assignment statement such as `x = y = 0'.
-This makes sense only if all the initial values are equal.  (But it is
-possible to initialize additional variables by writing their
-assignments as separate statements preceding the `for' loop.)
+   It isn't possible to set more than one variable in the
+INITIALIZATION part without using a multiple assignment statement such
+as `x = y = 0'. This makes sense only if all the initial values are
+equal.  (But it is possible to initialize additional variables by
+writing their assignments as separate statements preceding the `for'
+loop.)
 
-The same is true of the INCREMENT part. Incrementing additional
+   The same is true of the INCREMENT part. Incrementing additional
 variables requires separate statements at the end of the loop.  The C
 compound expression, using C's comma operator, is useful in this
 context but it is not supported in `awk'.
 
-Most often, INCREMENT is an increment expression, as in the previous
+   Most often, INCREMENT is an increment expression, as in the previous
 example.  But this is not required; it can be any expression
 whatsoever.  For example, the following statement prints all the powers
 of two between 1 and 100:
@@ -7420,14 +7541,14 @@ of two between 1 and 100:
      for (i = 1; i <= 100; i *= 2)
        print i
 
-If there is nothing to be done, any of the three expressions in the
+   If there is nothing to be done, any of the three expressions in the
 parentheses following the `for' keyword may be omitted.  Thus,
 `for (; x > 0;)' is equivalent to `while (x > 0)'.  If the CONDITION is
 omitted, it is treated as true, effectively yielding an "infinite loop"
 (i.e., a loop that never terminates).
 
-In most cases, a `for' loop is an abbreviation for a `while' loop, as
-shown here:
+   In most cases, a `for' loop is an abbreviation for a `while' loop,
+as shown here:
 
      INITIALIZATION
      while (CONDITION) {
@@ -7440,14 +7561,14 @@ Statement::) is used inside the loop. Changing a `for' statement to a
 `while' statement in this way can change the effect of the `continue'
 statement inside the loop.
 
-The `awk' language has a `for' statement in addition to a `while'
+   The `awk' language has a `for' statement in addition to a `while'
 statement because a `for' loop is often both less work to type and more
 natural to think of.  Counting the number of iterations is very common
 in loops.  It can be easier to think of this counting as part of
 looping rather than as something to do inside the loop.
 
-There is an alternate version of the `for' loop, for iterating over all
-the indices of an array:
+   There is an alternate version of the `for' loop, for iterating over
+all the indices of an array:
 
      for (i in array)
          DO SOMETHING WITH array[i]
@@ -7467,12 +7588,12 @@ File: gawk.info,  Node: Switch Statement,  Next: Break Statement,  Prev: For Sta
      configured and built.  *Note Additional Configuration Options::,
      for more information.
 
-The `switch' statement allows the evaluation of an expression and the
-execution of statements based on a `case' match. Case statements are
-checked for a match in the order they are defined.  If no suitable
+   The `switch' statement allows the evaluation of an expression and
+the execution of statements based on a `case' match. Case statements
+are checked for a match in the order they are defined.  If no suitable
 `case' is found, the `default' section is executed, if supplied.
 
-Each `case' contains a single constant, be it numeric, string, or
+   Each `case' contains a single constant, be it numeric, string, or
 regexp.  The `switch' expression is evaluated, and then each `case''s
 constant is compared against the result in turn. The type of constant
 determines the comparison: numeric or string do the usual comparisons.
@@ -7487,7 +7608,7 @@ statement looks like this:
          DEFAULT-BODY
      }
 
-Control flow in the `switch' statement works as it does in C. Once a
+   Control flow in the `switch' statement works as it does in C. Once a
 match to a given case is made, case statement bodies are executed until
 a `break', `continue', `next', `nextfile'  or `exit' is encountered, or
 the end of the `switch' statement itself. For example:
@@ -7508,9 +7629,9 @@ the end of the `switch' statement itself. For example:
          print NR * -1
      }
 
-Note that if none of the statements specified above halt execution of a
-matched `case' statement, execution falls through to the next `case'
-until execution halts. In the above example, for any case value
+   Note that if none of the statements specified above halt execution
+of a matched `case' statement, execution falls through to the next
+`case' until execution halts. In the above example, for any case value
 starting with `2' followed by one or more digits, the `print' statement
 is executed and then falls through into the `default' section,
 executing its `print' statement. In turn, the -1 case will also be
@@ -7538,14 +7659,14 @@ divisor of any integer, and also identifies prime numbers:
           printf "%d is prime\n", num
      }
 
-When the remainder is zero in the first `if' statement, `awk'
+   When the remainder is zero in the first `if' statement, `awk'
 immediately "breaks out" of the containing `for' loop.  This means that
 `awk' proceeds immediately to the statement following the loop and
 continues processing.  (This is very different from the `exit'
 statement, which stops the entire `awk' program.  *Note Exit
 Statement::.)
 
-Th following program illustrates how the CONDITION of a `for' or
+   Th following program illustrates how the CONDITION of a `for' or
 `while' statement could be replaced with a `break' inside an `if':
 
      # find smallest divisor of num
@@ -7563,7 +7684,7 @@ Th following program illustrates how the CONDITION of a `for' or
        }
      }
 
-The `break' statement has no meaning when used outside the body of a
+   The `break' statement has no meaning when used outside the body of a
 loop.  However, although it was never documented, historical
 implementations of `awk' treated the `break' statement outside of a
 loop as if it were a `next' statement (*note Next Statement::).  Recent
@@ -7584,8 +7705,8 @@ As with `break', the `continue' statement is used only inside `for',
 causing the next cycle around the loop to begin immediately.  Contrast
 this with `break', which jumps out of the loop altogether.
 
-The `continue' statement in a `for' loop directs `awk' to skip the rest
-of the body of the loop and resume execution with the
+   The `continue' statement in a `for' loop directs `awk' to skip the
+rest of the body of the loop and resume execution with the
 increment-expression of the `for' statement.  The following program
 illustrates this fact:
 
@@ -7616,8 +7737,8 @@ the previous example with the following `while' loop:
 
 This program loops forever once `x' reaches 5.
 
-The `continue' statement has no meaning when used outside the body of a
-loop.  Historical versions of `awk' treated a `continue' statement
+   The `continue' statement has no meaning when used outside the body of
+a loop.  Historical versions of `awk' treated a `continue' statement
 outside a loop the same way they treated a `break' statement outside a
 loop: as if it were a `next' statement (*note Next Statement::).
 Recent versions of Unix `awk' no longer work this way, and `gawk'
@@ -7637,20 +7758,20 @@ current record and go on to the next record.  This means that no
 further rules are executed for the current record, and the rest of the
 current rule's action isn't executed.
 
-Contrast this with the effect of the `getline' function (*note
+   Contrast this with the effect of the `getline' function (*note
 Getline::).  That also causes `awk' to read the next record
 immediately, but it does not alter the flow of control in any way
 (i.e., the rest of the current action executes with a new input record).
 
-At the highest level, `awk' program execution is a loop that reads an
-input record and then tests each rule's pattern against it.  If you
+   At the highest level, `awk' program execution is a loop that reads
+an input record and then tests each rule's pattern against it.  If you
 think of this loop as a `for' statement whose body contains the rules,
 then the `next' statement is analogous to a `continue' statement. It
 skips to the end of the body of this implicit loop and executes the
 increment (which reads another record).
 
-For example, suppose an `awk' program works only on records with four
-fields, and it shouldn't fail when given bad input.  To avoid
+   For example, suppose an `awk' program works only on records with
+four fields, and it shouldn't fail when given bad input.  To avoid
 complicating the rest of the program, write a "weed out" rule near the
 beginning, in the following manner:
 
@@ -7663,9 +7784,9 @@ beginning, in the following manner:
 Because of the `next' statement, the program's subsequent rules won't
 see the bad record.  The error message is redirected to the standard
 error output stream, as error messages should be.  For more detail see
-*Note Special Files::.
+*note Special Files::.
 
-According to the POSIX standard, the behavior is undefined if the
+   According to the POSIX standard, the behavior is undefined if the
 `next' statement is used in a `BEGIN' or `END' rule.  `gawk' treats it
 as a syntax error.  Although POSIX permits it, some other `awk'
 implementations don't allow the `next' statement inside function bodies
@@ -7686,11 +7807,11 @@ File: gawk.info,  Node: Nextfile Statement,  Next: Exit Statement,  Prev: Next S
 current record, the `nextfile' statement instructs `gawk' to stop
 processing the current data file.
 
-The `nextfile' statement is a `gawk' extension.  In most other `awk'
+   The `nextfile' statement is a `gawk' extension.  In most other `awk'
 implementations, or if `gawk' is in compatibility mode (*note
 Options::), `nextfile' is not special.
 
-Upon execution of the `nextfile' statement, `FILENAME' is updated to
+   Upon execution of the `nextfile' statement, `FILENAME' is updated to
 the name of the next data file listed on the command line, `FNR' is
 reset to one, `ARGIND' is incremented, and processing starts over with
 the first rule in the program.  (`ARGIND' hasn't been introduced yet.
@@ -7698,30 +7819,30 @@ the first rule in the program.  (`ARGIND' hasn't been introduced yet.
 end of the input to be reached, then the code in any `END' rules is
 executed.  *Note BEGIN/END::.
 
-The `nextfile' statement is useful when there are many data files to
+   The `nextfile' statement is useful when there are many data files to
 process but it isn't necessary to process every record in every file.
 Normally, in order to move on to the next data file, a program has to
 continue scanning the unwanted records.  The `nextfile' statement
 accomplishes this much more efficiently.
 
-While one might think that `close(FILENAME)' would accomplish the same
-as `nextfile', this isn't true.  `close' is reserved for closing files,
-pipes, and coprocesses that are opened with redirections.  It is not
-related to the main processing that `awk' does with the files listed in
-`ARGV'.
+   While one might think that `close(FILENAME)' would accomplish the
+same as `nextfile', this isn't true.  `close' is reserved for closing
+files, pipes, and coprocesses that are opened with redirections.  It is
+not related to the main processing that `awk' does with the files
+listed in `ARGV'.
 
-If it's necessary to use an `awk' version that doesn't support
-`nextfile', see *Note Nextfile Function::, for a user-defined function
+   If it's necessary to use an `awk' version that doesn't support
+`nextfile', see *note Nextfile Function::, for a user-defined function
 that simulates the `nextfile' statement.
 
-The current version of the Bell Laboratories `awk' (*note Other
+   The current version of the Bell Laboratories `awk' (*note Other
 Versions::) also supports `nextfile'.  However, it doesn't allow the
 `nextfile' statement inside function bodies (*note User-defined::).
 `gawk' does; a `nextfile' inside a function body reads the next record
 and starts processing it with the first rule in the program, just as
 any other `nextfile' statement.
 
-*Caution:*  Versions of `gawk' prior to 3.0 used two words (`next
+   *Caution:*  Versions of `gawk' prior to 3.0 used two words (`next
 file') for the `nextfile' statement.  In version 3.0, this was changed
 to one word, because the treatment of `file' was inconsistent. When it
 appeared after `next', `file' was a keyword; otherwise, it was a
@@ -7740,31 +7861,31 @@ ignored.  The `exit' statement is written as follows:
 
      exit [RETURN CODE]
 
-When an `exit' statement is executed from a `BEGIN' rule, the program
-stops processing everything immediately.  No input records are read.
-However, if an `END' rule is present, as part of executing the `exit'
-statement, the `END' rule is executed (*note BEGIN/END::).  If `exit'
-is used as part of an `END' rule, it causes the program to stop
+   When an `exit' statement is executed from a `BEGIN' rule, the
+program stops processing everything immediately.  No input records are
+read.  However, if an `END' rule is present, as part of executing the
+`exit' statement, the `END' rule is executed (*note BEGIN/END::).  If
+`exit' is used as part of an `END' rule, it causes the program to stop
 immediately.
 
-An `exit' statement that is not part of a `BEGIN' or `END' rule stops
-the execution of any further automatic rules for the current record,
-skips reading any remaining input records, and executes the `END' rule
-if there is one.
+   An `exit' statement that is not part of a `BEGIN' or `END' rule
+stops the execution of any further automatic rules for the current
+record, skips reading any remaining input records, and executes the
+`END' rule if there is one.
 
-In such a case, if you don't want the `END' rule to do its job, set a
-variable to nonzero before the `exit' statement and check that variable
-in the `END' rule.  *Note Assert Function::, for an example that does
-this.
+   In such a case, if you don't want the `END' rule to do its job, set
+a variable to nonzero before the `exit' statement and check that
+variable in the `END' rule.  *Note Assert Function::, for an example
+that does this.
 
-If an argument is supplied to `exit', its value is used as the exit
+   If an argument is supplied to `exit', its value is used as the exit
 status code for the `awk' process.  If no argument is supplied, `exit'
 returns status zero (success).  In the case where an argument is
 supplied to a first `exit' statement, and then `exit' is called a
 second time from an `END' rule with no argument, `awk' uses the
 previously supplied exit value.  (d.c.)
 
-For example, suppose an error condition occurs that is difficult or
+   For example, suppose an error condition occurs that is difficult or
 impossible to handle.  Conventionally, programs report this by exiting
 with a nonzero status.  An `awk' program can do this using an `exit'
 statement with a nonzero argument, as shown in the following example:
@@ -7792,8 +7913,8 @@ of these automatically, so that they enable you to tell `awk' how to do
 certain things.  Others are set automatically by `awk', so that they
 carry information from the internal workings of `awk' to your program.
 
-This minor node documents all the built-in variables of `gawk', most of
-which are also documented in the chapters describing their areas of
+   This minor node documents all the built-in variables of `gawk', most
+of which are also documented in the chapters describing their areas of
 activity.
 
 * Menu:
@@ -7823,7 +7944,7 @@ specific to `gawk' are marked with a pound sign (`#').
      use binary I/O.  A string value of `"rw"' or `"wr"' indicates that
      all files should use binary I/O.  Any other string value is
      equivalent to `"rw"', but `gawk' generates a warning message.
-     `BINMODE' is described in more detail in *Note PC Using::.
+     `BINMODE' is described in more detail in *note PC Using::.
 
      This variable is a `gawk' extension.  In other `awk'
      implementations (except `mawk', *note Other Versions::), or if
@@ -7954,9 +8075,9 @@ specific to `gawk' are marked with a pound sign (`#').
      implementations, or if `gawk' is in compatibility mode (*note
      Options::), it is not special.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) In POSIX `awk', newline does not count as whitespace.
+   (1) In POSIX `awk', newline does not count as whitespace.
 
 
 File: gawk.info,  Node: Auto-set,  Next: ARGC and ARGV,  Prev: User-modified,  Up: Built-in Variables
@@ -8165,19 +8286,19 @@ Before `FNR' was added to the `awk' language (*note V7/SVR3.1::), many
 `awk' programs used this feature to track the number of records in a
 file by resetting `NR' to zero when `FILENAME' changed.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Some early implementations of Unix `awk' initialized `FILENAME' to
-`"-"', even if there were data files to be processed. This behavior was
-incorrect and should not be relied upon in your programs.
+   (1) Some early implementations of Unix `awk' initialized `FILENAME'
+to `"-"', even if there were data files to be processed. This behavior
+was incorrect and should not be relied upon in your programs.
 
 
 File: gawk.info,  Node: ARGC and ARGV,  Prev: Auto-set,  Up: Built-in Variables
 
-6.5.4 Using `ARGC' and `ARGV'
+6.5.3 Using `ARGC' and `ARGV'
 -----------------------------
 
-*Note Auto-set::, presented the following program describing the
+*note Auto-set::, presented the following program describing the
 information contained in `ARGC' and `ARGV':
 
      $ awk 'BEGIN {
@@ -8210,27 +8331,27 @@ treated as arguments and do show up in the `ARGV' array:
      -|        ARGV[2] = /dev/null
      -| A=1, B=2
 
-A program can alter `ARGC' and the elements of `ARGV'.  Each time `awk'
-reaches the end of an input file, it uses the next element of `ARGV' as
-the name of the next input file.  By storing a different string there,
-a program can change which files are read.  Use `"-"' to represent the
-standard input.  Storing additional elements and incrementing `ARGC'
-causes additional files to be read.
-
-If the value of `ARGC' is decreased, that eliminates input files from
-the end of the list.  By recording the old value of `ARGC' elsewhere, a
-program can treat the eliminated arguments as something other than file
-names.
-
-To eliminate a file from the middle of the list, store the null string
-(`""') into `ARGV' in place of the file's name.  As a special feature,
-`awk' ignores file names that have been replaced with the null string.
-Another option is to use the `delete' statement to remove elements from
-`ARGV' (*note Delete::).
-
-All of these actions are typically done in the `BEGIN' rule, before
+   A program can alter `ARGC' and the elements of `ARGV'.  Each time
+`awk' reaches the end of an input file, it uses the next element of
+`ARGV' as the name of the next input file.  By storing a different
+string there, a program can change which files are read.  Use `"-"' to
+represent the standard input.  Storing additional elements and
+incrementing `ARGC' causes additional files to be read.
+
+   If the value of `ARGC' is decreased, that eliminates input files
+from the end of the list.  By recording the old value of `ARGC'
+elsewhere, a program can treat the eliminated arguments as something
+other than file names.
+
+   To eliminate a file from the middle of the list, store the null
+string (`""') into `ARGV' in place of the file's name.  As a special
+feature, `awk' ignores file names that have been replaced with the null
+string.  Another option is to use the `delete' statement to remove
+elements from `ARGV' (*note Delete::).
+
+   All of these actions are typically done in the `BEGIN' rule, before
 actual processing of the input begins.  *Note Split Program::, and see
-*Note Tee Program::, for examples of each way of removing elements from
+*note Tee Program::, for examples of each way of removing elements from
 `ARGV'.  The following fragment processes `ARGV' in order to examine,
 and then remove, command-line options:
 
@@ -8240,9 +8361,9 @@ and then remove, command-line options:
                  verbose = 1
              else if (ARGV[i] == "-d")
                  debug = 1
-             else if (ARGV[i] ~ /^-?/) {
+             else if (ARGV[i] ~ /^-./) {
                  e = sprintf("%s: unrecognized option -- %c",
-                         ARGV[0], substr(ARGV[i], 1, ,1))
+                         ARGV[0], substr(ARGV[i], 2, 1))
                  print e > "/dev/stderr"
              } else
                  break
@@ -8250,17 +8371,17 @@ and then remove, command-line options:
          }
      }
 
-To actually get the options into the `awk' program, end the `awk'
+   To actually get the options into the `awk' program, end the `awk'
 options with `--' and then supply the `awk' program's options, in the
 following manner:
 
      awk -f myprog -- -v -d file1 file2 ...
 
-This is not necessary in `gawk'. Unless `--posix' has been specified,
-`gawk' silently puts any unrecognized options into `ARGV' for the `awk'
-program to deal with.  As soon as it sees an unknown option, `gawk'
-stops looking for other options that it might otherwise recognize.  The
-previous example with `gawk' would be:
+   This is not necessary in `gawk'. Unless `--posix' has been
+specified, `gawk' silently puts any unrecognized options into `ARGV'
+for the `awk' program to deal with.  As soon as it sees an unknown
+option, `gawk' stops looking for other options that it might otherwise
+recognize.  The previous example with `gawk' would be:
 
      gawk -f myprog -d -v file1 file2 ...
 
@@ -8277,14 +8398,14 @@ An "array" is a table of values called "elements".  The elements of an
 array are distinguished by their indices.  "Indices" may be either
 numbers or strings.
 
-This major node describes how arrays work in `awk', how to use array
+   This major node describes how arrays work in `awk', how to use array
 elements, how to scan through every element in an array, and how to
 remove array elements.  It also describes how `awk' simulates
 multidimensional arrays, as well as some of the less obvious points
 about array usage.  The major node finishes with a discussion of
 `gawk''s facility for sorting an array based on its indices.
 
-`awk' maintains a single set of names that may be used for naming
+   `awk' maintains a single set of names that may be used for naming
 variables, arrays, and functions (*note User-defined::).  Thus, you
 cannot have a variable and an array with the same name in the same
 `awk' program.
@@ -8320,13 +8441,13 @@ Array names have the same syntax as variable names; any valid variable
 name would also be a valid array name.  But one name cannot be used in
 both ways (as an array and as a variable) in the same `awk' program.
 
-Arrays in `awk' superficially resemble arrays in other programming
+   Arrays in `awk' superficially resemble arrays in other programming
 languages, but there are fundamental differences.  In `awk', it isn't
 necessary to specify the size of an array before starting to use it.
 Additionally, any number or string in `awk', not just consecutive
 integers, may be used as an array index.
 
-In most other languages, arrays must be "declared" before use,
+   In most other languages, arrays must be "declared" before use,
 including a specification of how many elements or components they
 contain.  In such languages, the declaration causes a contiguous block
 of memory to be allocated for that many elements.  Usually, an index in
@@ -8340,7 +8461,7 @@ languages allow arbitrary starting and ending indices--e.g., `15 ..
 27'--but the size of the array is still fixed when the array is
 declared.)
 
-A contiguous array of four elements might look like the following
+   A contiguous array of four elements might look like the following
 example, conceptually, if the element values are 8, `"foo"', `""', and
 30:
 
@@ -8353,8 +8474,8 @@ Only the values are stored; the indices are implicit from the order of
 the values. Here, 8 is the value at index zero, because 8 appears in the
 position with zero elements before it.
 
-Arrays in `awk' are different--they are "associative".  This means that
-each array is a collection of pairs: an index and its corresponding
+   Arrays in `awk' are different--they are "associative".  This means
+that each array is a collection of pairs: an index and its corresponding
 array element value:
 
      Element 3     Value 30
@@ -8364,8 +8485,8 @@ array element value:
 
 The pairs are shown in jumbled order because their order is irrelevant.
 
-One advantage of associative arrays is that new pairs can be added at
-any time.  For example, suppose a tenth element is added to the array
+   One advantage of associative arrays is that new pairs can be added
+at any time.  For example, suppose a tenth element is added to the array
 whose value is `"number ten"'.  The result is:
 
      Element 10    Value "number ten"
@@ -8378,7 +8499,7 @@ Now the array is "sparse", which just means some indices are missing.
 It has elements 0-3 and 10, but doesn't have elements 4, 5, 6, 7, 8, or
 9.
 
-Another consequence of associative arrays is that the indices don't
+   Another consequence of associative arrays is that the indices don't
 have to be positive integers.  Any number, or even a string, can be an
 index.  For example, the following is an array that translates words
 from English to French:
@@ -8391,17 +8512,17 @@ from English to French:
 Here we decided to translate the number one in both spelled-out and
 numeric form--thus illustrating that a single array can have both
 numbers and strings as indices.  In fact, array subscripts are always
-strings; this is discussed in more detail in *Note Numeric Array
+strings; this is discussed in more detail in *note Numeric Array
 Subscripts::.  Here, the number `1' isn't double-quoted, since `awk'
 automatically converts it to a string.
 
-The value of `IGNORECASE' has no effect upon array subscripting.  The
-identical string value used to store an array element must be used to
-retrieve it.  When `awk' creates an array (e.g., with the `split'
+   The value of `IGNORECASE' has no effect upon array subscripting.
+The identical string value used to store an array element must be used
+to retrieve it.  When `awk' creates an array (e.g., with the `split'
 built-in function), that array's indices are consecutive integers
 starting at one.  (*Note String Functions::.)
 
-`awk''s arrays are efficient--the time to access an element is
+   `awk''s arrays are efficient--the time to access an element is
 independent of the number of elements in the array.
 
 
@@ -8418,19 +8539,19 @@ An array reference is an expression as follows:
 Here, ARRAY is the name of an array.  The expression INDEX is the index
 of the desired element of the array.
 
-The value of the array reference is the current value of that array
+   The value of the array reference is the current value of that array
 element.  For example, `foo[4.3]' is an expression for the element of
 array `foo' at index `4.3'.
 
-A reference to an array element that has no recorded value yields a
+   A reference to an array element that has no recorded value yields a
 value of `""', the null string.  This includes elements that have not
 been assigned any value as well as elements that have been deleted
 (*note Delete::).  Such a reference automatically creates that array
 element, with the null string as its value.  (In some cases, this is
 unfortunate, because it might waste memory inside `awk'.)
 
-To determine whether an element exists in an array at a certain index,
-use the following expression:
+   To determine whether an element exists in an array at a certain
+index, use the following expression:
 
      INDEX in ARRAY
 
@@ -8443,7 +8564,7 @@ whether the array `frequencies' contains the index `2':
      if (2 in frequencies)
          print "Subscript 2 is present."
 
-Note that this is _not_ a test of whether the array `frequencies'
+   Note that this is _not_ a test of whether the array `frequencies'
 contains an element whose _value_ is two.  There is no way to do that
 except to scan all the elements.  Also, this _does not_ create
 `frequencies[2]', while the following (incorrect) alternative does:
@@ -8491,8 +8612,8 @@ number:
          print arr[x]
      }
 
-The first rule keeps track of the largest line number seen so far; it
-also stores each line into the array `arr', at an index that is the
+   The first rule keeps track of the largest line number seen so far;
+it also stores each line into the array `arr', at an index that is the
 line's number.  The second rule runs after all the input has been read,
 to print out all the lines.  When this program is run with the
 following input:
@@ -8511,7 +8632,7 @@ Its output is:
      4  . . . And four on the floor
      5  I am the Five man
 
-If a line number is repeated, the last line with a given number
+   If a line number is repeated, the last line with a given number
 overrides the others.  Gaps in the line numbers can be handled with an
 easy improvement to the program's `END' rule, as follows:
 
@@ -8541,14 +8662,14 @@ has a special kind of `for' statement for scanning an array:
 This loop executes BODY once for each index in ARRAY that the program
 has previously used, with the variable VAR set to that index.
 
-The following program uses this form of the `for' statement.  The first
-rule scans the input records and notes which words appear (at least
-once) in the input, by storing a one into the array `used' with the
-word as index.  The second rule scans the elements of `used' to find
-all the distinct words that appear in the input.  It prints each word
-that is more than 10 characters long and also prints the number of such
-words.  *Note String Functions::, for more information on the built-in
-function `length'.
+   The following program uses this form of the `for' statement.  The
+first rule scans the input records and notes which words appear (at
+least once) in the input, by storing a one into the array `used' with
+the word as index.  The second rule scans the elements of `used' to
+find all the distinct words that appear in the input.  It prints each
+word that is more than 10 characters long and also prints the number of
+such words.  *Note String Functions::, for more information on the
+built-in function `length'.
 
      # Record a 1 for each word that is used at least once
      {
@@ -8568,13 +8689,13 @@ function `length'.
 
 *Note Word Sorting::, for a more detailed example of this type.
 
-The order in which elements of the array are accessed by this statement
-is determined by the internal arrangement of the array elements within
-`awk' and cannot be controlled or changed.  This can lead to problems
-if new elements are added to ARRAY by statements in the loop body; it
-is not predictable whether the `for' loop will reach them.  Similarly,
-changing VAR inside the loop may produce strange results.  It is best
-to avoid such things.
+   The order in which elements of the array are accessed by this
+statement is determined by the internal arrangement of the array
+elements within `awk' and cannot be controlled or changed.  This can
+lead to problems if new elements are added to ARRAY by statements in
+the loop body; it is not predictable whether the `for' loop will reach
+them.  Similarly, changing VAR inside the loop may produce strange
+results.  It is best to avoid such things.
 
 
 File: gawk.info,  Node: Delete,  Next: Numeric Array Subscripts,  Prev: Scanning an Array,  Up: Arrays
@@ -8586,10 +8707,10 @@ To remove an individual element of an array, use the `delete' statement:
 
      delete ARRAY[INDEX]
 
-Once an array element has been deleted, any value the element once had
-is no longer available. It is as if the element had never been referred
-to or had been given a value.  The following is an example of deleting
-elements in an array:
+   Once an array element has been deleted, any value the element once
+had is no longer available. It is as if the element had never been
+referred to or had been given a value.  The following is an example of
+deleting elements in an array:
 
      for (i in frequencies)
        delete frequencies[i]
@@ -8603,49 +8724,49 @@ the presence of that element returns zero (i.e., false):
      if (4 in foo)
          print "This will never be printed"
 
-It is important to note that deleting an element is _not_ the same as
-assigning it a null value (the empty string, `""').  For example:
+   It is important to note that deleting an element is _not_ the same
+as assigning it a null value (the empty string, `""').  For example:
 
      foo[4] = ""
      if (4 in foo)
        print "This is printed, even though foo[4] is empty"
 
-It is not an error to delete an element that does not exist.  If
+   It is not an error to delete an element that does not exist.  If
 `--lint' is provided on the command line (*note Options::), `gawk'
 issues a warning message when an element that is not in the array is
 deleted.
 
-All the elements of an array may be deleted with a single statement by
-leaving off the subscript in the `delete' statement, as follows:
+   All the elements of an array may be deleted with a single statement
+by leaving off the subscript in the `delete' statement, as follows:
 
      delete ARRAY
 
-This ability is a `gawk' extension; it is not available in
+   This ability is a `gawk' extension; it is not available in
 compatibility mode (*note Options::).
 
-Using this version of the `delete' statement is about three times more
-efficient than the equivalent loop that deletes each element one at a
-time.
+   Using this version of the `delete' statement is about three times
+more efficient than the equivalent loop that deletes each element one
+at a time.
 
-The following statement provides a portable but nonobvious way to clear
-out an array:(1)
+   The following statement provides a portable but nonobvious way to
+clear out an array:(1)
 
      split("", array)
 
-The `split' function (*note String Functions::) clears out the target
-array first. This call asks it to split apart the null string. Because
-there is no data to split out, the function simply clears the array and
-then returns.
+   The `split' function (*note String Functions::) clears out the
+target array first. This call asks it to split apart the null string.
+Because there is no data to split out, the function simply clears the
+array and then returns.
 
-*Caution:* Deleting an array does not change its type; you cannot
+   *Caution:* Deleting an array does not change its type; you cannot
 delete an array and then use the array's name as a scalar (i.e., a
 regular variable). For example, the following does not work:
 
      a[1] = 3; delete a; a = 3
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Thanks to Michael Brennan for pointing this out.
+   (1) Thanks to Michael Brennan for pointing this out.
 
 
 File: gawk.info,  Node: Numeric Array Subscripts,  Next: Uninitialized Subscripts,  Prev: Delete,  Up: Arrays
@@ -8678,7 +8799,7 @@ assigned the value one.  The program then changes the value of
 two significant digits.  This test fails, since `"12.15"' is a
 different string from `"12.153"'.
 
-According to the rules for conversions (*note Conversion::), integer
+   According to the rules for conversions (*note Conversion::), integer
 values are always converted to strings as integers, no matter what the
 value of `CONVFMT' may happen to be.  So the usual case of the
 following works:
@@ -8686,17 +8807,17 @@ following works:
      for (i = 1; i <= maxsub; i++)
          do something with array[i]
 
-The "integer values always convert to strings as integers" rule has an
-additional consequence for array indexing.  Octal and hexadecimal
+   The "integer values always convert to strings as integers" rule has
+an additional consequence for array indexing.  Octal and hexadecimal
 constants (*note Nondecimal-numbers::) are converted internally into
 numbers, and their original form is forgotten.  This means, for
 example, that `array[17]', `array[021]', and `array[0x11]' all refer to
 the same element!
 
-As with many things in `awk', the majority of the time things work as
-one would expect them to.  But it is useful to have a precise knowledge
-of the actual rules which sometimes can have a subtle effect on your
-programs.
+   As with many things in `awk', the majority of the time things work
+as one would expect them to.  But it is useful to have a precise
+knowledge of the actual rules which sometimes can have a subtle effect
+on your programs.
 
 
 File: gawk.info,  Node: Uninitialized Subscripts,  Next: Multi-dimensional,  Prev: Numeric Array Subscripts,  Up: Arrays
@@ -8718,14 +8839,14 @@ might look like this:
      -| line 3
      -| line 2
 
-Unfortunately, the very first line of input data did not come out in the
-output!
+   Unfortunately, the very first line of input data did not come out in
+the output!
 
-At first glance, this program should have worked.  The variable `lines'
-is uninitialized, and uninitialized variables have the numeric value
-zero.  So, `awk' should have printed the value of `l[0]'.
+   At first glance, this program should have worked.  The variable
+`lines' is uninitialized, and uninitialized variables have the numeric
+value zero.  So, `awk' should have printed the value of `l[0]'.
 
-The issue here is that subscripts for `awk' arrays are _always_
+   The issue here is that subscripts for `awk' arrays are _always_
 strings. Uninitialized variables, when used as strings, have the value
 `""', not zero.  Thus, `line 1' ends up stored in `l[""]'.  The
 following version of the program works correctly:
@@ -8736,14 +8857,14 @@ following version of the program works correctly:
             print l[i]
      }
 
-Here, the `++' forces `lines' to be numeric, thus making the "old
+   Here, the `++' forces `lines' to be numeric, thus making the "old
 value" numeric zero. This is then converted to `"0"' as the array
 subscript.
 
-Even though it is somewhat unusual, the null string (`""') is a valid
-array subscript.  (d.c.)  `gawk' warns about the use of the null string
-as a subscript if `--lint' is provided on the command line (*note
-Options::).
+   Even though it is somewhat unusual, the null string (`""') is a
+valid array subscript.  (d.c.)  `gawk' warns about the use of the null
+string as a subscript if `--lint' is provided on the command line
+(*note Options::).
 
 
 File: gawk.info,  Node: Multi-dimensional,  Next: Multi-scanning,  Prev: Uninitialized Subscripts,  Up: Arrays
@@ -8757,40 +8878,41 @@ two-dimensional array requires two indices.  The usual way (in most
 languages, including `awk') to refer to an element of a two-dimensional
 array named `grid' is with `grid[X,Y]'.
 
-Multidimensional arrays are supported in `awk' through concatenation of
-indices into one string.  `awk' converts the indices into strings
+   Multidimensional arrays are supported in `awk' through concatenation
+of indices into one string.  `awk' converts the indices into strings
 (*note Conversion::) and concatenates them together, with a separator
 between them.  This creates a single string that describes the values
 of the separate indices.  The combined string is used as a single index
 into an ordinary, one-dimensional array.  The separator used is the
 value of the built-in variable `SUBSEP'.
 
-For example, suppose we evaluate the expression `foo[5,12] = "value"'
+   For example, suppose we evaluate the expression `foo[5,12] = "value"'
 when the value of `SUBSEP' is `"@"'.  The numbers 5 and 12 are
 converted to strings and concatenated with an `@' between them,
 yielding `"5@12"'; thus, the array element `foo["5@12"]' is set to
 `"value"'.
 
-Once the element's value is stored, `awk' has no record of whether it
-was stored with a single index or a sequence of indices.  The two
+   Once the element's value is stored, `awk' has no record of whether
+it was stored with a single index or a sequence of indices.  The two
 expressions `foo[5,12]' and `foo[5 SUBSEP 12]' are always equivalent.
 
-The default value of `SUBSEP' is the string `"\034"', which contains a
-nonprinting character that is unlikely to appear in an `awk' program or
-in most input data.  The usefulness of choosing an unlikely character
-comes from the fact that index values that contain a string matching
-`SUBSEP' can lead to combined strings that are ambiguous.  Suppose that
-`SUBSEP' is `"@"'; then `foo["a@b", "c"]' and `foo["a", "b@c"]' are
-indistinguishable because both are actually stored as `foo["a@b@c"]'.
+   The default value of `SUBSEP' is the string `"\034"', which contains
+a nonprinting character that is unlikely to appear in an `awk' program
+or in most input data.  The usefulness of choosing an unlikely
+character comes from the fact that index values that contain a string
+matching `SUBSEP' can lead to combined strings that are ambiguous.
+Suppose that `SUBSEP' is `"@"'; then `foo["a@b", "c"]' and
+`foo["a", "b@c"]' are indistinguishable because both are actually
+stored as `foo["a@b@c"]'.
 
-To test whether a particular index sequence exists in a
+   To test whether a particular index sequence exists in a
 multidimensional array, use the same operator (`in') that is used for
 single dimensional arrays.  Write the whole sequence of indices in
 parentheses, separated by commas, as the left operand:
 
      (SUBSCRIPT1, SUBSCRIPT2, ...) in ARRAY
 
-The following example treats its input as a two-dimensional array of
+   The following example treats its input as a two-dimensional array of
 fields; it rotates this array 90 degrees clockwise and prints the
 result.  It assumes that all lines have the same number of elements:
 
@@ -8837,7 +8959,7 @@ array. There cannot be one, because, in truth, there are no
 multidimensional arrays or elements--there is only a multidimensional
 _way of accessing_ an array.
 
-However, if your program has an array that is always accessed as
+   However, if your program has an array that is always accessed as
 multidimensional, you can get the effect of scanning it by combining
 the scanning `for' statement (*note Scanning an Array::) with the
 built-in `split' function (*note String Functions::).  It works in the
@@ -8853,7 +8975,7 @@ in the array, and splits it into the individual indices by breaking it
 apart where the value of `SUBSEP' appears.  The individual indices then
 become the elements of the array `separate'.
 
-Thus, if a value is previously stored in `array[1, "foo"]'; then an
+   Thus, if a value is previously stored in `array[1, "foo"]'; then an
 element with index `"1\034foo"' exists in `array'.  (Recall that the
 default value of `SUBSEP' is the character with code 034.)  Sooner or
 later, the `for' statement finds that index and does an iteration with
@@ -8885,13 +9007,13 @@ example:
      for (i = 1; i <= n; i++)
          DO SOMETHING WITH data[i]
 
-After the call to `asort', the array `data' is indexed from 1 to some
-number N, the total number of elements in `data'.  (This count is
+   After the call to `asort', the array `data' is indexed from 1 to
+some number N, the total number of elements in `data'.  (This count is
 `asort''s return value.)  `data[1]' <= `data[2]' <= `data[3]', and so
 on.  The comparison of array elements is done using `gawk''s usual
 comparison rules (*note Typing and Comparison::).
 
-An important side effect of calling `asort' is that _the array's
+   An important side effect of calling `asort' is that _the array's
 original indices are irrevocably lost_.  As this isn't always
 desirable, `asort' accepts a second argument:
 
@@ -8900,15 +9022,15 @@ desirable, `asort' accepts a second argument:
      for (i = 1; i <= n; i++)
          DO SOMETHING WITH dest[i]
 
-In this case, `gawk' copies the `source' array into the `dest' array
+   In this case, `gawk' copies the `source' array into the `dest' array
 and then sorts `dest', destroying its indices.  However, the `source'
 array is not affected.
 
-Often, what's needed is to sort on the values of the _indices_ instead
-of the values of the elements.  To do that, starting with `gawk' 3.1.2,
-use the `asorti' function.  The interface is identical to that of
-`asort', except that the index values are used for sorting, and become
-the values of the result array:
+   Often, what's needed is to sort on the values of the _indices_
+instead of the values of the elements.  To do that, starting with
+`gawk' 3.1.2, use the `asorti' function.  The interface is identical to
+that of `asort', except that the index values are used for sorting, and
+become the values of the result array:
 
      { source[$0] = some_func($0) }
 
@@ -8921,9 +9043,10 @@ the values of the result array:
          }
      }
 
-If your version of `gawk' is 3.1.0 or 3.1.1, you don't have `asorti'.
-Instead, use a helper array to hold the sorted index values, and then
-access the original array's elements.  It works in the following way:
+   If your version of `gawk' is 3.1.0 or 3.1.1, you don't have
+`asorti'. Instead, use a helper array to hold the sorted index values,
+and then access the original array's elements.  It works in the
+following way:
 
      POPULATE THE ARRAY data
      # copy indices
@@ -8939,18 +9062,19 @@ access the original array's elements.  It works in the following way:
          DO SOMETHING WITH data[ind[i]]     Access original array via sorted indices
      }
 
-Sorting the array by replacing the indices provides maximal flexibility.
-To traverse the elements in decreasing order, use a loop that goes from
-N down to 1, either over the elements or over the indices.
+   Sorting the array by replacing the indices provides maximal
+flexibility.  To traverse the elements in decreasing order, use a loop
+that goes from N down to 1, either over the elements or over the
+indices.
 
-Copying array indices and elements isn't expensive in terms of memory.
-Internally, `gawk' maintains "reference counts" to data.  For example,
-when `asort' copies the first array to the second one, there is only
-one copy of the original array elements' data, even though both arrays
-use the values.  Similarly, when copying the indices from `data' to
-`ind', there is only one copy of the actual index strings.
+   Copying array indices and elements isn't expensive in terms of
+memory.  Internally, `gawk' maintains "reference counts" to data.  For
+example, when `asort' copies the first array to the second one, there
+is only one copy of the original array elements' data, even though both
+arrays use the values.  Similarly, when copying the indices from `data'
+to `ind', there is only one copy of the actual index strings.
 
-We said previously that comparisons are done using `gawk''s "usual
+   We said previously that comparisons are done using `gawk''s "usual
 comparison rules."  Because `IGNORECASE' affects string comparisons,
 the value of `IGNORECASE' also affects sorting for both `asort' and
 `asorti'.  Caveat Emptor.
@@ -8966,7 +9090,7 @@ three categories: numeric, string, and I/O.  `gawk' provides additional
 groups of functions to work with values that represent time, do bit
 manipulation, and internationalize and localize programs.
 
-Besides the built-in functions, `awk' has provisions for writing new
+   Besides the built-in functions, `awk' has provisions for writing new
 functions that the rest of a program can use.  The second half of this
 major node describes these "user-defined" functions.
 
@@ -9008,22 +9132,22 @@ To call one of `awk''s built-in functions, write the name of the
 function followed by arguments in parentheses.  For example, `atan2(y +
 z, 1)' is a call to the function `atan2' and has two arguments.
 
-Whitespace is ignored between the built-in function name and the open
-parenthesis, and it is good practice to avoid using whitespace there.
-User-defined functions do not permit whitespace in this way, and it is
-easier to avoid mistakes by following a simple convention that always
-works--no whitespace after a function name.
+   Whitespace is ignored between the built-in function name and the
+open parenthesis, and it is good practice to avoid using whitespace
+there.  User-defined functions do not permit whitespace in this way, and
+it is easier to avoid mistakes by following a simple convention that
+always works--no whitespace after a function name.
 
-Each built-in function accepts a certain number of arguments.  In some
-cases, arguments can be omitted. The defaults for omitted arguments
-vary from function to function and are described under the individual
-functions.  In some `awk' implementations, extra arguments given to
-built-in functions are ignored.  However, in `gawk', it is a fatal
-error to give extra arguments to a built-in function.
+   Each built-in function accepts a certain number of arguments.  In
+some cases, arguments can be omitted. The defaults for omitted
+arguments vary from function to function and are described under the
+individual functions.  In some `awk' implementations, extra arguments
+given to built-in functions are ignored.  However, in `gawk', it is a
+fatal error to give extra arguments to a built-in function.
 
-When a function is called, expressions that create the function's actual
-parameters are evaluated completely before the call is performed.  For
-example, in the following code fragment:
+   When a function is called, expressions that create the function's
+actual parameters are evaluated completely before the call is performed.
+For example, in the following code fragment:
 
      i = 4
      j = sqrt(i++)
@@ -9037,8 +9161,8 @@ are evaluated from left to right or from right to left.  For example:
      i = 5
      j = atan2(i++, i *= 2)
 
-If the order of evaluation is left to right, then `i' first becomes 6,
-and then 12, and `atan2' is called with the two arguments 6 and 12.
+   If the order of evaluation is left to right, then `i' first becomes
+6, and then 12, and `atan2' is called with the two arguments 6 and 12.
 But if the order of evaluation is right to left, `i' first becomes 10,
 then 11, and `atan2' is called with the two arguments 11 and 10.
 
@@ -9142,15 +9266,15 @@ brackets ([ ]):
      easy to keep track of the seeds in case you need to consistently
      reproduce sequences of random numbers.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The C version of `rand' is known to produce fairly poor sequences
-of random numbers.  However, nothing requires that an `awk'
+   (1) The C version of `rand' is known to produce fairly poor
+sequences of random numbers.  However, nothing requires that an `awk'
 implementation use the C `rand' to implement the `awk' version of
 `rand'.  In fact, `gawk' uses the BSD `random' function, which is
 considerably better than `rand', to produce random numbers.
 
-(2) Computer-generated random numbers really are not truly random.
+   (2) Computer-generated random numbers really are not truly random.
 They are technically known as "pseudorandom."  This means that while
 the numbers in a sequence appear to be random, you can in fact generate
 the same sequence of random numbers over and over again.
@@ -9197,7 +9321,7 @@ with a pound sign (`#'):
           a[2] = "de"
           a[3] = "sac"
 
-     The `asort' function is described in more detail in *Note Array
+     The `asort' function is described in more detail in *note Array
      Sorting::.  `asort' is a `gawk' extension; it is not available in
      compatibility mode (*note Options::).
 
@@ -9209,7 +9333,7 @@ with a pound sign (`#'):
      always a string comparison.  (Here too, `IGNORECASE' affects the
      sorting.)
 
-     The `asorti' function is described in more detail in *Note Array
+     The `asorti' function is described in more detail in *note Array
      Sorting::.  It was added in `gawk' 3.1.2.  `asorti' is a `gawk'
      extension; it is not available in compatibility mode (*note
      Options::).
@@ -9261,7 +9385,7 @@ with a pound sign (`#'):
 
      The REGEXP argument may be either a regexp constant (`/.../') or a
      string constant ("...").  In the latter case, the string is
-     treated as a regexp to be matched.  *Note Computed Regexps::, for a
+     treated as a regexp to be matched.  *note Computed Regexps::, for a
      discussion of the difference between the two forms, and the
      implications for writing your program correctly.
 
@@ -9377,7 +9501,7 @@ with a pound sign (`#'):
 
      Modern implementations of `awk', including `gawk', allow the third
      argument to be a regexp constant (`/abc/') as well as a string.
-     (d.c.)  The POSIX standard allows this as well.  *Note Computed
+     (d.c.)  The POSIX standard allows this as well.  *note Computed
      Regexps::, for a discussion of the difference between using a
      string constant or a regexp constant, and the implications for
      writing your program correctly.
@@ -9431,7 +9555,7 @@ with a pound sign (`#'):
 
      The REGEXP argument may be either a regexp constant (`/.../') or a
      string constant ("...").  In the latter case, the string is
-     treated as a regexp to be matched.  *Note Computed Regexps::, for a
+     treated as a regexp to be matched.  *note Computed Regexps::, for a
      discussion of the difference between the two forms, and the
      implications for writing your program correctly.
 
@@ -9620,18 +9744,18 @@ with a pound sign (`#'):
      Nonalphabetic characters are left unchanged.  For example,
      `toupper("MiXeD cAsE 123")' returns `"MIXED CASE 123"'.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Unless you use the `--non-decimal-data' option, which isn't
+   (1) Unless you use the `--non-decimal-data' option, which isn't
 recommended.  *Note Nondecimal Data::, for more information.
 
-(2) Note that this means that the record will first be regenerated
+   (2) Note that this means that the record will first be regenerated
 using the value of `OFS' if any fields have been changed, and that the
-fields will be updated after the substituion, even if the operation is
+fields will be updated after the substitution, even if the operation is
 a "no-op" such as `sub(/^/, "")'.
 
-(3) This is different from C and C++, in which the first character is
-number zero.
+   (3) This is different from C and C++, in which the first character
+is number zero.
 
 
 File: gawk.info,  Node: Gory Details,  Up: String Functions
@@ -9643,27 +9767,27 @@ When using `sub', `gsub', or `gensub', and trying to get literal
 backslashes and ampersands into the replacement text, you need to
 remember that there are several levels of "escape processing" going on.
 
-First, there is the "lexical" level, which is when `awk' reads your
+   First, there is the "lexical" level, which is when `awk' reads your
 program and builds an internal copy of it that can be executed.  Then
 there is the runtime level, which is when `awk' actually scans the
 replacement string to determine what to generate.
 
-At both levels, `awk' looks for a defined set of characters that can
+   At both levels, `awk' looks for a defined set of characters that can
 come after a backslash.  At the lexical level, it looks for the escape
-sequences listed in *Note Escape Sequences::.  Thus, for every `\' that
+sequences listed in *note Escape Sequences::.  Thus, for every `\' that
 `awk' processes at the runtime level, type two backslashes at the
 lexical level.  When a character that is not valid for an escape
 sequence follows the `\', Unix `awk' and `gawk' both simply remove the
 initial `\' and put the next character into the string. Thus, for
 example, `"a\qb"' is treated as `"aqb"'.
 
-At the runtime level, the various functions handle sequences of `\' and
-`&' differently.  The situation is (sadly) somewhat complex.
+   At the runtime level, the various functions handle sequences of `\'
+and `&' differently.  The situation is (sadly) somewhat complex.
 Historically, the `sub' and `gsub' functions treated the two character
 sequence `\&' specially; this sequence was replaced in the generated
 text with a single `&'.  Any other `\' within the REPLACEMENT string
 that did not precede an `&' was passed through unchanged.  This is
-illustrated in *Note table-sub-escapes::.
+illustrated in *note table-sub-escapes::.
 
       You type         `sub' sees          `sub' generates
       -------         ---------          --------------
@@ -9689,7 +9813,7 @@ get a literal `\' followed by the matched text.
    The 1992 POSIX standard attempted to fix this problem. That standard
 says that `sub' and `gsub' look for either a `\' or an `&' after the
 `\'. If either one follows a `\', that character is output literally.
-The interpretation of `\' and `&' then becomes as shown in *Note
+The interpretation of `\' and `&' then becomes as shown in *note
 table-sub-posix-92::.
 
       You type         `sub' sees          `sub' generates
@@ -9717,7 +9841,7 @@ problems:
 submitted proposed text for a revised standard that reverts to rules
 that correspond more closely to the original existing practice. The
 proposed rules have special cases that make it possible to produce a
-`\' preceding the matched text. This is shown in *Note
+`\' preceding the matched text. This is shown in *note
 table-sub-proposed::.
 
       You type         `sub' sees         `sub' generates
@@ -9728,7 +9852,7 @@ table-sub-proposed::.
          `\\q'             `\q'            a literal `\q'
         `\\\\'             `\\'            `\\'
 
-Table 8.3: Propsosed rules for sub and backslash
+Table 8.3: Proposed rules for sub and backslash
 
    In a nutshell, at the runtime level, there are now three special
 sequences of characters (`\\\&', `\\&' and `\&') whereas historically
@@ -9745,7 +9869,7 @@ except for one case.
    The 2001 POSIX rules state that `\&' in the replacement string
 produces a literal `&', `\\' produces a literal `\', and `\' followed
 by anything else is not special; the `\' is placed straight into the
-output.  These rules are presented in *Note table-posix-2001-sub::.
+output.  These rules are presented in *note table-posix-2001-sub::.
 
       You type         `sub' sees         `sub' generates
       -------         ---------         --------------
@@ -9773,7 +9897,7 @@ level, whenever `gawk' sees a `\', if the following character is a
 digit, then the text that matched the corresponding parenthesized
 subexpression is placed in the generated output.  Otherwise, no matter
 what character follows the `\', it appears in the generated text and
-the `\' does not, as shown in *Note table-gensub-escapes::.
+the `\' does not, as shown in *note table-gensub-escapes::.
 
        You type          `gensub' sees         `gensub' generates
        -------          ------------         -----------------
@@ -9802,14 +9926,14 @@ For example:
 
 Although this makes a certain amount of sense, it can be surprising.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) This consequence was certainly unintended.
+   (1) This consequence was certainly unintended.
 
 
 File: gawk.info,  Node: I/O Functions,  Next: Time Functions,  Prev: String Functions,  Up: Built-in
 
-8.1.5 Input/Output Functions
+8.1.4 Input/Output Functions
 ----------------------------
 
 The following functions relate to input/output (I/O).  Optional
@@ -9905,7 +10029,7 @@ As a side point, buffering issues can be even more confusing, depending
 upon whether your program is "interactive", i.e., communicating with a
 user sitting at a keyboard.(1)
 
-Interactive programs generally "line buffer" their output; i.e., they
+   Interactive programs generally "line buffer" their output; i.e., they
 write out every line.  Noninteractive programs wait until they have a
 full buffer, which may be many lines of output.  Here is an example of
 the difference:
@@ -9949,7 +10073,7 @@ unnecessary shell.  (Other implementations may only flush the buffer
 associated with the standard output and not necessarily all buffered
 output.)
 
-If you think about what a programmer expects, it makes sense that
+   If you think about what a programmer expects, it makes sense that
 `system' should flush any pending output.  The following program:
 
      BEGIN {
@@ -9970,18 +10094,18 @@ and not:
      first print
      second print
 
-If `awk' did not flush its buffers before calling `system', you would
-see the latter (undesirable) output.
+   If `awk' did not flush its buffers before calling `system', you
+would see the latter (undesirable) output.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) A program is interactive if the standard output is connected to a
-terminal device.
+   (1) A program is interactive if the standard output is connected to
+a terminal device.
 
 
 File: gawk.info,  Node: Time Functions,  Next: Bitwise Functions,  Prev: I/O Functions,  Up: Built-in
 
-8.1.8 Using `gawk''s Timestamp Functions
+8.1.5 Using `gawk''s Timestamp Functions
 ----------------------------------------
 
 `awk' programs are commonly used to process log files containing
@@ -9995,7 +10119,7 @@ which is sufficient to represent times through 2038-01-19 03:14:07 UTC.
 Many systems support a wider range of timestamps, including negative
 timestamps that represent times before the epoch.
 
-In order to make it easier to process such log files and to produce
+   In order to make it easier to process such log files and to produce
 useful reports, `gawk' provides the following functions for working
 with timestamps.  They are `gawk' extensions; they are not specified in
 the POSIX standard, nor are they in any other known version of `awk'.(2)
@@ -10030,38 +10154,41 @@ Optional parameters are enclosed in square brackets ([ ]):
      If DATESPEC does not contain enough elements or if the resulting
      time is out of range, `mktime' returns -1.
 
-`strftime([FORMAT [, TIMESTAMP]])'
+`strftime([FORMAT [, TIMESTAMP [, UTC-FLAG]]])'
      This function returns a string.  It is similar to the function of
      the same name in ISO C.  The time specified by TIMESTAMP is used to
-     produce a string, based on the contents of the FORMAT string.  The
-     TIMESTAMP is in the same format as the value returned by the
-     `systime' function.  If no TIMESTAMP argument is supplied, `gawk'
-     uses the current time of day as the timestamp.  If no FORMAT
-     argument is supplied, `strftime' uses `"%a %b %d %H:%M:%S %Z %Y"'.
-     This format string produces output that is (almost) equivalent to
-     that of the `date' utility.  (Versions of `gawk' prior to 3.0
-     require the FORMAT argument.)
-
-The `systime' function allows you to compare a timestamp from a log
+     produce a string, based on the contents of the FORMAT string.  If
+     UTC-FLAG is present and is either non-zero or non-null, the value
+     is formatted as UTC (Coordinated Universal Time, formerly GMT or
+     Greenwich Mean Time). Otherwise, the value is formatted for the
+     local time zone.  The TIMESTAMP is in the same format as the value
+     returned by the `systime' function.  If no TIMESTAMP argument is
+     supplied, `gawk' uses the current time of day as the timestamp.
+     If no FORMAT argument is supplied, `strftime' uses
+     `"%a %b %d %H:%M:%S %Z %Y"'.  This format string produces output
+     that is (almost) equivalent to that of the `date' utility.
+     (Versions of `gawk' prior to 3.0 require the FORMAT argument.)
+
+   The `systime' function allows you to compare a timestamp from a log
 file with the current time of day.  In particular, it is easy to
 determine how long ago a particular record was logged.  It also allows
 you to produce log records using the "seconds since the epoch" format.
 
-The `mktime' function allows you to convert a textual representation of
-a date and time into a timestamp.   This makes it easy to do
+   The `mktime' function allows you to convert a textual representation
+of a date and time into a timestamp.   This makes it easy to do
 before/after comparisons of dates and times, particularly when dealing
 with date and time data coming from an external source, such as a log
 file.
 
-The `strftime' function allows you to easily turn a timestamp into
+   The `strftime' function allows you to easily turn a timestamp into
 human-readable information.  It is similar in nature to the `sprintf'
 function (*note String Functions::), in that it copies nonformat
 specification characters verbatim to the returned string, while
 substituting date and time values for format specifications in the
 FORMAT string.
 
-`strftime' is guaranteed by the 1999 ISO C standard(4) to support the
-following date format specifications:
+   `strftime' is guaranteed by the 1999 ISO C standard(4) to support
+the following date format specifications:
 
 `%a'
      The locale's abbreviated weekday name.
@@ -10201,10 +10328,10 @@ following date format specifications:
 `%%'
      A literal `%'.
 
-If a conversion specifier is not one of the above, the behavior is
+   If a conversion specifier is not one of the above, the behavior is
 undefined.(6)
 
-Informally, a "locale" is the geographic place in which a program is
+   Informally, a "locale" is the geographic place in which a program is
 meant to run.  For example, a common way to abbreviate the date
 September 4, 1991 in the United States is "9/4/91."  In many countries
 in Europe, however, it is abbreviated "4.9.91."  Thus, the `%x'
@@ -10213,9 +10340,9 @@ specification in a `"US"' locale might produce `9/4/91', while in a
 defines a default `"C"' locale, which is an environment that is typical
 of what most C programmers are used to.
 
-A public-domain C version of `strftime' is supplied with `gawk' for
-systems that are not yet fully standards-compliant.  It supports all of
-the just listed format specifications.  If that version is used to
+   For systems that are not yet fully standards-compliant, `gawk'
+supplies a copy of `strftime' from the GNU C Library.  It supports all
+of the just listed format specifications.  If that version is used to
 compile `gawk' (*note Installation::), then the following additional
 format specifications are available:
 
@@ -10227,22 +10354,14 @@ format specifications are available:
      The hour (12-hour clock) as a decimal number (1-12).  Single-digit
      numbers are padded with a space.
 
-`%N'
-     The "Emperor/Era" name.  Equivalent to `%C'.
-
-`%o'
-     The "Emperor/Era" year.  Equivalent to `%y'.
-
 `%s'
      The time as a decimal timestamp in seconds since the epoch.
 
-`%v'
-     The date in VMS format (e.g., `20-JUN-1991').
 
-Additionally, the alternate representations are recognized but their
+   Additionally, the alternate representations are recognized but their
 normal representations are used.
 
-This example is an `awk' implementation of the POSIX `date' utility.
+   This example is an `awk' implementation of the POSIX `date' utility.
 Normally, the `date' utility prints the current date and time of day in
 a well-known format.  However, if you provide an argument to it that
 begins with a `+', `date' copies nonformat specifier characters to the
@@ -10252,7 +10371,7 @@ specifiers in the string.  For example:
      $ date '+Today is %A, %B %d, %Y.'
      -| Today is Thursday, September 14, 2000.
 
-Here is the `gawk' version of the `date' utility.  It has a shell
+   Here is the `gawk' version of the `date' utility.  It has a shell
 "wrapper" to handle the `-u' option, which requires that `date' run as
 if the time zone is set to UTC:
 
@@ -10281,26 +10400,26 @@ if the time zone is set to UTC:
          exit exitval
      }' "$@"
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) *Note Glossary::, especially the entries "Epoch" and "UTC."
+   (1) *Note Glossary::, especially the entries "Epoch" and "UTC."
 
-(2) The GNU `date' utility can also do many of the things described
+   (2) The GNU `date' utility can also do many of the things described
 here.  Its use may be preferable for simple time-related operations in
 shell scripts.
 
-(3) Occasionally there are minutes in a year with a leap second, which
-is why the seconds can go up to 60.
+   (3) Occasionally there are minutes in a year with a leap second,
+which is why the seconds can go up to 60.
 
-(4) As this is a recent standard, not every system's `strftime'
+   (4) As this is a recent standard, not every system's `strftime'
 necessarily supports all of the conversions listed here.
 
-(5) If you don't understand any of this, don't worry about it; these
+   (5) If you don't understand any of this, don't worry about it; these
 facilities are meant to make it easier to "internationalize" programs.
-Other internationalization features are described in *Note
+Other internationalization features are described in *note
 Internationalization::.
 
-(6) This is because ISO C leaves the behavior of the C version of
+   (6) This is because ISO C leaves the behavior of the C version of
 `strftime' undefined and `gawk' uses the system's version of `strftime'
 if it's there.  Typically, the conversion specifier either does not
 appear in the returned string or appears literally.
@@ -10308,16 +10427,16 @@ appear in the returned string or appears literally.
 
 File: gawk.info,  Node: Bitwise Functions,  Next: I18N Functions,  Prev: Time Functions,  Up: Built-in
 
-8.1.9 Bit-Manipulation Functions of `gawk'
+8.1.6 Bit-Manipulation Functions of `gawk'
 ------------------------------------------
 
      I can explain it for you, but I can't understand it for you.
      Anonymous
 
-Many languages provide the ability to perform "bitwise" operations on
-two integer numbers.  In other words, the operation is performed on
+   Many languages provide the ability to perform "bitwise" operations
+on two integer numbers.  In other words, the operation is performed on
 each successive pair of bits in the operands.  Three common operations
-are bitwise AND, OR, and XOR.  The operations are described in *Note
+are bitwise AND, OR, and XOR.  The operations are described in *note
 table-bitwise-ops::.
 
                      Bit Operator
@@ -10404,7 +10523,7 @@ This program produces the following output when run:
      -| lshift(0x99, 2) = 0x264 = 0000001001100100
      -| rshift(0x99, 2) = 0x26 = 00100110
 
-The `bits2str' function turns a binary number into a string.  The
+   The `bits2str' function turns a binary number into a string.  The
 number `1' represents a binary value where the rightmost bit is set to
 1.  Using this mask, the function repeatedly checks the rightmost bit.
 ANDing the mask with the value indicates whether the rightmost bit is 1
@@ -10412,26 +10531,26 @@ or not. If so, a `"1"' is concatenated onto the front of the string.
 Otherwise, a `"0"' is added.  The value is then shifted right by one
 bit and the loop continues until there are no more 1 bits.
 
-If the initial value is zero it returns a simple `"0"'.  Otherwise, at
-the end, it pads the value with zeros to represent multiples of 8-bit
-quantities. This is typical in modern computers.
+   If the initial value is zero it returns a simple `"0"'.  Otherwise,
+at the end, it pads the value with zeros to represent multiples of
+8-bit quantities. This is typical in modern computers.
 
-The main code in the `BEGIN' rule shows the difference between the
+   The main code in the `BEGIN' rule shows the difference between the
 decimal and octal values for the same numbers (*note
 Nondecimal-numbers::), and then demonstrates the results of the
 `compl', `lshift', and `rshift' functions.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) This example shows that 0's come in on the left side. For `gawk',
-this is always true, but in some languages, it's possible to have the
-left side fill with 1's. Caveat emptor.
+   (1) This example shows that 0's come in on the left side. For
+`gawk', this is always true, but in some languages, it's possible to
+have the left side fill with 1's. Caveat emptor.
 
 
 File: gawk.info,  Node: I18N Functions,  Prev: Bitwise Functions,  Up: Built-in
 
-8.1.10 Using `gawk''s String-Translation Functions
---------------------------------------------------
+8.1.7 Using `gawk''s String-Translation Functions
+-------------------------------------------------
 
 `gawk' provides facilities for internationalizing `awk' programs.
 These include the functions described in the following list.  The
@@ -10496,7 +10615,7 @@ There is no need to put the definition of a function before all uses of
 the function.  This is because `awk' reads the entire program before
 starting to execute any of it.
 
-The definition of a function named NAME looks like this:
+   The definition of a function named NAME looks like this:
 
      function NAME(PARAMETER-LIST)
      {
@@ -10509,58 +10628,58 @@ underscores that doesn't start with a digit.  Within a single `awk'
 program, any particular name can only be used as a variable, array, or
 function.
 
-PARAMETER-LIST is a list of the function's arguments and local variable
-names, separated by commas.  When the function is called, the argument
-names are used to hold the argument values given in the call.  The
-local variables are initialized to the empty string.  A function cannot
-have two parameters with the same name, nor may it have a parameter
-with the same name as the function itself.
+   PARAMETER-LIST is a list of the function's arguments and local
+variable names, separated by commas.  When the function is called, the
+argument names are used to hold the argument values given in the call.
+The local variables are initialized to the empty string.  A function
+cannot have two parameters with the same name, nor may it have a
+parameter with the same name as the function itself.
 
-The BODY-OF-FUNCTION consists of `awk' statements.  It is the most
+   The BODY-OF-FUNCTION consists of `awk' statements.  It is the most
 important part of the definition, because it says what the function
 should actually _do_.  The argument names exist to give the body a way
 to talk about the arguments; local variables exist to give the body
 places to keep temporary values.
 
-Argument names are not distinguished syntactically from local variable
-names. Instead, the number of arguments supplied when the function is
-called determines how many argument variables there are.  Thus, if three
-argument values are given, the first three names in PARAMETER-LIST are
-arguments and the rest are local variables.
-
-It follows that if the number of arguments is not the same in all calls
-to the function, some of the names in PARAMETER-LIST may be arguments
-on some occasions and local variables on others.  Another way to think
-of this is that omitted arguments default to the null string.
-
-Usually when you write a function, you know how many names you intend to
-use for arguments and how many you intend to use as local variables.
-It is conventional to place some extra space between the arguments and
-the local variables, in order to document how your function is supposed
-to be used.
-
-During execution of the function body, the arguments and local variable
-values hide, or "shadow", any variables of the same names used in the
-rest of the program.  The shadowed variables are not accessible in the
-function definition, because there is no way to name them while their
-names have been taken away for the local variables.  All other variables
-used in the `awk' program can be referenced or set normally in the
-function's body.
-
-The arguments and local variables last only as long as the function body
-is executing.  Once the body finishes, you can once again access the
-variables that were shadowed while the function was running.
-
-The function body can contain expressions that call functions.  They
+   Argument names are not distinguished syntactically from local
+variable names. Instead, the number of arguments supplied when the
+function is called determines how many argument variables there are.
+Thus, if three argument values are given, the first three names in
+PARAMETER-LIST are arguments and the rest are local variables.
+
+   It follows that if the number of arguments is not the same in all
+calls to the function, some of the names in PARAMETER-LIST may be
+arguments on some occasions and local variables on others.  Another way
+to think of this is that omitted arguments default to the null string.
+
+   Usually when you write a function, you know how many names you
+intend to use for arguments and how many you intend to use as local
+variables.  It is conventional to place some extra space between the
+arguments and the local variables, in order to document how your
+function is supposed to be used.
+
+   During execution of the function body, the arguments and local
+variable values hide, or "shadow", any variables of the same names used
+in the rest of the program.  The shadowed variables are not accessible
+in the function definition, because there is no way to name them while
+their names have been taken away for the local variables.  All other
+variables used in the `awk' program can be referenced or set normally
+in the function's body.
+
+   The arguments and local variables last only as long as the function
+body is executing.  Once the body finishes, you can once again access
+the variables that were shadowed while the function was running.
+
+   The function body can contain expressions that call functions.  They
 can even call this function, either directly or by way of another
 function.  When this happens, we say the function is "recursive".  The
 act of a function calling itself is called "recursion".
 
-In many `awk' implementations, including `gawk', the keyword `function'
-may be abbreviated `func'.  However, POSIX only specifies the use of
-the keyword `function'.  This actually has some practical implications.
-If `gawk' is in POSIX-compatibility mode (*note Options::), then the
-following statement does _not_ define a function:
+   In many `awk' implementations, including `gawk', the keyword
+`function' may be abbreviated `func'.  However, POSIX only specifies
+the use of the keyword `function'.  This actually has some practical
+implications.  If `gawk' is in POSIX-compatibility mode (*note
+Options::), then the following statement does _not_ define a function:
 
      func foo() { a = sqrt($1) ; print a }
 
@@ -10571,8 +10690,8 @@ probably not what is desired.  (`awk' accepts this input as
 syntactically valid, because functions may be used before they are
 defined in `awk' programs.)
 
-To ensure that your `awk' programs are portable, always use the keyword
-`function' when defining a function.
+   To ensure that your `awk' programs are portable, always use the
+keyword `function' when defining a function.
 
 
 File: gawk.info,  Node: Function Example,  Next: Function Caveats,  Prev: Definition Syntax,  Up: User-defined
@@ -10605,7 +10724,7 @@ this program, using our function to format the results, prints:
         5.6
        21.2
 
-This function deletes all the elements in an array:
+   This function deletes all the elements in an array:
 
      function delarray(a,    i)
      {
@@ -10613,15 +10732,15 @@ This function deletes all the elements in an array:
             delete a[i]
      }
 
-When working with arrays, it is often necessary to delete all the
+   When working with arrays, it is often necessary to delete all the
 elements in an array and start over with a new list of elements (*note
 Delete::).  Instead of having to repeat this loop everywhere that you
 need to clear out an array, your program can just call `delarray'.
 (This guarantees portability.  The use of `delete ARRAY' to delete the
 contents of an entire array is a nonstandard extension.)
 
-The following is an example of a recursive function.  It takes a string
-as an input parameter and returns the string in backwards order.
+   The following is an example of a recursive function.  It takes a
+string as an input parameter and returns the string in backwards order.
 Recursive functions must always have a test that stops the recursion.
 In this case, the recursion terminates when the starting position is
 zero, i.e., when there are no more characters left in the string.
@@ -10634,14 +10753,14 @@ zero, i.e., when there are no more characters left in the string.
          return (substr(str, start, 1) rev(str, start - 1))
      }
 
-If this function is in a file named `rev.awk', it can be tested this
+   If this function is in a file named `rev.awk', it can be tested this
 way:
 
      $ echo "Don't Panic!" |
      > gawk --source '{ print rev($0, length($0)) }' -f rev.awk
      -| !cinaP t'noD
 
-The C `ctime' function takes a timestamp and returns it in a string,
+   The C `ctime' function takes a timestamp and returns it in a string,
 formatted in a well-known fashion.  The following example uses the
 built-in `strftime' function (*note Time Functions::) to create an
 `awk' version of `ctime':
@@ -10668,23 +10787,23 @@ File: gawk.info,  Node: Function Caveats,  Next: Return Statement,  Prev: Functi
 A function call is an expression and its value is the value returned by
 the function.
 
-A function call consists of the function name followed by the arguments
-in parentheses.  `awk' expressions are what you write in the call for
-the arguments.  Each time the call is executed, these expressions are
-evaluated, and the values are the actual arguments.  For example, here
-is a call to `foo' with three arguments (the first being a string
-concatenation):
+   A function call consists of the function name followed by the
+arguments in parentheses.  `awk' expressions are what you write in the
+call for the arguments.  Each time the call is executed, these
+expressions are evaluated, and the values are the actual arguments.  For
+example, here is a call to `foo' with three arguments (the first being
+a string concatenation):
 
      foo(x y, "lose", 4 * z)
 
-*Caution:* Whitespace characters (spaces and tabs) are not allowed
+   *Caution:* Whitespace characters (spaces and tabs) are not allowed
 between the function name and the open-parenthesis of the argument list.
 If you write whitespace by mistake, `awk' might think that you mean to
 concatenate a variable with an expression in parentheses.  However, it
 notices that you used a function name and not a variable name, and
 reports an error.
 
-When a function is called, it is given a _copy_ of the values of its
+   When a function is called, it is given a _copy_ of the values of its
 arguments.  This is known as "call by value".  The caller may use a
 variable as the expression for the argument, but the called function
 does not know this--it only knows what value the argument had.  For
@@ -10713,7 +10832,7 @@ outside of `myfunc', the function body cannot alter this outer value,
 because it is shadowed during the execution of `myfunc' and cannot be
 seen or changed from there.
 
-However, when arrays are the parameters to functions, they are _not_
+   However, when arrays are the parameters to functions, they are _not_
 copied.  Instead, the array itself is made available for direct
 manipulation by the function.  This is usually called "call by
 reference".  Changes made to an array parameter inside the body of a
@@ -10737,7 +10856,7 @@ function _are_ visible outside that function.
      prints `a[1] = 1, a[2] = two, a[3] = 3', because `changeit' stores
      `"two"' in the second element of `a'.
 
-Some `awk' implementations allow you to call a function that has not
+   Some `awk' implementations allow you to call a function that has not
 been defined. They only report a problem at runtime when the program
 actually tries to call the function. For example:
 
@@ -10754,10 +10873,10 @@ Because the `if' statement will never be true, it is not really a
 problem that `foo' has not been defined.  Usually, though, it is a
 problem if a program calls an undefined function.
 
-If `--lint' is specified (*note Options::), `gawk' reports calls to
+   If `--lint' is specified (*note Options::), `gawk' reports calls to
 undefined functions.
 
-Some `awk' implementations generate a runtime error if you use the
+   Some `awk' implementations generate a runtime error if you use the
 `next' statement (*note Next Statement::) inside a user-defined
 function.  `gawk' does not have this limitation.
 
@@ -10774,22 +10893,22 @@ the `awk' program.  It looks like this:
 
      return [EXPRESSION]
 
-The EXPRESSION part is optional.  If it is omitted, then the returned
+   The EXPRESSION part is optional.  If it is omitted, then the returned
 value is undefined, and therefore, unpredictable.
 
-A `return' statement with no value expression is assumed at the end of
-every function definition.  So if control reaches the end of the
+   A `return' statement with no value expression is assumed at the end
+of every function definition.  So if control reaches the end of the
 function body, then the function returns an unpredictable value.  `awk'
 does _not_ warn you if you use the return value of such a function.
 
-Sometimes, you want to write a function for what it does, not for what
-it returns.  Such a function corresponds to a `void' function in C or
-to a `procedure' in Pascal.  Thus, it may be appropriate to not return
-any value; simply bear in mind that if you use the return value of such
-a function, you do so at your own risk.
+   Sometimes, you want to write a function for what it does, not for
+what it returns.  Such a function corresponds to a `void' function in C
+or to a `procedure' in Pascal.  Thus, it may be appropriate to not
+return any value; simply bear in mind that if you use the return value
+of such a function, you do so at your own risk.
 
-The following is an example of a user-defined function that returns a
-value for the largest number among the elements of an array:
+   The following is an example of a user-defined function that returns
+a value for the largest number among the elements of an array:
 
      function maxelt(vec,   i, ret)
      {
@@ -10808,8 +10927,9 @@ function parameter list indicates that `i' and `ret' are not supposed
 to be arguments.  You should follow this convention when defining
 functions.
 
-The following program uses the `maxelt' function.  It loads an array,
-calls `maxelt', and then reports the maximum number in that array:
+   The following program uses the `maxelt' function.  It loads an
+array, calls `maxelt', and then reports the maximum number in that
+array:
 
      function maxelt(vec,   i, ret)
      {
@@ -10830,7 +10950,7 @@ calls `maxelt', and then reports the maximum number in that array:
           print maxelt(nums)
      }
 
-Given the following input:
+   Given the following input:
 
       1 5 23 8 16
      44 3 5 2 8 26
@@ -10864,8 +10984,8 @@ runtime.  Here is an annotated sample program:
          x = 1   # now not allowed, runtime error
      }
 
-Usually, such things aren't a big issue, but it's worth being aware of
-them.
+   Usually, such things aren't a big issue, but it's worth being aware
+of them.
 
 
 File: gawk.info,  Node: Internationalization,  Next: Advanced Features,  Prev: Functions,  Up: Top
@@ -10880,13 +11000,14 @@ countries, they were able to sell more systems.  As a result,
 internationalization and localization of programs and software systems
 became a common practice.
 
-Until recently, the ability to provide internationalization was largely
-restricted to programs written in C and C++.  This major node describes
-the underlying library `gawk' uses for internationalization, as well as
-how `gawk' makes internationalization features available at the `awk'
-program level.  Having internationalization available at the `awk' level
-gives software developers additional flexibility--they are no longer
-required to write in C when internationalization is a requirement.
+   Until recently, the ability to provide internationalization was
+largely restricted to programs written in C and C++.  This major node
+describes the underlying library `gawk' uses for internationalization,
+as well as how `gawk' makes internationalization features available at
+the `awk' program level.  Having internationalization available at the
+`awk' level gives software developers additional flexibility--they are
+no longer required to write in C when internationalization is a
+requirement.
 
 * Menu:
 
@@ -10922,13 +11043,13 @@ The facilities in GNU `gettext' focus on messages; strings printed by a
 program, either directly or via formatting with `printf' or
 `sprintf'.(1)
 
-When using GNU `gettext', each application has its own "text domain".
-This is a unique name, such as `kpilot' or `gawk', that identifies the
-application.  A complete application may have multiple
+   When using GNU `gettext', each application has its own "text
+domain".  This is a unique name, such as `kpilot' or `gawk', that
+identifies the application.  A complete application may have multiple
 components--programs written in C or C++, as well as scripts written in
 `sh' or `awk'.  All of the components use the same text domain.
 
-To make the discussion concrete, assume we're writing an application
+   To make the discussion concrete, assume we're writing an application
 named `guide'.  Internationalization consists of the following steps,
 in this order:
 
@@ -10972,15 +11093,15 @@ in this order:
      having to switch the application's default text domain back and
      forth.
 
-In C (or C++), the string marking and dynamic translation lookup are
+   In C (or C++), the string marking and dynamic translation lookup are
 accomplished by wrapping each string in a call to `gettext':
 
      printf(gettext("Don't Panic!\n"));
 
-The tools that extract messages from source code pull out all strings
-enclosed in calls to `gettext'.
+   The tools that extract messages from source code pull out all
+strings enclosed in calls to `gettext'.
 
-The GNU `gettext' developers, recognizing that typing `gettext' over
+   The GNU `gettext' developers, recognizing that typing `gettext' over
 and over again is both painful and ugly to look at, use the macro `_'
 (an underscore) to make things easier:
 
@@ -11031,15 +11152,15 @@ defined locale categories that `gettext' knows about are:
 `LC_ALL'
      All of the above.  (Not too useful in the context of `gettext'.)
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) For some operating systems, the `gawk' port doesn't support GNU
+   (1) For some operating systems, the `gawk' port doesn't support GNU
 `gettext'.  This applies most notably to the PC operating systems.  As
 such, these features are not available if you are using one of those
 operating systems.  Sorry.
 
-(2) Americans use a comma every three decimal places and a period for
-the decimal point, while many Europeans do exactly the opposite:
+   (2) Americans use a comma every three decimal places and a period
+for the decimal point, while many Europeans do exactly the opposite:
 `1,234.56' versus `1.234,56'.
 
 
@@ -11068,7 +11189,7 @@ internationalization:
      for CATEGORY is `"LC_MESSAGES"'.
 
      If you supply a value for CATEGORY, it must be a string equal to
-     one of the known locale categories described in *Note Explaining
+     one of the known locale categories described in *note Explaining
      gettext::.  You must also supply a text domain.  Use `TEXTDOMAIN'
      if you want to use the current domain.
 
@@ -11097,8 +11218,8 @@ internationalization:
      the null string (`""'), then `bindtextdomain' returns the current
      binding for the given DOMAIN.
 
-To use these facilities in your `awk' program, follow the steps
-outlined in *Note Explaining gettext::, like so:
+   To use these facilities in your `awk' program, follow the steps
+outlined in *note Explaining gettext::, like so:
 
   1. Set the variable `TEXTDOMAIN' to the text domain of your program.
      This is best done in a `BEGIN' rule (*note BEGIN/END::), or it can
@@ -11144,8 +11265,8 @@ outlined in *Note Explaining gettext::, like so:
           }
 
 
-*Note I18N Example::, for an example program showing the steps to create
-and use translations from `awk'.
+   *Note I18N Example::, for an example program showing the steps to
+create and use translations from `awk'.
 
 
 File: gawk.info,  Node: Translator i18n,  Next: I18N Example,  Prev: Programmer i18n,  Up: Internationalization
@@ -11158,7 +11279,7 @@ extracted to create the initial `.po' file.  As part of translation, it
 is often helpful to rearrange the order in which arguments to `printf'
 are output.
 
-`gawk''s `--gen-po' command-line option extracts the messages and is
+   `gawk''s `--gen-po' command-line option extracts the messages and is
 discussed next.  After that, `printf''s ability to rearrange the order
 for `printf' arguments at runtime is covered.
 
@@ -11181,7 +11302,7 @@ to create the initial `.po' file:
 
      $ gawk --gen-po -f guide.awk > guide.po
 
-When run with `--gen-po', `gawk' does not execute your program.
+   When run with `--gen-po', `gawk' does not execute your program.
 Instead, it parses it as usual and prints all marked strings to
 standard output in the format of a GNU `gettext' Portable Object file.
 Also included in the output are any constant strings that appear as the
@@ -11189,10 +11310,10 @@ first argument to `dcgettext' or as the first and second argument to
 `dcngettext'.(1) *Note I18N Example::, for the full list of steps to go
 through to create and test translations for `guide'.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Starting with `gettext' version 0.11.5, the `xgettext' utility that
-comes with GNU `gettext' can handle `.awk' files.
+   (1) Starting with `gettext' version 0.11.5, the `xgettext' utility
+that comes with GNU `gettext' can handle `.awk' files.
 
 
 File: gawk.info,  Node: Printf Ordering,  Next: I18N Portability,  Prev: String Extraction,  Up: Translator i18n
@@ -11206,22 +11327,22 @@ special problem for translation.  Consider the following:(1)
      printf(_"String `%s' has %d characters\n",
                string, length(string)))
 
-A possible German translation for this might be:
+   A possible German translation for this might be:
 
      "%d Zeichen lang ist die Zeichenkette `%s'\n"
 
-The problem should be obvious: the order of the format specifications
-is different from the original!  Even though `gettext' can return the
-translated string at runtime, it cannot change the argument order in
-the call to `printf'.
+   The problem should be obvious: the order of the format
+specifications is different from the original!  Even though `gettext'
+can return the translated string at runtime, it cannot change the
+argument order in the call to `printf'.
 
-To solve this problem, `printf' format specificiers may have an
+   To solve this problem, `printf' format specifiers may have an
 additional optional element, which we call a "positional specifier".
 For example:
 
      "%2$d Zeichen lang ist die Zeichenkette `%1$s'\n"
 
-Here, the positional specifier consists of an integer count, which
+   Here, the positional specifier consists of an integer count, which
 indicates which argument to use, and a `$'. Counts are one-based, and
 the format string itself is _not_ included.  Thus, in the following
 example, `string' is the first argument and `length(string)' is the
@@ -11234,10 +11355,10 @@ second:
      > }'
      -| 10 characters live in "Dont Panic"
 
-If present, positional specifiers come first in the format
+   If present, positional specifiers come first in the format
 specification, before the flags, the field width, and/or the precision.
 
-Positional specifiers can be used with the dynamic field width and
+   Positional specifiers can be used with the dynamic field width and
 precision capability:
 
      $ gawk 'BEGIN {
@@ -11249,9 +11370,9 @@ precision capability:
 
      NOTE: When using `*' with a positional specifier, the `*' comes
      first, then the integer position, and then the `$'.  This is
-     somewhat counterintutive.
+     somewhat counterintuitive.
 
-`gawk' does not allow you to mix regular format specifiers and those
+   `gawk' does not allow you to mix regular format specifiers and those
 with positional specifiers in the same string:
 
      $ gawk 'BEGIN { printf _"%d %3$s\n", 1, 2, "hi" }'
@@ -11262,14 +11383,14 @@ with positional specifiers in the same string:
      It's still a bad idea to try mixing them, even if `gawk' doesn't
      detect it.
 
-Although positional specifiers can be used directly in `awk' programs,
-their primary purpose is to help in producing correct translations of
-format strings into languages different from the one in which the
-program is first written.
+   Although positional specifiers can be used directly in `awk'
+programs, their primary purpose is to help in producing correct
+translations of format strings into languages different from the one in
+which the program is first written.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) This example is borrowed from the GNU `gettext' manual.
+   (1) This example is borrowed from the GNU `gettext' manual.
 
 
 File: gawk.info,  Node: I18N Portability,  Prev: Printf Ordering,  Up: Translator i18n
@@ -11321,19 +11442,19 @@ actually almost portable, requiring very little change:
    * The use of positional specifications in `printf' or `sprintf' is
      _not_ portable.  To support `gettext' at the C level, many
      systems' C versions of `sprintf' do support positional specifiers.
-     But it works only if enough arguments are supplied in the
-     function call.  Many versions of `awk' pass `printf' formats and
-     arguments unchanged to the underlying C library version of
-     `sprintf', but only one format and argument at a time.  What
-     happens if a positional specification is used is anybody's guess.
-     However, since the positional specifications are primarily for use
-     in _translated_ format strings, and since non-GNU `awk's never
+     But it works only if enough arguments are supplied in the function
+     call.  Many versions of `awk' pass `printf' formats and arguments
+     unchanged to the underlying C library version of `sprintf', but
+     only one format and argument at a time.  What happens if a
+     positional specification is used is anybody's guess.  However,
+     since the positional specifications are primarily for use in
+     _translated_ format strings, and since non-GNU `awk's never
      retrieve the translated string, this should not be a problem in
      practice.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) This is good fodder for an "Obfuscated `awk'" contest.
+   (1) This is good fodder for an "Obfuscated `awk'" contest.
 
 
 File: gawk.info,  Node: I18N Example,  Next: Gawk I18N,  Prev: Translator i18n,  Up: Internationalization
@@ -11367,14 +11488,14 @@ This produces:
      msgid "The Answer Is"
      msgstr ""
 
-This original portable object file is saved and reused for each language
-into which the application is translated.  The `msgid' is the original
-string and the `msgstr' is the translation.
+   This original portable object file is saved and reused for each
+language into which the application is translated.  The `msgid' is the
+original string and the `msgstr' is the translation.
 
      NOTE: Strings not marked with a leading underscore do not appear
      in the `guide.po' file.
 
-Next, the messages must be translated.  Here is a translation to a
+   Next, the messages must be translated.  Here is a translation to a
 hypothetical dialect of English, called "Mellow":(1)
 
      $ cp guide.po guide-mellow.po
@@ -11390,29 +11511,29 @@ Following are the translations:
      msgid "The Answer Is"
      msgstr "Like, the scoop is"
 
-The next step is to make the directory to hold the binary message object
-file and then to create the `guide.mo' file.  The directory layout
-shown here is standard for GNU `gettext' on GNU/Linux systems.  Other
-versions of `gettext' may use a different layout:
+   The next step is to make the directory to hold the binary message
+object file and then to create the `guide.mo' file.  The directory
+layout shown here is standard for GNU `gettext' on GNU/Linux systems.
+Other versions of `gettext' may use a different layout:
 
      $ mkdir en_US en_US/LC_MESSAGES
 
-The `msgfmt' utility does the conversion from human-readable `.po' file
-to machine-readable `.mo' file.  By default, `msgfmt' creates a file
-named `messages'.  This file must be renamed and placed in the proper
-directory so that `gawk' can find it:
+   The `msgfmt' utility does the conversion from human-readable `.po'
+file to machine-readable `.mo' file.  By default, `msgfmt' creates a
+file named `messages'.  This file must be renamed and placed in the
+proper directory so that `gawk' can find it:
 
      $ msgfmt guide-mellow.po
      $ mv messages en_US/LC_MESSAGES/guide.mo
 
-Finally, we run the program to test it:
+   Finally, we run the program to test it:
 
      $ gawk -f guide.awk
      -| Hey man, relax!
      -| Like, the scoop is 42
      -| Pardon me, Zaphod who?
 
-If the three replacement functions for `dcgettext', `dcngettext' and
+   If the three replacement functions for `dcgettext', `dcngettext' and
 `bindtextdomain' (*note I18N Portability::) are in a file named
 `libintl.awk', then we can run `guide.awk' unchanged as follows:
 
@@ -11421,9 +11542,9 @@ If the three replacement functions for `dcgettext', `dcngettext' and
      -| The Answer Is 42
      -| Pardon me, Zaphod who?
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Perhaps it would be better if it were called "Hippy." Ah, well.
+   (1) Perhaps it would be better if it were called "Hippy." Ah, well.
 
 
 File: gawk.info,  Node: Gawk I18N,  Prev: I18N Example,  Up: Internationalization
@@ -11433,11 +11554,11 @@ File: gawk.info,  Node: Gawk I18N,  Prev: I18N Example,  Up: Internationalizatio
 
 As of version 3.1, `gawk' itself has been internationalized using the
 GNU `gettext' package.  (GNU `gettext' is described in complete detail
-in *Note Top::.)  As of this writing, the latest version of GNU
+in *note Top::.)  As of this writing, the latest version of GNU
 `gettext' is version 0.11.5
 (ftp://ftp.gnu.org/gnu/gettext/gettext-0.11.5.tar.gz).
 
-If a translation of `gawk''s messages exists, then `gawk' produces
+   If a translation of `gawk''s messages exists, then `gawk' produces
 usage messages, warnings, and fatal errors in the local language.
 
 
@@ -11450,16 +11571,16 @@ File: gawk.info,  Node: Advanced Features,  Next: Invoking Gawk,  Prev: Internat
      who knows where you live.
      Steve English, as quoted by Peter Langston
 
-This major node discusses advanced features in `gawk'.  It's a bit of a
-"grab bag" of items that are otherwise unrelated to each other.  First,
-a command-line option allows `gawk' to recognize nondecimal numbers in
-input data, not just in `awk' programs.  Next, two-way I/O, discussed
-briefly in earlier parts of this Info file, is described in full
-detail, along with the basics of TCP/IP networking and BSD portal
+   This major node discusses advanced features in `gawk'.  It's a bit
+of a "grab bag" of items that are otherwise unrelated to each other.
+First, a command-line option allows `gawk' to recognize nondecimal
+numbers in input data, not just in `awk' programs.  Next, two-way I/O,
+discussed briefly in earlier parts of this Info file, is described in
+full detail, along with the basics of TCP/IP networking and BSD portal
 files.  Finally, `gawk' can "profile" an `awk' program, making it
 possible to tune it for performance.
 
-*Note Dynamic Extensions::, discusses the ability to dynamically add
+   *note Dynamic Extensions::, discusses the ability to dynamically add
 new built-in functions to `gawk'.  As this feature is still immature
 and likely to change, its description is relegated to an appendix.
 
@@ -11485,8 +11606,8 @@ nondecimal constants in your input data:
      >                                         $1, $2, $3 }'
      -| 83, 123, 291
 
-For this feature to work, write your program so that `gawk' treats your
-data as numeric:
+   For this feature to work, write your program so that `gawk' treats
+your data as numeric:
 
      $ echo 0123 123 0x123 | gawk '{ print $1, $2, $3 }'
      -| 0123 123 0x123
@@ -11502,12 +11623,12 @@ zero to a field to force it to be treated as a number.  For example:
      -| 0123 123 0x123
      -| 83 123 291
 
-Because it is common to have decimal data with leading zeros, and
+   Because it is common to have decimal data with leading zeros, and
 because using it could lead to surprising results, the default is to
 leave this facility disabled.  If you want it, you must explicitly
 request it.
 
-*Caution:* _Use of this option is not recommended._ It can break old
+   *Caution:* _Use of this option is not recommended._ It can break old
 programs very badly.  Instead, use the `strtonum' function to convert
 your data (*note Nondecimal-numbers::).  This makes your programs
 easier to write and easier to read, and leads to less surprising
@@ -11536,7 +11657,7 @@ File: gawk.info,  Node: Two-way I/O,  Next: TCP/IP Networking,  Prev: Nondecimal
      --
      Mike Brennan
 
-It is often useful to be able to send data to a separate program for
+   It is often useful to be able to send data to a separate program for
 processing and then read the result.  This can always be done with
 temporary files:
 
@@ -11557,11 +11678,11 @@ the program be run in a directory that cannot be shared among users;
 for example, `/tmp' will not do, as another user might happen to be
 using a temporary file with the same name.
 
-Starting with version 3.1 of `gawk', it is possible to open a _two-way_
-pipe to another process.  The second process is termed a "coprocess",
-since it runs in parallel with `gawk'.  The two-way connection is
-created using the new `|&' operator (borrowed from the Korn shell,
-`ksh'):(1)
+   Starting with version 3.1 of `gawk', it is possible to open a
+_two-way_ pipe to another process.  The second process is termed a
+"coprocess", since it runs in parallel with `gawk'.  The two-way
+connection is created using the new `|&' operator (borrowed from the
+Korn shell, `ksh'):(1)
 
      do {
          print DATA |& "subprogram"
@@ -11569,7 +11690,7 @@ created using the new `|&' operator (borrowed from the Korn shell,
      } while (DATA LEFT TO PROCESS)
      close("subprogram")
 
-The first time an I/O operation is executed using the `|&' operator,
+   The first time an I/O operation is executed using the `|&' operator,
 `gawk' creates a two-way pipeline to a child process that runs the
 other program.  Output created with `print' or `printf' is written to
 the program's standard input, and output from the program's standard
@@ -11577,7 +11698,7 @@ output can be read by the `gawk' program using `getline'.  As is the
 case with processes started by `|', the subprogram can be any program,
 or pipeline of programs, that can be started by the shell.
 
-There are some cautionary items to be aware of:
+   There are some cautionary items to be aware of:
 
    * As the code inside `gawk' currently stands, the coprocess's
      standard error goes to the same place that the parent `gawk''s
@@ -11591,19 +11712,19 @@ There are some cautionary items to be aware of:
      lead to a situation known as "deadlock", where each process is
      waiting for the other one to do something.
 
-It is possible to close just one end of the two-way pipe to a
+   It is possible to close just one end of the two-way pipe to a
 coprocess, by supplying a second argument to the `close' function of
 either `"to"' or `"from"' (*note Close Files And Pipes::).  These
 strings tell `gawk' to close the end of the pipe that sends data to the
 process or the end that reads from it, respectively.
 
-This is particularly necessary in order to use the system `sort'
+   This is particularly necessary in order to use the system `sort'
 utility as part of a coprocess; `sort' must read _all_ of its input
 data before it can produce any output.  The `sort' program does not
 receive an end-of-file indication until `gawk' closes the write end of
 the pipe.
 
-When you have finished writing data to the `sort' utility, you can
+   When you have finished writing data to the `sort' utility, you can
 close the `"to"' end of the pipe, and then start reading sorted data
 via `getline'.  For example:
 
@@ -11620,20 +11741,20 @@ via `getline'.  For example:
          close(command)
      }
 
-This program writes the letters of the alphabet in reverse order, one
+   This program writes the letters of the alphabet in reverse order, one
 per line, down the two-way pipe to `sort'.  It then closes the write
 end of the pipe, so that `sort' receives an end-of-file indication.
 This causes `sort' to sort the data and write the sorted data back to
 the `gawk' program.  Once all of the data has been read, `gawk'
 terminates the coprocess and exits.
 
-As a side note, the assignment `LC_ALL=C' in the `sort' command ensures
-traditional Unix (ASCII) sorting from `sort'.
+   As a side note, the assignment `LC_ALL=C' in the `sort' command
+ensures traditional Unix (ASCII) sorting from `sort'.
 
-Beginning with `gawk' 3.1.2, you may use Pseudo-ttys (ptys) for two-way
-communication instead of pipes, if your system supports them.  This is
-done on a per-command basis, by setting a special element in the
-`PROCINFO' array (*note Auto-set::), like so:
+   Beginning with `gawk' 3.1.2, you may use Pseudo-ttys (ptys) for
+two-way communication instead of pipes, if your system supports them.
+This is done on a per-command basis, by setting a special element in
+the `PROCINFO' array (*note Auto-set::), like so:
 
      command = "sort -nr"           # command, saved in variable for convenience
      PROCINFO[command, "pty"] = 1   # update PROCINFO
@@ -11645,9 +11766,10 @@ loss in performance.  If your system does not have ptys, or if all the
 system's ptys are in use, `gawk' automatically falls back to using
 regular pipes.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) This is very different from the same operator in the C shell, `csh'.
+   (1) This is very different from the same operator in the C shell,
+`csh'.
 
 
 File: gawk.info,  Node: TCP/IP Networking,  Next: Portal Files,  Prev: Two-way I/O,  Up: Advanced Features
@@ -11660,17 +11782,17 @@ File: gawk.info,  Node: TCP/IP Networking,  Next: Portal Files,  Prev: Two-way I
      unless the host that isn't close
      is busy hung or dead.
 
-In addition to being able to open a two-way pipeline to a coprocess on
-the same system (*note Two-way I/O::), it is possible to make a two-way
-connection to another process on another system across an IP networking
-connection.
+   In addition to being able to open a two-way pipeline to a coprocess
+on the same system (*note Two-way I/O::), it is possible to make a
+two-way connection to another process on another system across an IP
+networking connection.
 
-You can think of this as just a _very long_ two-way pipeline to a
+   You can think of this as just a _very long_ two-way pipeline to a
 coprocess.  The way `gawk' decides that you want to use TCP/IP
 networking is by recognizing special file names that begin with
 `/inet/'.
 
-The full syntax of the special file name is
+   The full syntax of the special file name is
 `/inet/PROTOCOL/LOCAL-PORT/REMOTE-HOST/REMOTE-PORT'.  The components
 are:
 
@@ -11699,7 +11821,7 @@ REMOTE-PORT
      Again, use `0' if you don't care, or else a well-known service
      name.
 
-Consider the following very simple example:
+   Consider the following very simple example:
 
      BEGIN {
        Service = "/inet/tcp/0/localhost/daytime"
@@ -11708,11 +11830,11 @@ Consider the following very simple example:
        close(Service)
      }
 
-This program reads the current date and time from the local system's
+   This program reads the current date and time from the local system's
 TCP `daytime' server.  It then prints the results and closes the
 connection.
 
-Because this topic is extensive, the use of `gawk' for TCP/IP
+   Because this topic is extensive, the use of `gawk' for TCP/IP
 programming is documented separately.  *Note Top::, for a much more
 complete introduction and discussion, as well as extensive examples.
 
@@ -11726,7 +11848,7 @@ Similar to the `/inet' special files, if `gawk' is configured with the
 `--enable-portals' option (*note Quick Installation::), then `gawk'
 treats files whose pathnames begin with `/p' as 4.4 BSD-style portals.
 
-When used with the `|&' operator, `gawk' opens the file for two-way
+   When used with the `|&' operator, `gawk' opens the file for two-way
 communications.  The operating system's portal mechanism then manages
 creating the process associated with the portal and the corresponding
 communications with the portal's process.
@@ -11741,20 +11863,21 @@ Beginning with version 3.1 of `gawk', you may produce execution traces
 of your `awk' programs.  This is done with a specially compiled version
 of `gawk', called `pgawk' ("profiling `gawk'").
 
-`pgawk' is identical in every way to `gawk', except that when it has
+   `pgawk' is identical in every way to `gawk', except that when it has
 finished running, it creates a profile of your program in a file named
 `awkprof.out'.  Because it is profiling, it also executes up to 45%
 slower than `gawk' normally does.
 
-As shown in the following example, the `--profile' option can be used
-to change the name of the file where `pgawk' will write the profile:
+   As shown in the following example, the `--profile' option can be
+used to change the name of the file where `pgawk' will write the
+profile:
 
      $ pgawk --profile=myprog.prof -f myprog.awk data1 data2
 
 In the above example, `pgawk' places the profile in `myprog.prof'
 instead of in `awkprof.out'.
 
-Regular `gawk' also accepts this option.  When called with just
+   Regular `gawk' also accepts this option.  When called with just
 `--profile', `gawk' "pretty prints" the program into `awkprof.out',
 without any execution counts.  You may supply an option to `--profile'
 to change the file name.  Here is a sample session showing a simple
@@ -11787,7 +11910,7 @@ First, the `awk' program:
          print "I gotta be me!"
      }
 
-Following is the input data:
+   Following is the input data:
 
      foo
      bar
@@ -11795,7 +11918,7 @@ Following is the input data:
      foo
      junk
 
-Here is the `awkprof.out' that results from running `pgawk' on this
+   Here is the `awkprof.out' that results from running `pgawk' on this
 program and data (this example also illustrates that `awk' programmers
 sometimes have to work late):
 
@@ -11839,8 +11962,8 @@ sometimes have to work late):
           6          print "I gotta be me!"
              }
 
-This example illustrates many of the basic rules for profiling output.
-The rules are as follows:
+   This example illustrates many of the basic rules for profiling
+output.  The rules are as follows:
 
    * The program is printed in the order `BEGIN' rule, pattern/action
      rules, `END' rule and functions, listed alphabetically.  Multiple
@@ -11880,9 +12003,6 @@ The rules are as follows:
      by four.  However, `3 + 5 * 4' has no parentheses, and means `3 +
      (5 * 4)'.
 
-   * All string concatenations are parenthesized too.  (This could be
-     made a bit smarter.)
-
    * Parentheses are used around the arguments to `print' and `printf'
      only when the `print' or `printf' statement is followed by a
      redirection.  Similarly, if the target of a redirection isn't a
@@ -11892,13 +12012,13 @@ The rules are as follows:
      `END' rules, the pattern/action rules, and the functions.
 
 
-The profiled version of your program may not look exactly like what you
-typed when you wrote it.  This is because `pgawk' creates the profiled
-version by "pretty printing" its internal representation of the
-program.  The advantage to this is that `pgawk' can produce a standard
-representation.  The disadvantage is that all source-code comments are
-lost, as are the distinctions among multiple `BEGIN' and `END' rules.
-Also, things such as:
+   The profiled version of your program may not look exactly like what
+you typed when you wrote it.  This is because `pgawk' creates the
+profiled version by "pretty printing" its internal representation of
+the program.  The advantage to this is that `pgawk' can produce a
+standard representation.  The disadvantage is that all source-code
+comments are lost, as are the distinctions among multiple `BEGIN' and
+`END' rules.  Also, things such as:
 
      /foo/
 
@@ -11910,7 +12030,7 @@ come out as:
 
 which is correct, but possibly surprising.
 
-Besides creating profiles when a program has completed, `pgawk' can
+   Besides creating profiles when a program has completed, `pgawk' can
 produce a profile while it is running.  This is useful if your `awk'
 program goes into an infinite loop and you want to see what has been
 executed.  To use this feature, run `pgawk' in the background:
@@ -11926,8 +12046,8 @@ The shell prints a job number and process ID number; in this case,
 As usual, the profiled version of the program is written to
 `awkprof.out', or to a different file if you use the `--profile' option.
 
-Along with the regular profile, as shown earlier, the profile includes
-a trace of any active functions:
+   Along with the regular profile, as shown earlier, the profile
+includes a trace of any active functions:
 
      # Function Call Stack:
 
@@ -11936,18 +12056,18 @@ a trace of any active functions:
      #   1. foo
      # -- main --
 
-You may send `pgawk' the `USR1' signal as many times as you like.  Each
-time, the profile and function call trace are appended to the output
-profile file.
+   You may send `pgawk' the `USR1' signal as many times as you like.
+Each time, the profile and function call trace are appended to the
+output profile file.
 
-If you use the `HUP' signal instead of the `USR1' signal, `pgawk'
+   If you use the `HUP' signal instead of the `USR1' signal, `pgawk'
 produces the profile and the function call trace and then exits.
 
-When `pgawk' runs on MS-DOS or MS-Windows, it uses the `INT' and `QUIT'
-signals for producing the profile and, in the case of the `INT' signal,
-`pgawk' exits.  This is because these systems don't support the `kill'
-command, so the only signals you can deliver to a program are those
-generated by the keyboard.  The `INT' signal is generated by the
+   When `pgawk' runs on MS-DOS or MS-Windows, it uses the `INT' and
+`QUIT' signals for producing the profile and, in the case of the `INT'
+signal, `pgawk' exits.  This is because these systems don't support the
+`kill' command, so the only signals you can deliver to a program are
+those generated by the keyboard.  The `INT' signal is generated by the
 `Ctrl-<C>' or `Ctrl-<BREAK>' key, while the `QUIT' signal is generated
 by the `Ctrl-<\>' key.
 
@@ -11964,7 +12084,7 @@ for source files, obsolete options and/or features, and known bugs in
 `gawk'.  This major node rounds out the discussion of `awk' as a
 program and as a language.
 
-While a number of the options and features described here were
+   While a number of the options and features described here were
 discussed in passing earlier in the book, this major node provides the
 full details.
 
@@ -11992,10 +12112,10 @@ enclosed in [...] in these templates are optional:
      awk [OPTIONS] -f progfile [`--'] FILE ...
      awk [OPTIONS] [`--'] 'PROGRAM' FILE ...
 
-Besides traditional one-letter POSIX-style options, `gawk' also
+   Besides traditional one-letter POSIX-style options, `gawk' also
 supports GNU long options.
 
-It is possible to invoke `awk' with an empty program:
+   It is possible to invoke `awk' with an empty program:
 
      awk '' datafile1 datafile2
 
@@ -12018,7 +12138,7 @@ argument's value, or the keyword and the argument's value are separated
 by whitespace.  If a particular option with a value is given more than
 once, it is the last value that counts.
 
-Each long option for `gawk' has a corresponding POSIX-style option.
+   Each long option for `gawk' has a corresponding POSIX-style option.
 The long and short options are interchangeable in all contexts.  The
 options and their meanings are as follows:
 
@@ -12074,8 +12194,8 @@ options and their meanings are as follows:
      shell scripts, if you have file names that will be specified by
      the user that could start with `-'.
 
-The previous list described options mandated by the POSIX standard, as
-well as options available in the Bell Laboratories version of `awk'.
+   The previous list described options mandated by the POSIX standard,
+as well as options available in the Bell Laboratories version of `awk'.
 The following list describes `gawk'-specific options:
 
 `-W compat'
@@ -12086,7 +12206,7 @@ The following list describes `gawk'-specific options:
      `awk' language are disabled, so that `gawk' behaves just like the
      Bell Laboratories research version of Unix `awk'.  `--traditional'
      is the preferred form of this option.  *Note POSIX/GNU::, which
-     summarizes the extensions.  Also see *Note Compatibility Mode::.
+     summarizes the extensions.  Also see *note Compatibility Mode::.
 
 `-W copyright'
 `--copyright'
@@ -12157,6 +12277,13 @@ The following list describes `gawk'-specific options:
      that are actually invalid are issued. (This is not fully
      implemented yet.)
 
+     Some warnings are only printed once, even if the dubious
+     constructs they warn about occur multiple times in your `awk'
+     program.  Thus, when eliminating problems pointed out by `--lint',
+     you should take care to search for all occurrences of each
+     inappropriate construct. As `awk' programs are usually short,
+     doing so is not burdensome.
+
 `-W lint-old'
 `--lint-old'
      Warns about constructs that are not available in the original
@@ -12196,6 +12323,9 @@ The following list describes `gawk'-specific options:
           of `FS' to be a single TAB character (*note Field
           Separators::).
 
+        * The locale's decimal point character is used for parsing input
+          data (*note Locales::).
+
         * The `fflush' built-in function is not supported (*note I/O
           Functions::).
 
@@ -12230,6 +12360,11 @@ The following list describes `gawk'-specific options:
      functions that you want to use from your command-line programs
      (*note AWKPATH Variable::).
 
+`-W use-lc-numeric'
+`--use-lc-numeric'
+     This option forces the use of the locale's decimal point character
+     when parsing numeric input data (*note Locales::).
+
 `-W version'
 `--version'
      Prints version information for this particular copy of `gawk'.
@@ -12237,40 +12372,40 @@ The following list describes `gawk'-specific options:
      with respect to whatever the Free Software Foundation is currently
      distributing.  It is also useful for bug reports (*note Bugs::).
 
-As long as program text has been supplied, any other options are
+   As long as program text has been supplied, any other options are
 flagged as invalid with a warning message but are otherwise ignored.
 
-In compatibility mode, as a special case, if the value of FS supplied
+   In compatibility mode, as a special case, if the value of FS supplied
 to the `-F' option is `t', then `FS' is set to the TAB character
 (`"\t"').  This is true only for `--traditional' and not for `--posix'
 (*note Field Separators::).
 
-The `-f' option may be used more than once on the command line.  If it
-is, `awk' reads its program source from all of the named files, as if
-they had been concatenated together into one big file.  This is useful
-for creating libraries of `awk' functions.  These functions can be
-written once and then retrieved from a standard place, instead of
+   The `-f' option may be used more than once on the command line.  If
+it is, `awk' reads its program source from all of the named files, as
+if they had been concatenated together into one big file.  This is
+useful for creating libraries of `awk' functions.  These functions can
+be written once and then retrieved from a standard place, instead of
 having to be included into each individual program.  (As mentioned in
-*Note Definition Syntax::, function names must be unique.)
-
-Library functions can still be used, even if the program is entered at
-the terminal, by specifying `-f /dev/tty'.  After typing your program,
-type `Ctrl-d' (the end-of-file character) to terminate it.  (You may
-also use `-f -' to read program source from the standard input but then
-you will not be able to also use the standard input as a source of
-data.)
-
-Because it is clumsy using the standard `awk' mechanisms to mix source
-file and command-line `awk' programs, `gawk' provides the `--source'
-option.  This does not require you to pre-empt the standard input for
-your source code; it allows you to easily mix command-line and library
-source code (*note AWKPATH Variable::).
-
-If no `-f' or `--source' option is specified, then `gawk' uses the
+*note Definition Syntax::, function names must be unique.)
+
+   Library functions can still be used, even if the program is entered
+at the terminal, by specifying `-f /dev/tty'.  After typing your
+program, type `Ctrl-d' (the end-of-file character) to terminate it.
+(You may also use `-f -' to read program source from the standard input
+but then you will not be able to also use the standard input as a
+source of data.)
+
+   Because it is clumsy using the standard `awk' mechanisms to mix
+source file and command-line `awk' programs, `gawk' provides the
+`--source' option.  This does not require you to pre-empt the standard
+input for your source code; it allows you to easily mix command-line
+and library source code (*note AWKPATH Variable::).
+
+   If no `-f' or `--source' option is specified, then `gawk' uses the
 first non-option command-line argument as the text of the program
 source code.
 
-If the environment variable `POSIXLY_CORRECT' exists, then `gawk'
+   If the environment variable `POSIXLY_CORRECT' exists, then `gawk'
 behaves in strict POSIX mode, exactly as if you had supplied the
 `--posix' command-line option.  Many GNU programs look for this
 environment variable to turn on strict POSIX mode. If `--lint' is
@@ -12283,18 +12418,18 @@ you would add these lines to the `.profile' file in your home directory:
      POSIXLY_CORRECT=true
      export POSIXLY_CORRECT
 
-For a `csh'-compatible shell,(1) you would add this line to the
+   For a `csh'-compatible shell,(1) you would add this line to the
 `.login' file in your home directory:
 
      setenv POSIXLY_CORRECT true
 
-Having `POSIXLY_CORRECT' set is not recommended for daily use, but it
-is good for testing the portability of your programs to other
+   Having `POSIXLY_CORRECT' set is not recommended for daily use, but
+it is good for testing the portability of your programs to other
 environments.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Not recommended.
+   (1) Not recommended.
 
 
 File: gawk.info,  Node: Other Arguments,  Next: AWKPATH Variable,  Prev: Options,  Up: Invoking Gawk
@@ -12306,31 +12441,31 @@ Any additional arguments on the command line are normally treated as
 input files to be processed in the order specified.   However, an
 argument that has the form `VAR=VALUE', assigns the value VALUE to the
 variable VAR--it does not specify a file at all.  (This was discussed
-earlier in *Note Assignment Options::.)
+earlier in *note Assignment Options::.)
 
-All these arguments are made available to your `awk' program in the
+   All these arguments are made available to your `awk' program in the
 `ARGV' array (*note Built-in Variables::).  Command-line options and
 the program text (if present) are omitted from `ARGV'.  All other
 arguments, including variable assignments, are included.   As each
 element of `ARGV' is processed, `gawk' sets the variable `ARGIND' to
 the index in `ARGV' of the current element.
 
-The distinction between file name arguments and variable-assignment
+   The distinction between file name arguments and variable-assignment
 arguments is made when `awk' is about to open the next input file.  At
 that point in execution, it checks the file name to see whether it is
 really a variable assignment; if so, `awk' sets the variable instead of
 reading a file.
 
-Therefore, the variables actually receive the given values after all
+   Therefore, the variables actually receive the given values after all
 previously specified files have been read.  In particular, the values of
 variables assigned in this fashion are _not_ available inside a `BEGIN'
 rule (*note BEGIN/END::), because such rules are run before `awk'
 begins scanning the argument list.
 
-The variable values given on the command line are processed for escape
-sequences (*note Escape Sequences::).  (d.c.)
+   The variable values given on the command line are processed for
+escape sequences (*note Escape Sequences::).  (d.c.)
 
-In some earlier implementations of `awk', when a variable assignment
+   In some earlier implementations of `awk', when a variable assignment
 occurred before any file names, the assignment would happen _before_
 the `BEGIN' rule was executed.  `awk''s behavior was thus inconsistent;
 some command-line assignments were available inside the `BEGIN' rule,
@@ -12339,7 +12474,7 @@ upon this "feature."  When `awk' was changed to be more consistent, the
 `-v' option was added to accommodate applications that depended upon
 the old behavior.
 
-The variable assignment feature is most useful for assigning to
+   The variable assignment feature is most useful for assigning to
 variables such as `RS', `OFS', and `ORS', which control input and
 output formats before scanning the data files.  It is also useful for
 controlling state if multiple passes are needed over a data file.  For
@@ -12348,8 +12483,8 @@ example:
      awk 'pass == 1  { PASS 1 STUFF }
           pass == 2  { PASS 2 STUFF }' pass=1 mydata pass=2 mydata
 
-Given the variable assignment feature, the `-F' option for setting the
-value of `FS' is not strictly necessary.  It remains for historical
+   Given the variable assignment feature, the `-F' option for setting
+the value of `FS' is not strictly necessary.  It remains for historical
 compatibility.
 
 
@@ -12373,14 +12508,14 @@ variable.  If that variable does not exist, `gawk' uses a default path,
 administrators should use an `AWKPATH' variable that does not include
 the current directory, `.'.)
 
-The search path feature is particularly useful for building libraries
+   The search path feature is particularly useful for building libraries
 of useful `awk' functions.  The library files can be placed in a
 standard directory in the default path and then specified on the
 command line with a short file name.  Otherwise, the full file name
 would have to be typed for each file.
 
-By using both the `--source' and `-f' options, your command-line `awk'
-programs can use facilities in `awk' library files (*note Library
+   By using both the `--source' and `-f' options, your command-line
+`awk' programs can use facilities in `awk' library files (*note Library
 Functions::).  Path searching is not done if `gawk' is in compatibility
 mode.  This is true for both `--traditional' and `--posix'.  *Note
 Options::.
@@ -12394,20 +12529,20 @@ Options::.
      found in the current directory.  This path search mechanism is
      identical to the shell's.
 
-Starting with version 3.0, if `AWKPATH' is not defined in the
+   Starting with version 3.0, if `AWKPATH' is not defined in the
 environment, `gawk' places its default search path into
 `ENVIRON["AWKPATH"]'. This makes it easy to determine the actual search
 path that `gawk' will use from within an `awk' program.
 
-While you can change `ENVIRON["AWKPATH"]' within your `awk' program,
+   While you can change `ENVIRON["AWKPATH"]' within your `awk' program,
 this has no effect on the running program's behavior.  This makes
 sense: the `AWKPATH' environment variable is used to find the program
 source files.  Once your program is running, all the files have been
 found, and `gawk' no longer needs to use `AWKPATH'.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Your version of `gawk' may use a different directory; it will
+   (1) Your version of `gawk' may use a different directory; it will
 depend upon how `gawk' was built and installed. The actual directory is
 the value of `$(datadir)' generated when `gawk' was configured.  You
 probably don't need to worry about this, though.
@@ -12423,16 +12558,17 @@ previous releases of `gawk' that are either not available in the
 current version or that are still supported but deprecated (meaning that
 they will _not_ be in the next release).
 
-For version 3.1 of `gawk', there are no deprecated command-line options
-from the previous version of `gawk'.  The use of `next file' (two
-words) for `nextfile' was deprecated in `gawk' 3.0 but still worked.
-Starting with version 3.1, the two-word usage is no longer accepted.
+   For version 3.1 of `gawk', there are no deprecated command-line
+options from the previous version of `gawk'.  The use of `next file'
+(two words) for `nextfile' was deprecated in `gawk' 3.0 but still
+worked.  Starting with version 3.1, the two-word usage is no longer
+accepted.
 
-The process-related special files described in *Note Special Process::,
-work as described, but are now considered deprecated.  `gawk' prints a
-warning message every time they are used.  (Use `PROCINFO' instead; see
-*Note Auto-set::.)  They will be removed from the next release of
-`gawk'.
+   The process-related special files described in *note Special
+Process::, work as described, but are now considered deprecated.
+`gawk' prints a warning message every time they are used.  (Use
+`PROCINFO' instead; see *note Auto-set::.)  They will be removed from
+the next release of `gawk'.
 
 
 File: gawk.info,  Node: Undocumented,  Next: Known Bugs,  Prev: Obsolete,  Up: Invoking Gawk
@@ -12443,7 +12579,7 @@ File: gawk.info,  Node: Undocumented,  Next: Known Bugs,  Prev: Obsolete,  Up: I
      Use the Source, Luke!
      Obi-Wan
 
-This minor node intentionally left blank.
+   This minor node intentionally left blank.
 
 
 File: gawk.info,  Node: Known Bugs,  Prev: Undocumented,  Up: Invoking Gawk
@@ -12466,44 +12602,44 @@ File: gawk.info,  Node: Library Functions,  Next: Sample Programs,  Prev: Invoki
 12 A Library of `awk' Functions
 *******************************
 
-*Note User-defined::, describes how to write your own `awk' functions.
+*note User-defined::, describes how to write your own `awk' functions.
 Writing functions is important, because it allows you to encapsulate
 algorithms and program tasks in a single place.  It simplifies
 programming, making program development more manageable, and making
 programs more readable.
 
-One valuable way to learn a new programming language is to _read_
-programs in that language.  To that end, this major node and *Note
+   One valuable way to learn a new programming language is to _read_
+programs in that language.  To that end, this major node and *note
 Sample Programs::, provide a good-sized body of code for you to read,
 and hopefully, to learn from.
 
-This major node presents a library of useful `awk' functions.  Many of
-the sample programs presented later in this Info file use these
+   This major node presents a library of useful `awk' functions.  Many
+of the sample programs presented later in this Info file use these
 functions.  The functions are presented here in a progression from
 simple to complex.
 
-*Note Extract Program::, presents a program that you can use to extract
-the source code for these example library functions and programs from
-the Texinfo source for this Info file.  (This has already been done as
-part of the `gawk' distribution.)
+   *note Extract Program::, presents a program that you can use to
+extract the source code for these example library functions and
+programs from the Texinfo source for this Info file.  (This has already
+been done as part of the `gawk' distribution.)
 
-If you have written one or more useful, general-purpose `awk' functions
-and would like to contribute them to the author's collection of `awk'
-programs, see *Note How To Contribute::, for more information.
+   If you have written one or more useful, general-purpose `awk'
+functions and would like to contribute them to the author's collection
+of `awk' programs, see *note How To Contribute::, for more information.
 
-The programs in this major node and in *Note Sample Programs::, freely
-use features that are `gawk'-specific.  Rewriting these programs for
-different implementations of awk is pretty straightforward.
+   The programs in this major node and in *note Sample Programs::,
+freely use features that are `gawk'-specific.  Rewriting these programs
+for different implementations of awk is pretty straightforward.
 
-Diagnostic error messages are sent to `/dev/stderr'.  Use `| "cat
+   Diagnostic error messages are sent to `/dev/stderr'.  Use `| "cat
 1>&2"' instead of `> "/dev/stderr"' if your system does not have a
 `/dev/stderr', or if you cannot use `gawk'.
 
-A number of programs use `nextfile' (*note Nextfile Statement::) to
-skip any remaining input in the input file.  *Note Nextfile Function::,
+   A number of programs use `nextfile' (*note Nextfile Statement::) to
+skip any remaining input in the input file.  *note Nextfile Function::,
 shows you how to write a function that does the same thing.
 
-Finally, some of the programs choose to ignore upper- and lowercase
+   Finally, some of the programs choose to ignore upper- and lowercase
 distinctions in their input. They do so by assigning one to
 `IGNORECASE'.  You can achieve almost the same effect(1) by adding the
 following rule to the beginning of the program:
@@ -12526,9 +12662,9 @@ use only lowercase letters.
 * Passwd Functions::            Functions for getting user information.
 * Group Functions::             Functions for getting group information.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The effects are not identical.  Output of the transformed record
+   (1) The effects are not identical.  Output of the transformed record
 will be in all lowercase, while `IGNORECASE' preserves the original
 contents of the input record.
 
@@ -12543,25 +12679,25 @@ Due to the way the `awk' language evolved, variables are either
 specific function).  There is no intermediate state analogous to
 `static' variables in C.
 
-Library functions often need to have global variables that they can use
-to preserve state information between calls to the function--for
+   Library functions often need to have global variables that they can
+use to preserve state information between calls to the function--for
 example, `getopt''s variable `_opti' (*note Getopt Function::).  Such
 variables are called "private", since the only functions that need to
 use them are the ones in the library.
 
-When writing a library function, you should try to choose names for your
-private variables that will not conflict with any variables used by
+   When writing a library function, you should try to choose names for
+your private variables that will not conflict with any variables used by
 either another library function or a user's main program.  For example,
 a name like `i' or `j' is not a good choice, because user programs
 often use variable names like these for their own purposes.
 
-The example programs shown in this major node all start the names of
+   The example programs shown in this major node all start the names of
 their private variables with an underscore (`_').  Users generally
 don't use leading underscores in their variable names, so this
 convention immediately decreases the chances that the variable name
 will be accidentally shared with the user's program.
 
-In addition, several of the library functions use a prefix that helps
+   In addition, several of the library functions use a prefix that helps
 indicate what function or set of functions use the variables--for
 example, `_pw_byname' in the user database routines (*note Passwd
 Functions::).  This convention is recommended, since it even further
@@ -12569,18 +12705,18 @@ decreases the chance of inadvertent conflict among variable names.
 Note that this convention is used equally well for variable names and
 for private function names as well.(1)
 
-As a final note on variable naming, if a function makes global variables
-available for use by a main program, it is a good convention to start
-that variable's name with a capital letter--for example, `getopt''s
-`Opterr' and `Optind' variables (*note Getopt Function::).  The leading
-capital letter indicates that it is global, while the fact that the
-variable name is not all capital letters indicates that the variable is
-not one of `awk''s built-in variables, such as `FS'.
+   As a final note on variable naming, if a function makes global
+variables available for use by a main program, it is a good convention
+to start that variable's name with a capital letter--for example,
+`getopt''s `Opterr' and `Optind' variables (*note Getopt Function::).
+The leading capital letter indicates that it is global, while the fact
+that the variable name is not all capital letters indicates that the
+variable is not one of `awk''s built-in variables, such as `FS'.
 
-It is also important that _all_ variables in library functions that do
-not need to save state are, in fact, declared local.(2) If this is not
-done, the variable could accidentally be used in the user's program,
-leading to bugs that are very difficult to track down:
+   It is also important that _all_ variables in library functions that
+do not need to save state are, in fact, declared local.(2) If this is
+not done, the variable could accidentally be used in the user's
+program, leading to bugs that are very difficult to track down:
 
      function lib_func(x, y,    l1, l2)
      {
@@ -12589,26 +12725,27 @@ leading to bugs that are very difficult to track down:
          ...                   # but is not by oversight
      }
 
-A different convention, common in the Tcl community, is to use a single
-associative array to hold the values needed by the library function(s),
-or "package."  This significantly decreases the number of actual global
-names in use.  For example, the functions described in *Note Passwd
-Functions::, might have used array elements `PW_data["inited"]',
-`PW_data["total"]', `PW_data["count"]', and `PW_data["awklib"]',
-instead of `_pw_inited', `_pw_awklib', `_pw_total', and `_pw_count'.
+   A different convention, common in the Tcl community, is to use a
+single associative array to hold the values needed by the library
+function(s), or "package."  This significantly decreases the number of
+actual global names in use.  For example, the functions described in
+*note Passwd Functions::, might have used array elements
+`PW_data["inited"]', `PW_data["total"]', `PW_data["count"]', and
+`PW_data["awklib"]', instead of `_pw_inited', `_pw_awklib', `_pw_total',
+and `_pw_count'.
 
-The conventions presented in this minor node are exactly that:
+   The conventions presented in this minor node are exactly that:
 conventions. You are not required to write your programs this way--we
 merely recommend that you do so.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) While all the library routines could have been rewritten to use
+   (1) While all the library routines could have been rewritten to use
 this convention, this was not done, in order to show how my own `awk'
 programming style has evolved and to provide some basis for this
 discussion.
 
-(2) `gawk''s `--dump-variables' command-line option is useful for
+   (2) `gawk''s `--dump-variables' command-line option is useful for
 verifying this.
 
 
@@ -12642,13 +12779,13 @@ File: gawk.info,  Node: Nextfile Function,  Next: Strtonum Function,  Up: Genera
 12.2.1 Implementing `nextfile' as a Function
 --------------------------------------------
 
-The `nextfile' statement, presented in *Note Nextfile Statement::, is a
+The `nextfile' statement, presented in *note Nextfile Statement::, is a
 `gawk'-specific extension--it is not available in most other
 implementations of `awk'.  This minor node shows two versions of a
 `nextfile' function that you can use to simulate `gawk''s `nextfile'
 statement if you cannot use `gawk'.
 
-A first attempt at writing a `nextfile' function is as follows:
+   A first attempt at writing a `nextfile' function is as follows:
 
      # nextfile --- skip remaining records in current file
      # this should be read in before the "main" awk program
@@ -12656,26 +12793,26 @@ A first attempt at writing a `nextfile' function is as follows:
      function nextfile()    { _abandon_ = FILENAME; next }
      _abandon_ == FILENAME  { next }
 
-Because it supplies a rule that must be executed first, this file should
-be included before the main program. This rule compares the current
-data file's name (which is always in the `FILENAME' variable) to a
-private variable named `_abandon_'.  If the file name matches, then the
-action part of the rule executes a `next' statement to go on to the
+   Because it supplies a rule that must be executed first, this file
+should be included before the main program. This rule compares the
+current data file's name (which is always in the `FILENAME' variable) to
+a private variable named `_abandon_'.  If the file name matches, then
+the action part of the rule executes a `next' statement to go on to the
 next record.  (The use of `_' in the variable name is a convention.  It
-is discussed more fully in *Note Library Names::.)
+is discussed more fully in *note Library Names::.)
 
-The use of the `next' statement effectively creates a loop that reads
+   The use of the `next' statement effectively creates a loop that reads
 all the records from the current data file.  The end of the file is
 eventually reached and a new data file is opened, changing the value of
 `FILENAME'.  Once this happens, the comparison of `_abandon_' to
 `FILENAME' fails, and execution continues with the first rule of the
 "real" program.
 
-The `nextfile' function itself simply sets the value of `_abandon_' and
-then executes a `next' statement to start the loop.
+   The `nextfile' function itself simply sets the value of `_abandon_'
+and then executes a `next' statement to start the loop.
 
-This initial version has a subtle problem.  If the same data file is
-listed _twice_ on the commandline, one right after the other or even
+   This initial version has a subtle problem.  If the same data file is
+listed _twice_ on the command line, one right after the other or even
 with just a variable assignment between them, this code skips right
 through the file a second time, even though it should stop when it gets
 to the end of the first occurrence.  A second version of `nextfile'
@@ -12694,24 +12831,24 @@ that remedies this problem is shown here:
                next
      }
 
-The `nextfile' function has not changed.  It makes `_abandon_' equal to
-the current file name and then executes a `next' statement.  The `next'
-statement reads the next record and increments `FNR' so that `FNR' is
-guaranteed to have a value of at least two.  However, if `nextfile' is
-called for the last record in the file, then `awk' closes the current
-data file and moves on to the next one.  Upon doing so, `FILENAME' is
-set to the name of the new file and `FNR' is reset to one.  If this
-next file is the same as the previous one, `_abandon_' is still equal
-to `FILENAME'.  However, `FNR' is equal to one, telling us that this is
-a new occurrence of the file and not the one we were reading when the
-`nextfile' function was executed.  In that case, `_abandon_' is reset
-to the empty string, so that further executions of this rule fail
-(until the next time that `nextfile' is called).
-
-If `FNR' is not one, then we are still in the original data file and
+   The `nextfile' function has not changed.  It makes `_abandon_' equal
+to the current file name and then executes a `next' statement.  The
+`next' statement reads the next record and increments `FNR' so that
+`FNR' is guaranteed to have a value of at least two.  However, if
+`nextfile' is called for the last record in the file, then `awk' closes
+the current data file and moves on to the next one.  Upon doing so,
+`FILENAME' is set to the name of the new file and `FNR' is reset to
+one.  If this next file is the same as the previous one, `_abandon_' is
+still equal to `FILENAME'.  However, `FNR' is equal to one, telling us
+that this is a new occurrence of the file and not the one we were
+reading when the `nextfile' function was executed.  In that case,
+`_abandon_' is reset to the empty string, so that further executions of
+this rule fail (until the next time that `nextfile' is called).
+
+   If `FNR' is not one, then we are still in the original data file and
 the program executes a `next' statement to skip through it.
 
-An important question to ask at this point is: given that the
+   An important question to ask at this point is: given that the
 functionality of `nextfile' can be provided with a library file, why is
 it built into `gawk'?  Adding features for little reason leads to
 larger, slower programs that are harder to maintain.  The answer is
@@ -12786,25 +12923,25 @@ versions of `awk':
      #         print a[i], strtonum(a[i]), mystrtonum(a[i])
      # }
 
-The function first looks for C-style octal numbers (base 8).  If the
+   The function first looks for C-style octal numbers (base 8).  If the
 input string matches a regular expression describing octal numbers,
 then `mystrtonum' loops through each character in the string.  It sets
 `k' to the index in `"01234567"' of the current octal digit.  Since the
 return value is one-based, the `k--' adjusts `k' so it can be used in
 computing the return value.
 
-Similar logic applies to the code that checks for and converts a
+   Similar logic applies to the code that checks for and converts a
 hexadecimal value, which starts with `0x' or `0X'.  The use of
 `tolower' simplifies the computation for finding the correct numeric
 value for each hexadecimal digit.
 
-Finally, if the string matches the (rather complicated) regex for a
-regular decimal integer or floating-point numer, the computation `ret =
-str + 0' lets `awk' convert the value to a number.
+   Finally, if the string matches the (rather complicated) regex for a
+regular decimal integer or floating-point number, the computation `ret
+= str + 0' lets `awk' convert the value to a number.
 
-A commented-out test program is included, so that the function can be
-tested with `gawk' and the results compared to the built-in `strtonum'
-function.
+   A commented-out test program is included, so that the function can
+be tested with `gawk' and the results compared to the built-in
+`strtonum' function.
 
 
 File: gawk.info,  Node: Assert Function,  Next: Round Function,  Prev: Strtonum Function,  Up: General Functions
@@ -12830,11 +12967,11 @@ not, and then it kills the program.  In C, using `assert' looks this:
           ...
      }
 
-If the assertion fails, the program prints a message similar to this:
+   If the assertion fails, the program prints a message similar to this:
 
      prog.c:5: assertion failed: a <= 5 && b >= 17.1
 
-The C language makes it possible to turn the condition into a string
+   The C language makes it possible to turn the condition into a string
 for use in printing the diagnostic message.  This is not possible in
 `awk', so this `assert' function also requires a string version of the
 condition that is being tested.  Following is the function:
@@ -12855,14 +12992,14 @@ condition that is being tested.  Following is the function:
              exit 1
      }
 
-The `assert' function tests the `condition' parameter. If it is false,
-it prints a message to standard error, using the `string' parameter to
-describe the failed condition.  It then sets the variable
+   The `assert' function tests the `condition' parameter. If it is
+false, it prints a message to standard error, using the `string'
+parameter to describe the failed condition.  It then sets the variable
 `_assert_exit' to one and executes the `exit' statement.  The `exit'
 statement jumps to the `END' rule. If the `END' rules finds
 `_assert_exit' to be true, it exits immediately.
 
-The purpose of the test in the `END' rule is to keep any other `END'
+   The purpose of the test in the `END' rule is to keep any other `END'
 rules from running.  When an assertion fails, the program should exit
 immediately.  If no assertions fail, then `_assert_exit' is still false
 when the `END' rule is run normally, and the rest of the program's
@@ -12880,16 +13017,16 @@ If the assertion fails, you see a message similar to the following:
 
      mydata:1357: assertion failed: a <= 5 && b >= 17.1
 
-There is a small problem with this version of `assert'.  An `END' rule
-is automatically added to the program calling `assert'.  Normally, if a
-program consists of just a `BEGIN' rule, the input files and/or
+   There is a small problem with this version of `assert'.  An `END'
+rule is automatically added to the program calling `assert'.  Normally,
+if a program consists of just a `BEGIN' rule, the input files and/or
 standard input are not read. However, now that the program has an `END'
 rule, `awk' attempts to read the input data files or standard input
 (*note Using BEGIN/END::), most likely causing the program to hang as
 it waits for input.
 
-There is a simple workaround to this: make sure the `BEGIN' rule always
-ends with an `exit' statement.
+   There is a simple workaround to this: make sure the `BEGIN' rule
+always ends with an `exit' statement.
 
 
 File: gawk.info,  Node: Round Function,  Next: Cliff Random Function,  Prev: Assert Function,  Up: General Functions
@@ -12904,8 +13041,8 @@ trailing `.5' up, contrary to naive expectations.  In unbiased
 rounding, `.5' rounds to even, rather than always up, so 1.5 rounds to
 2 but 4.5 rounds to 4.  This means that if you are using a format that
 does rounding (e.g., `"%.0f"'), you should check what your system does.
-The following function does traditional rounding; it might be useful
-if your awk's `printf' does unbiased rounding:
+The following function does traditional rounding; it might be useful if
+your awk's `printf' does unbiased rounding:
 
      # round.awk --- do normal rounding
      function round(x,   ival, aval, fraction)
@@ -12958,14 +13095,14 @@ code:
          return _cliff_seed
      }
 
-This algorithm requires an initial "seed" of 0.1.  Each new value uses
-the current seed as input for the calculation.  If the built-in `rand'
-function (*note Numeric Functions::) isn't random enough, you might try
-using this function instead.
+   This algorithm requires an initial "seed" of 0.1.  Each new value
+uses the current seed as input for the calculation.  If the built-in
+`rand' function (*note Numeric Functions::) isn't random enough, you
+might try using this function instead.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) `http://mathworld.wolfram.com/CliffRandomNumberGenerator.hmtl'
+   (1) `http://mathworld.wolfram.com/CliffRandomNumberGenerator.html'
 
 
 File: gawk.info,  Node: Ordinal Functions,  Next: Join Function,  Prev: Cliff Random Function,  Up: General Functions
@@ -12978,7 +13115,7 @@ One commercial implementation of `awk' supplies a built-in function,
 character in the machine's character set.  If the string passed to
 `ord' has more than one character, only the first one is used.
 
-The inverse of this function is `chr' (from the function of the same
+   The inverse of this function is `chr' (from the function of the same
 name in Pascal), which takes a number and returns the corresponding
 character.  Both functions are written very nicely in `awk'; there is
 no real reason to build them into the `awk' interpreter:
@@ -13011,9 +13148,9 @@ no real reason to build them into the `awk' interpreter:
          }
      }
 
-Some explanation of the numbers used by `chr' is worthwhile.  The most
-prominent character set in use today is ASCII. Although an 8-bit byte
-can hold 256 distinct values (from 0 to 255), ASCII only defines
+   Some explanation of the numbers used by `chr' is worthwhile.  The
+most prominent character set in use today is ASCII. Although an 8-bit
+byte can hold 256 distinct values (from 0 to 255), ASCII only defines
 characters that use the values from 0 to 127.(1) In the now distant
 past, at least one minicomputer manufacturer used ASCII, but with mark
 parity, meaning that the leftmost bit in the byte is always 1.  This
@@ -13046,15 +13183,15 @@ on some older systems, they are not really worth worrying about:
      #    }
      # }
 
-An obvious improvement to these functions is to move the code for the
+   An obvious improvement to these functions is to move the code for the
 `_ord_init' function into the body of the `BEGIN' rule.  It was written
 this way initially for ease of development.  There is a "test program"
 in a `BEGIN' rule, to test the function.  It is commented out for
 production use.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) ASCII has been extended in many countries to use the values from
+   (1) ASCII has been extended in many countries to use the values from
 128 to 255 for country-specific characters.  If your  system uses these
 extensions, you can simplify `_ord_init' to simply loop from 0 to 255.
 
@@ -13069,7 +13206,7 @@ the strings in an array into one long string.  The following function,
 `join', accomplishes this task.  It is used later in several of the
 application programs (*note Sample Programs::).
 
-Good function design is important; this function needs to be general
+   Good function design is important; this function needs to be general
 but it should also have a reasonable default behavior.  It is called
 with an array as well as the beginning and ending indices of the
 elements in the array to be merged.  This assumes that the array
@@ -13089,17 +13226,18 @@ created with `split' (*note String Functions::):
          return result
      }
 
-An optional additional argument is the separator to use when joining the
-strings back together.  If the caller supplies a nonempty value, `join'
-uses it; if it is not supplied, it has a null value.  In this case,
-`join' uses a single blank as a default separator for the strings.  If
-the value is equal to `SUBSEP', then `join' joins the strings with no
-separator between them.  `SUBSEP' serves as a "magic" value to indicate
-that there should be no separation between the component strings.(1)
+   An optional additional argument is the separator to use when joining
+the strings back together.  If the caller supplies a nonempty value,
+`join' uses it; if it is not supplied, it has a null value.  In this
+case, `join' uses a single blank as a default separator for the
+strings.  If the value is equal to `SUBSEP', then `join' joins the
+strings with no separator between them.  `SUBSEP' serves as a "magic"
+value to indicate that there should be no separation between the
+component strings.(1)
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) It would be nice if `awk' had an assignment operator for
+   (1) It would be nice if `awk' had an assignment operator for
 concatenation.  The lack of an explicit operator for concatenation
 makes string operations more difficult than they really need to be.
 
@@ -13109,14 +13247,14 @@ File: gawk.info,  Node: Gettimeofday Function,  Prev: Join Function,  Up: Genera
 12.2.8 Managing the Time of Day
 -------------------------------
 
-The `systime' and `strftime' functions described in *Note Time
+The `systime' and `strftime' functions described in *note Time
 Functions::, provide the minimum functionality necessary for dealing
 with the time of day in human readable form.  While `strftime' is
 extensive, the control formats are not necessarily easy to remember or
 intuitively obvious when reading a program.
 
-The following function, `gettimeofday', populates a user-supplied array
-with preformatted time information.  It returns a string with the
+   The following function, `gettimeofday', populates a user-supplied
+array with preformatted time information.  It returns a string with the
 current time formatted in the same way as the `date' utility:
 
      # gettimeofday.awk --- get the time of day in a usable format
@@ -13179,9 +13317,9 @@ current time formatted in the same way as the `date' utility:
          return ret
      }
 
-The string indices are easier to use and read than the various formats
-required by `strftime'.  The `alarm' program presented in *Note Alarm
-Program::, uses this function.  A more general design for the
+   The string indices are easier to use and read than the various
+formats required by `strftime'.  The `alarm' program presented in *note
+Alarm Program::, uses this function.  A more general design for the
 `gettimeofday' function would have allowed the user to supply an
 optional timestamp value to use instead of the current time.
 
@@ -13217,8 +13355,8 @@ informed that this was not the case, the user requested that we add new
 special patterns to `gawk', named `BEGIN_FILE' and `END_FILE', that
 would have the desired behavior.  He even supplied us the code to do so.
 
-Adding these special patterns to `gawk' wasn't necessary; the job can
-be done cleanly in `awk' itself, as illustrated by the following
+   Adding these special patterns to `gawk' wasn't necessary; the job
+can be done cleanly in `awk' itself, as illustrated by the following
 library program.  It arranges to call two user-supplied functions,
 `beginfile' and `endfile', at the beginning and end of each data file.
 Besides solving the problem in only nine(!) lines of code, it does so
@@ -13242,10 +13380,10 @@ _portably_; this works with any implementation of `awk':
 
      END   { endfile(FILENAME) }
 
-This file must be loaded before the user's "main" program, so that the
-rule it supplies is executed first.
+   This file must be loaded before the user's "main" program, so that
+the rule it supplies is executed first.
 
-This rule relies on `awk''s `FILENAME' variable that automatically
+   This rule relies on `awk''s `FILENAME' variable that automatically
 changes for each new data file.  The current file name is saved in a
 private variable, `_oldfilename'.  If `FILENAME' does not equal
 `_oldfilename', then a new data file is being processed and it is
@@ -13257,16 +13395,16 @@ then assigns the current file name to `_oldfilename' and calls
 `_oldfilename' is initialized to the null string, this rule executes
 correctly even for the first data file.
 
-The program also supplies an `END' rule to do the final processing for
-the last file.  Because this `END' rule comes before any `END' rules
+   The program also supplies an `END' rule to do the final processing
+for the last file.  Because this `END' rule comes before any `END' rules
 supplied in the "main" program, `endfile' is called first.  Once again
 the value of multiple `BEGIN' and `END' rules should be clear.
 
-This version has same problem as the first version of `nextfile' (*note
-Nextfile Function::).  If the same data file occurs twice in a row on
-the command line, then `endfile' and `beginfile' are not executed at
-the end of the first pass and at the beginning of the second pass.  The
-following version solves the problem:
+   This version has same problem as the first version of `nextfile'
+(*note Nextfile Function::).  If the same data file occurs twice in a
+row on the command line, then `endfile' and `beginfile' are not
+executed at the end of the first pass and at the beginning of the
+second pass.  The following version solves the problem:
 
      # ftrans.awk --- handle data file transitions
      #
@@ -13280,8 +13418,8 @@ following version solves the problem:
 
      END  { endfile(_filename_) }
 
-*Note Wc Program::, shows how this library function can be used and how
-it simplifies writing the main program.
+   *note Wc Program::, shows how this library function can be used and
+how it simplifies writing the main program.
 
 
 File: gawk.info,  Node: Rewind Function,  Next: File Checking,  Prev: Filetrans Function,  Up: Data File Management
@@ -13294,9 +13432,9 @@ that would make it possible to reread the current file.  The requesting
 user didn't want to have to use `getline' (*note Getline::) inside a
 loop.
 
-However, as long as you are not in the `END' rule, it is quite easy to
-arrange to immediately close the current input file and then start over
-with it from the top.  For lack of a better name, we'll call it
+   However, as long as you are not in the `END' rule, it is quite easy
+to arrange to immediately close the current input file and then start
+over with it from the top.  For lack of a better name, we'll call it
 `rewind':
 
      # rewind.awk --- rewind the current file and start over
@@ -13316,12 +13454,12 @@ with it from the top.  For lack of a better name, we'll call it
          nextfile
      }
 
-This code relies on the `ARGIND' variable (*note Auto-set::), which is
-specific to `gawk'.  If you are not using `gawk', you can use ideas
-presented in *Note Filetrans Function::, to either update `ARGIND' on
+   This code relies on the `ARGIND' variable (*note Auto-set::), which
+is specific to `gawk'.  If you are not using `gawk', you can use ideas
+presented in *note Filetrans Function::, to either update `ARGIND' on
 your own or modify this code as appropriate.
 
-The `rewind' function also relies on the `nextfile' keyword (*note
+   The `rewind' function also relies on the `nextfile' keyword (*note
 Nextfile Statement::).  *Note Nextfile Function::, for a function
 version of `nextfile'.
 
@@ -13349,9 +13487,9 @@ program to your `awk' program:
          }
      }
 
-In `gawk', the `getline' won't be fatal (unless `--posix' is in force).
-Removing the element from `ARGV' with `delete' skips the file (since
-it's no longer in the list).
+   In `gawk', the `getline' won't be fatal (unless `--posix' is in
+force).  Removing the element from `ARGV' with `delete' skips the file
+(since it's no longer in the list).
 
 
 File: gawk.info,  Node: Empty Files,  Next: Ignoring Assigns,  Prev: File Checking,  Up: Data File Management
@@ -13367,9 +13505,9 @@ file indication, closes the file, and proceeds on to the next
 command-line data file, _without_ executing any user-level `awk'
 program code.
 
-Using `gawk''s `ARGIND' variable (*note Built-in Variables::), it is
+   Using `gawk''s `ARGIND' variable (*note Built-in Variables::), it is
 possible to detect when an empty data file has been skipped.  Similar
-to the library file presented in *Note Filetrans Function::, the
+to the library file presented in *note Filetrans Function::, the
 following library file calls a function named `zerofile' that the user
 must provide.  The arguments passed are the file name and the position
 in `ARGV' where it was found:
@@ -13390,23 +13528,23 @@ in `ARGV' where it was found:
                  zerofile(ARGV[Argind], Argind)
      }
 
-The user-level variable `Argind' allows the `awk' program to track its
-progress through `ARGV'.  Whenever the program detects that `ARGIND' is
-greater than `Argind + 1', it means that one or more empty files were
-skipped.  The action then calls `zerofile' for each such file,
-incrementing `Argind' along the way.
+   The user-level variable `Argind' allows the `awk' program to track
+its progress through `ARGV'.  Whenever the program detects that
+`ARGIND' is greater than `Argind + 1', it means that one or more empty
+files were skipped.  The action then calls `zerofile' for each such
+file, incrementing `Argind' along the way.
 
-The `Argind != ARGIND' rule simply keeps `Argind' up to date in the
+   The `Argind != ARGIND' rule simply keeps `Argind' up to date in the
 normal case.
 
-Finally, the `END' rule catches the case of any empty files at the end
-of the command-line arguments.  Note that the test in the condition of
-the `for' loop uses the `<=' operator, not `<'.
+   Finally, the `END' rule catches the case of any empty files at the
+end of the command-line arguments.  Note that the test in the condition
+of the `for' loop uses the `<=' operator, not `<'.
 
-As an exercise, you might consider whether this same problem can be
+   As an exercise, you might consider whether this same problem can be
 solved without relying on `gawk''s `ARGIND' variable.
 
-As a second exercise, revise this code to handle the case where an
+   As a second exercise, revise this code to handle the case where an
 intervening value in `ARGV' is a variable assignment.
 
 
@@ -13420,9 +13558,9 @@ assignments (*note Assignment Options::).  In particular, if you have
 file names that contain an `=' character, `awk' treats the file name as
 an assignment, and does not process it.
 
-Some users have suggested an additional command-line option for `gawk'
-to disable command-line assignments.  However, some simple programming
-with a library file does the trick:
+   Some users have suggested an additional command-line option for
+`gawk' to disable command-line assignments.  However, some simple
+programming with a library file does the trick:
 
      # noassign.awk --- library file to avoid the need for a
      # special option that disables command-line assignments
@@ -13438,15 +13576,15 @@ with a library file does the trick:
              disable_assigns(ARGC, ARGV)
      }
 
-You then run your program this way:
+   You then run your program this way:
 
      awk -v No_command_assign=1 -f noassign.awk -f yourprog.awk *
 
-The function works by looping through the arguments.  It prepends `./'
-to any argument that matches the form of a variable assignment, turning
-that argument into a file name.
+   The function works by looping through the arguments.  It prepends
+`./' to any argument that matches the form of a variable assignment,
+turning that argument into a file name.
 
-The use of `No_command_assign' allows you to disable command-line
+   The use of `No_command_assign' allows you to disable command-line
 assignments at invocation time, by giving the variable a true value.
 When not set, it is initially zero (i.e., false), so the command-line
 arguments are left alone.
@@ -13466,22 +13604,22 @@ option requires a string to use as the field separator.  The first
 occurrence on the command line of either `--' or a string that does not
 begin with `-' ends the options.
 
-Modern Unix systems provide a C function named `getopt' for processing
-command-line arguments.  The programmer provides a string describing the
-one-letter options. If an option requires an argument, it is followed
-in the string with a colon.  `getopt' is also passed the count and
-values of the command-line arguments and is called in a loop.  `getopt'
-processes the command-line arguments for option letters.  Each time
-around the loop, it returns a single character representing the next
-option letter that it finds, or `?' if it finds an invalid option.
+   Modern Unix systems provide a C function named `getopt' for
+processing command-line arguments.  The programmer provides a string
+describing the one-letter options. If an option requires an argument,
+it is followed in the string with a colon.  `getopt' is also passed the
+count and values of the command-line arguments and is called in a loop.
+`getopt' processes the command-line arguments for option letters.  Each
+time around the loop, it returns a single character representing the
+next option letter that it finds, or `?' if it finds an invalid option.
 When it returns -1, there are no options left on the command line.
 
-When using `getopt', options that do not take arguments can be grouped
-together.  Furthermore, options that take arguments require that the
-argument is present.  The argument can immediately follow the option
-letter, or it can be a separate command-line argument.
+   When using `getopt', options that do not take arguments can be
+grouped together.  Furthermore, options that take arguments require
+that the argument is present.  The argument can immediately follow the
+option letter, or it can be a separate command-line argument.
 
-Given a hypothetical program that takes three command-line options,
+   Given a hypothetical program that takes three command-line options,
 `-a', `-b', and `-c', where `-b' requires an argument, all of the
 following are valid ways of invoking the program:
 
@@ -13489,13 +13627,14 @@ following are valid ways of invoking the program:
      prog -ac -bfoo -- data1 data2 data3
      prog -acbfoo data1 data2 data3
 
-Notice that when the argument is grouped with its option, the rest of
+   Notice that when the argument is grouped with its option, the rest of
 the argument is considered to be the option's argument.  In this
 example, `-acbfoo' indicates that all of the `-a', `-b', and `-c'
 options were supplied, and that `foo' is the argument to the `-b'
 option.
 
-`getopt' provides four external variables that the programmer can use:
+   `getopt' provides four external variables that the programmer can
+use:
 
 `optind'
      The index in the argument value array (`argv') where the first
@@ -13512,8 +13651,8 @@ option.
 `optopt'
      The letter representing the command-line option.
 
-The following C fragment shows how `getopt' might process command-line
-arguments for `awk':
+   The following C fragment shows how `getopt' might process
+command-line arguments for `awk':
 
      int
      main(int argc, char *argv[])
@@ -13544,17 +13683,17 @@ arguments for `awk':
          ...
      }
 
-As a side point, `gawk' actually uses the GNU `getopt_long' function to
-process both normal and GNU-style long options (*note Options::).
+   As a side point, `gawk' actually uses the GNU `getopt_long' function
+to process both normal and GNU-style long options (*note Options::).
 
-The abstraction provided by `getopt' is very useful and is quite handy
-in `awk' programs as well.  Following is an `awk' version of `getopt'.
-This function highlights one of the greatest weaknesses in `awk', which
-is that it is very poor at manipulating single characters.  Repeated
-calls to `substr' are necessary for accessing individual characters
-(*note String Functions::).(1)
+   The abstraction provided by `getopt' is very useful and is quite
+handy in `awk' programs as well.  Following is an `awk' version of
+`getopt'.  This function highlights one of the greatest weaknesses in
+`awk', which is that it is very poor at manipulating single characters.
+Repeated calls to `substr' are necessary for accessing individual
+characters (*note String Functions::).(1)
 
-The discussion that follows walks through the code a bit at a time:
+   The discussion that follows walks through the code a bit at a time:
 
      # getopt.awk --- do C library getopt(3) function in awk
      # External variables:
@@ -13571,12 +13710,12 @@ The discussion that follows walks through the code a bit at a time:
      # Private Data:
      #    _opti  -- index in multi-flag option, e.g., -abc
 
-The function starts out with a list of the global variables it uses,
+   The function starts out with a list of the global variables it uses,
 what the return values are, what they mean, and any global variables
 that are "private" to this library function.  Such documentation is
 essential for any program, and particularly for library functions.
 
-The `getopt' function first checks that it was indeed called with a
+   The `getopt' function first checks that it was indeed called with a
 string of options (the `options' parameter).  If `options' has a zero
 length, `getopt' immediately returns -1:
 
@@ -13594,13 +13733,13 @@ length, `getopt' immediately returns -1:
              return -1
          }
 
-The next thing to check for is the end of the options.  A `--' ends the
-command-line options, as does any command-line argument that does not
-begin with a `-'.  `Optind' is used to step through the array of
+   The next thing to check for is the end of the options.  A `--' ends
+the command-line options, as does any command-line argument that does
+not begin with a `-'.  `Optind' is used to step through the array of
 command-line arguments; it retains its value across calls to `getopt',
 because it is a global variable.
 
-The regular expression that is used, `/^-[^: \t\n\f\r\v\b]/', is
+   The regular expression that is used, `/^-[^: \t\n\f\r\v\b]/', is
 perhaps a bit of overkill; it checks for a `-' followed by anything
 that is not whitespace and not a colon.  If the current command-line
 argument does not match this pattern, it is not an option, and it ends
@@ -13623,31 +13762,31 @@ option processing:
              return "?"
          }
 
-The `_opti' variable tracks the position in the current command-line
+   The `_opti' variable tracks the position in the current command-line
 argument (`argv[Optind]').  If multiple options are grouped together
 with one `-' (e.g., `-abx'), it is necessary to return them to the user
 one at a time.
 
-If `_opti' is equal to zero, it is set to two, which is the index in
+   If `_opti' is equal to zero, it is set to two, which is the index in
 the string of the next character to look at (we skip the `-', which is
 at position one).  The variable `thisopt' holds the character, obtained
 with `substr'.  It is saved in `Optopt' for the main program to use.
 
-If `thisopt' is not in the `options' string, then it is an invalid
+   If `thisopt' is not in the `options' string, then it is an invalid
 option.  If `Opterr' is nonzero, `getopt' prints an error message on
 the standard error that is similar to the message from the C version of
 `getopt'.
 
-Because the option is invalid, it is necessary to skip it and move on
-to the next option character.  If `_opti' is greater than or equal to
-the length of the current command-line argument, it is necessary to
+   Because the option is invalid, it is necessary to skip it and move
+on to the next option character.  If `_opti' is greater than or equal
+to the length of the current command-line argument, it is necessary to
 move on to the next argument, so `Optind' is incremented and `_opti' is
 reset to zero. Otherwise, `Optind' is left alone and `_opti' is merely
 incremented.
 
-In any case, because the option is invalid, `getopt' returns `?'.  The
-main program can examine `Optopt' if it needs to know what the invalid
-option letter actually is. Continuing on:
+   In any case, because the option is invalid, `getopt' returns `?'.
+The main program can examine `Optopt' if it needs to know what the
+invalid option letter actually is. Continuing on:
 
          if (substr(options, i + 1, 1) == ":") {
              # get option argument
@@ -13659,10 +13798,10 @@ option letter actually is. Continuing on:
          } else
              Optarg = ""
 
-If the option requires an argument, the option letter is followed by a
-colon in the `options' string.  If there are remaining characters in the
-current command-line argument (`argv[Optind]'), then the rest of that
-string is assigned to `Optarg'.  Otherwise, the next command-line
+   If the option requires an argument, the option letter is followed by
+a colon in the `options' string.  If there are remaining characters in
+the current command-line argument (`argv[Optind]'), then the rest of
+that string is assigned to `Optarg'.  Otherwise, the next command-line
 argument is used (`-xFOO' versus `-x FOO'). In either case, `_opti' is
 reset to zero, because there are no more characters left to examine in
 the current command-line argument. Continuing:
@@ -13675,14 +13814,14 @@ the current command-line argument. Continuing:
          return thisopt
      }
 
-Finally, if `_opti' is either zero or greater than the length of the
+   Finally, if `_opti' is either zero or greater than the length of the
 current command-line argument, it means this element in `argv' is
 through being processed, so `Optind' is incremented to point to the
 next element in `argv'.  If neither condition is true, then only
 `_opti' is incremented, so that the next option letter can be processed
 on the next call to `getopt'.
 
-The `BEGIN' rule initializes both `Opterr' and `Optind' to one.
+   The `BEGIN' rule initializes both `Opterr' and `Optind' to one.
 `Opterr' is set to one, since the default behavior is for `getopt' to
 print a diagnostic message upon seeing an invalid option.  `Optind' is
 set to one, since there's no reason to look at the program name, which
@@ -13704,7 +13843,7 @@ is in `ARGV[0]':
          }
      }
 
-The rest of the `BEGIN' rule is a simple test program.  Here is the
+   The rest of the `BEGIN' rule is a simple test program.  Here is the
 result of two sample runs of the test program:
 
      $ awk -f getopt.awk -v _getopt_test=1 -- -a -cbARG bax -x
@@ -13723,14 +13862,20 @@ result of two sample runs of the test program:
      -|         ARGV[4] = <xyz>
      -|         ARGV[5] = <abc>
 
-In both runs, the first `--' terminates the arguments to `awk', so that
-it does not try to interpret the `-a', etc., as its own options.
-Several of the sample programs presented in *Note Sample Programs::,
+   In both runs, the first `--' terminates the arguments to `awk', so
+that it does not try to interpret the `-a', etc., as its own options.
+
+     NOTE: After `getopt' is through, it is the responsibility of the
+     user level code to clear out all the elements of `ARGV' from 1 to
+     `Optind', so that `awk' does not try to process the command-line
+     options as file names.
+
+   Several of the sample programs presented in *note Sample Programs::,
 use `getopt' to process their arguments.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) This function was written before `gawk' acquired the ability to
+   (1) This function was written before `gawk' acquired the ability to
 split strings into single characters using `""' as the separator.  We
 have left it alone, since using `substr' is more portable.
 
@@ -13750,16 +13895,16 @@ presents a suite of functions for retrieving information from the user
 database.  *Note Group Functions::, for a similar suite that retrieves
 information from the group database.
 
-The POSIX standard does not define the file where user information is
+   The POSIX standard does not define the file where user information is
 kept.  Instead, it provides the `<pwd.h>' header file and several C
 language subroutines for obtaining user information.  The primary
 function is `getpwent', for "get password entry."  The "password" comes
 from the original user database file, `/etc/passwd', which stores user
 information, along with the encrypted passwords (hence the name).
 
-While an `awk' program could simply read `/etc/passwd' directly, this
-file may not contain complete information about the system's set of
-users.(1) To be sure you are able to produce a readable and complete
+   While an `awk' program could simply read `/etc/passwd' directly,
+this file may not contain complete information about the system's set
+of users.(1) To be sure you are able to produce a readable and complete
 version of the user database, it is necessary to write a small C
 program that calls `getpwent'.  `getpwent' is defined as returning a
 pointer to a `struct passwd'.  Each time it is called, it returns the
@@ -13792,7 +13937,7 @@ that "cats" the password database:
          return 0;
      }
 
-If you don't understand C, don't worry about it.  The output from
+   If you don't understand C, don't worry about it.  The output from
 `pwcat' is the user database, in the traditional `/etc/passwd' format
 of colon-separated fields.  The fields are:
 
@@ -13808,7 +13953,7 @@ Home directory       The user's login (or "home") directory
 Login shell          The program that is run when the user logs in.
                      This is usually a shell, such as `bash'.
 
-A few lines representative of `pwcat''s output are as follows:
+   A few lines representative of `pwcat''s output are as follows:
 
      $ pwcat
      -| root:3Ov02d5VaUPB6:0:1:Operator:/:/bin/sh
@@ -13821,9 +13966,9 @@ A few lines representative of `pwcat''s output are as follows:
      -| andy:abcca2:113:10:Andy Jacobs:/home/andy:/bin/sh
      ...
 
-With that introduction, following is a group of functions for getting
-user information.  There are several functions here, corresponding to
-the C functions of the same names:
+   With that introduction, following is a group of functions for
+getting user information.  There are several functions here,
+corresponding to the C functions of the same names:
 
      # passwd.awk --- access password file information
      BEGIN {
@@ -13859,40 +14004,40 @@ the C functions of the same names:
          $0 = olddol0
      }
 
-The `BEGIN' rule sets a private variable to the directory where `pwcat'
-is stored.  Because it is used to help out an `awk' library routine, we
-have chosen to put it in `/usr/local/libexec/awk'; however, you might
-want it to be in a different directory on your system.
+   The `BEGIN' rule sets a private variable to the directory where
+`pwcat' is stored.  Because it is used to help out an `awk' library
+routine, we have chosen to put it in `/usr/local/libexec/awk'; however,
+you might want it to be in a different directory on your system.
 
-The function `_pw_init' keeps three copies of the user information in
-three associative arrays.  The arrays are indexed by username
+   The function `_pw_init' keeps three copies of the user information
+in three associative arrays.  The arrays are indexed by username
 (`_pw_byname'), by user ID number (`_pw_byuid'), and by order of
 occurrence (`_pw_bycount').  The variable `_pw_inited' is used for
 efficiency; `_pw_init' needs only to be called once.
 
-Because this function uses `getline' to read information from `pwcat',
-it first saves the values of `FS', `RS', and `$0'.  It notes in the
-variable `using_fw' whether field splitting with `FIELDWIDTHS' is in
-effect or not.  Doing so is necessary, since these functions could be
-called from anywhere within a user's program, and the user may have his
-or her own way of splitting records and fields.
+   Because this function uses `getline' to read information from
+`pwcat', it first saves the values of `FS', `RS', and `$0'.  It notes
+in the variable `using_fw' whether field splitting with `FIELDWIDTHS'
+is in effect or not.  Doing so is necessary, since these functions
+could be called from anywhere within a user's program, and the user may
+have his or her own way of splitting records and fields.
 
-The `using_fw' variable checks `PROCINFO["FS"]', which is
+   The `using_fw' variable checks `PROCINFO["FS"]', which is
 `"FIELDWIDTHS"' if field splitting is being done with `FIELDWIDTHS'.
 This makes it possible to restore the correct field-splitting mechanism
 later.  The test can only be true for `gawk'.  It is false if using
 `FS' or on some other `awk' implementation.
 
-The main part of the function uses a loop to read database lines, split
-the line into fields, and then store the line into each array as
+   The main part of the function uses a loop to read database lines,
+split the line into fields, and then store the line into each array as
 necessary.  When the loop is done, `_pw_init' cleans up by closing the
 pipeline, setting `_pw_inited' to one, and restoring `FS' (and
 `FIELDWIDTHS' if necessary), `RS', and `$0'.  The use of `_pw_count' is
 explained shortly.
 
-The `getpwnam' function takes a username as a string argument. If that
-user is in the database, it returns the appropriate line. Otherwise, it
-returns the null string:
+   The `getpwnam' function takes a username as a string argument. If
+that user is in the database, it returns the appropriate line.
+Otherwise, it returns the null string:
 
      function getpwnam(name)
      {
@@ -13902,9 +14047,9 @@ returns the null string:
          return ""
      }
 
-Similarly, the `getpwuid' function takes a user ID number argument. If
-that user number is in the database, it returns the appropriate line.
-Otherwise, it returns the null string:
+   Similarly, the `getpwuid' function takes a user ID number argument.
+If that user number is in the database, it returns the appropriate
+line. Otherwise, it returns the null string:
 
      function getpwuid(uid)
      {
@@ -13914,8 +14059,8 @@ Otherwise, it returns the null string:
          return ""
      }
 
-The `getpwent' function simply steps through the database, one entry at
-a time.  It uses `_pw_count' to track its current position in the
+   The `getpwent' function simply steps through the database, one entry
+at a time.  It uses `_pw_count' to track its current position in the
 `_pw_bycount' array:
 
      function getpwent()
@@ -13926,25 +14071,26 @@ a time.  It uses `_pw_count' to track its current position in the
          return ""
      }
 
-The `endpwent' function resets `_pw_count' to zero, so that subsequent
-calls to `getpwent' start over again:
+   The `endpwent' function resets `_pw_count' to zero, so that
+subsequent calls to `getpwent' start over again:
 
      function endpwent()
      {
          _pw_count = 0
      }
 
-A conscious design decision in this suite was made that each subroutine
-calls `_pw_init' to initialize the database arrays.  The overhead of
-running a separate process to generate the user database, and the I/O
-to scan it, are only incurred if the user's main program actually calls
-one of these functions.  If this library file is loaded along with a
-user's program, but none of the routines are ever called, then there is
-no extra runtime overhead.  (The alternative is move the body of
-`_pw_init' into a `BEGIN' rule, which always runs `pwcat'.  This
-simplifies the code but runs an extra process that may never be needed.)
-
-In turn, calling `_pw_init' is not too expensive, because the
+   A conscious design decision in this suite was made that each
+subroutine calls `_pw_init' to initialize the database arrays.  The
+overhead of running a separate process to generate the user database,
+and the I/O to scan it, are only incurred if the user's main program
+actually calls one of these functions.  If this library file is loaded
+along with a user's program, but none of the routines are ever called,
+then there is no extra runtime overhead.  (The alternative is move the
+body of `_pw_init' into a `BEGIN' rule, which always runs `pwcat'.
+This simplifies the code but runs an extra process that may never be
+needed.)
+
+   In turn, calling `_pw_init' is not too expensive, because the
 `_pw_inited' variable keeps the program from reading the data more than
 once.  If you are worried about squeezing every last cycle out of your
 `awk' program, the check of `_pw_inited' could be moved out of
@@ -13952,11 +14098,11 @@ once.  If you are worried about squeezing every last cycle out of your
 this is not necessary, since most `awk' programs are I/O-bound, and it
 clutters up the code.
 
-The `id' program in *Note Id Program::, uses these functions.
+   The `id' program in *note Id Program::, uses these functions.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) It is often the case that password information is stored in a
+   (1) It is often the case that password information is stored in a
 network database.
 
 
@@ -13965,7 +14111,7 @@ File: gawk.info,  Node: Group Functions,  Prev: Passwd Functions,  Up: Library F
 12.6 Reading the Group Database
 ===============================
 
-Much of the discussion presented in *Note Passwd Functions::, applies
+Much of the discussion presented in *note Passwd Functions::, applies
 to the group database as well.  Although there has traditionally been a
 well-known file (`/etc/group') in a well-known format, the POSIX
 standard only provides a set of C library routines (`<grp.h>' and
@@ -13974,7 +14120,7 @@ exist, it likely does not have complete information.  Therefore, as
 with the user database, it is necessary to have a small C program that
 generates the group database as its output.
 
-`grcat', a C program that "cats" the group database, is as follows:
+   `grcat', a C program that "cats" the group database, is as follows:
 
      /*
       * grcat.c
@@ -14006,7 +14152,7 @@ generates the group database as its output.
          return 0;
      }
 
-Each line in the group database represents one group.  The fields are
+   Each line in the group database represents one group.  The fields are
 separated with colons and represent the following information:
 
 Group name           The group's name.
@@ -14015,7 +14161,7 @@ Group password       The group's encrypted password. In practice,
                      or set to `*'.
 Group-ID              The group's numeric group ID number; this
                      number should be unique within the file.
-Group member list     A comma-separated list of usernames.  These
+Group member list     A comma-separated list of user names.  These
                      users are members of the group.  Modern Unix
                      systems allow users to be members of several
                      groups simultaneously.  If your system does,
@@ -14024,7 +14170,7 @@ Group member list     A comma-separated list of usernames.  These
                      numbers.  (Note that `PROCINFO' is a `gawk'
                      extension; *note Built-in Variables::.)
 
-Here is what running `grcat' might produce:
+   Here is what running `grcat' might produce:
 
      $ grcat
      -| wheel:*:0:arnold
@@ -14035,7 +14181,7 @@ Here is what running `grcat' might produce:
      -| other:*:20:
      ...
 
-Here are the functions for obtaining information from the group
+   Here are the functions for obtaining information from the group
 database.  There are several, modeled after the C library functions of
 the same names:
 
@@ -14090,46 +14236,46 @@ the same names:
          $0 = olddol0
      }
 
-The `BEGIN' rule sets a private variable to the directory where `grcat'
-is stored.  Because it is used to help out an `awk' library routine, we
-have chosen to put it in `/usr/local/libexec/awk'.  You might want it
-to be in a different directory on your system.
+   The `BEGIN' rule sets a private variable to the directory where
+`grcat' is stored.  Because it is used to help out an `awk' library
+routine, we have chosen to put it in `/usr/local/libexec/awk'.  You
+might want it to be in a different directory on your system.
 
-These routines follow the same general outline as the user database
+   These routines follow the same general outline as the user database
 routines (*note Passwd Functions::).  The `_gr_inited' variable is used
 to ensure that the database is scanned no more than once.  The
 `_gr_init' function first saves `FS', `FIELDWIDTHS', `RS', and `$0',
 and then sets `FS' and `RS' to the correct values for scanning the
 group information.
 
-The group information is stored is several associative arrays.  The
+   The group information is stored is several associative arrays.  The
 arrays are indexed by group name (`_gr_byname'), by group ID number
 (`_gr_bygid'), and by position in the database (`_gr_bycount').  There
-is an additional array indexed by username (`_gr_groupsbyuser'), which
+is an additional array indexed by user name (`_gr_groupsbyuser'), which
 is a space-separated list of groups to which each user belongs.
 
-Unlike the user database, it is possible to have multiple records in the
-database for the same group.  This is common when a group has a large
-number of members.  A pair of such entries might look like the
+   Unlike the user database, it is possible to have multiple records in
+the database for the same group.  This is common when a group has a
+large number of members.  A pair of such entries might look like the
 following:
 
      tvpeople:*:101:johnny,jay,arsenio
      tvpeople:*:101:david,conan,tom,joan
 
-For this reason, `_gr_init' looks to see if a group name or group ID
-number is already seen.  If it is, then the usernames are simply
+   For this reason, `_gr_init' looks to see if a group name or group ID
+number is already seen.  If it is, then the user names are simply
 concatenated onto the previous list of users.  (There is actually a
 subtle problem with the code just presented.  Suppose that the first
 time there were no names. This code adds the names with a leading
 comma. It also doesn't check that there is a `$4'.)
 
-Finally, `_gr_init' closes the pipeline to `grcat', restores `FS' (and
-`FIELDWIDTHS' if necessary), `RS', and `$0', initializes `_gr_count' to
-zero (it is used later), and makes `_gr_inited' nonzero.
+   Finally, `_gr_init' closes the pipeline to `grcat', restores `FS'
+(and `FIELDWIDTHS' if necessary), `RS', and `$0', initializes
+`_gr_count' to zero (it is used later), and makes `_gr_inited' nonzero.
 
-The `getgrnam' function takes a group name as its argument, and if that
-group exists, it is returned. Otherwise, `getgrnam' returns the null
-string:
+   The `getgrnam' function takes a group name as its argument, and if
+that group exists, it is returned. Otherwise, `getgrnam' returns the
+null string:
 
      function getgrnam(group)
      {
@@ -14139,7 +14285,7 @@ string:
          return ""
      }
 
-The `getgrgid' function is similar, it takes a numeric group ID and
+   The `getgrgid' function is similar, it takes a numeric group ID and
 looks up the information associated with that group ID:
 
      function getgrgid(gid)
@@ -14150,8 +14296,8 @@ looks up the information associated with that group ID:
          return ""
      }
 
-The `getgruser' function does not have a C counterpart. It takes a
-username and returns the list of groups that have the user as a member:
+   The `getgruser' function does not have a C counterpart. It takes a
+user name and returns the list of groups that have the user as a member:
 
      function getgruser(user)
      {
@@ -14161,8 +14307,8 @@ username and returns the list of groups that have the user as a member:
          return ""
      }
 
-The `getgrent' function steps through the database one entry at a time.
-It uses `_gr_count' to track its position in the list:
+   The `getgrent' function steps through the database one entry at a
+time.  It uses `_gr_count' to track its position in the list:
 
      function getgrent()
      {
@@ -14172,24 +14318,24 @@ It uses `_gr_count' to track its position in the list:
          return ""
      }
 
-The `endgrent' function resets `_gr_count' to zero so that `getgrent'
-can start over again:
+   The `endgrent' function resets `_gr_count' to zero so that
+`getgrent' can start over again:
 
      function endgrent()
      {
          _gr_count = 0
      }
 
-As with the user database routines, each function calls `_gr_init' to
+   As with the user database routines, each function calls `_gr_init' to
 initialize the arrays.  Doing so only incurs the extra overhead of
 running `grcat' if these functions are used (as opposed to moving the
 body of `_gr_init' into a `BEGIN' rule).
 
-Most of the work is in scanning the database and building the various
+   Most of the work is in scanning the database and building the various
 associative arrays.  The functions that the user calls are themselves
 very simple, relying on `awk''s associative arrays to do work.
 
-The `id' program in *Note Id Program::, uses these functions.
+   The `id' program in *note Id Program::, uses these functions.
 
 
 File: gawk.info,  Node: Sample Programs,  Next: Language History,  Prev: Library Functions,  Up: Top
@@ -14197,12 +14343,12 @@ File: gawk.info,  Node: Sample Programs,  Next: Language History,  Prev: Library
 13 Practical `awk' Programs
 ***************************
 
-*Note Library Functions::, presents the idea that reading programs in a
+*note Library Functions::, presents the idea that reading programs in a
 language contributes to learning that language.  This major node
 continues that theme, presenting a potpourri of `awk' programs for your
 reading enjoyment.
 
-Many of these programs use the library functions presented in *Note
+   Many of these programs use the library functions presented in *note
 Library Functions::.
 
 * Menu:
@@ -14225,12 +14371,12 @@ Here, PROGRAM is the name of the `awk' program (such as `cut.awk'),
 OPTIONS are any command-line options for the program that start with a
 `-', and FILES are the actual data files.
 
-If your system supports the `#!' executable interpreter mechanism
+   If your system supports the `#!' executable interpreter mechanism
 (*note Executable Scripts::), you can instead run your program directly:
 
      cut.awk -c1-8 myfiles > results
 
-If your `awk' is not `gawk', you may instead need to use this:
+   If your `awk' is not `gawk', you may instead need to use this:
 
      cut.awk -- -c1-8 myfiles > results
 
@@ -14246,11 +14392,12 @@ enjoyable, because the algorithms can be very clearly expressed, and
 the code is usually very concise and simple.  This is true because
 `awk' does so much for you.
 
-It should be noted that these programs are not necessarily intended to
-replace the installed versions on your system.  Instead, their purpose
-is to illustrate `awk' language programming for "real world" tasks.
+   It should be noted that these programs are not necessarily intended
+to replace the installed versions on your system.  Instead, their
+purpose is to illustrate `awk' language programming for "real world"
+tasks.
 
-The programs are presented in alphabetical order.
+   The programs are presented in alphabetical order.
 
 * Menu:
 
@@ -14274,13 +14421,13 @@ separated by tabs by default, but you may supply a command-line option
 to change the field "delimiter" (i.e., the field-separator character).
 `cut''s definition of fields is less general than `awk''s.
 
-A common use of `cut' might be to pull out just the login name of
+   A common use of `cut' might be to pull out just the login name of
 logged-on users from the output of `who'.  For example, the following
 pipeline generates a sorted, unique list of the logged-on users:
 
      who | cut -c1-8 | sort | uniq
 
-The options for `cut' are:
+   The options for `cut' are:
 
 `-c LIST'
      Use LIST as the list of characters to cut out.  Items within the
@@ -14298,11 +14445,11 @@ The options for `cut' are:
 `-s'
      Suppress printing of lines that do not contain the field delimiter.
 
-The `awk' implementation of `cut' uses the `getopt' library function
+   The `awk' implementation of `cut' uses the `getopt' library function
 (*note Getopt Function::) and the `join' library function (*note Join
 Function::).
 
-The program begins with a comment describing the options, the library
+   The program begins with a comment describing the options, the library
 functions needed, and a `usage' function that prints out a usage
 message and exits.  `usage' is called if invalid arguments are supplied:
 
@@ -14328,7 +14475,7 @@ message and exits.  `usage' is called if invalid arguments are supplied:
 The variables `e1' and `e2' are used so that the function fits nicely
 on the screen.
 
-Next comes a `BEGIN' rule that parses the command-line options.  It
+   Next comes a `BEGIN' rule that parses the command-line options.  It
 sets `FS' to a single TAB character, because that is `cut''s default
 field separator.  The output field separator is also set to be the same
 as the input field separator.  Then `getopt' is used to step through
@@ -14368,19 +14515,19 @@ the output field separator is set to the null string:
          for (i = 1; i < Optind; i++)
              ARGV[i] = ""
 
-Special care is taken when the field delimiter is a space.  Using a
+   Special care is taken when the field delimiter is a space.  Using a
 single space (`" "') for the value of `FS' is incorrect--`awk' would
 separate fields with runs of spaces, tabs, and/or newlines, and we want
-them to be separated with individual spaces.  Also, note that after
-`getopt' is through, we have to clear out all the elements of `ARGV'
-from 1 to `Optind', so that `awk' does not try to process the
-command-line options as file names.
+them to be separated with individual spaces.  Also remember that after
+`getopt' is through (as described in *note Getopt Function::), we have
+to clear out all the elements of `ARGV' from 1 to `Optind', so that
+`awk' does not try to process the command-line options as file names.
 
-After dealing with the command-line options, the program verifies that
-the options make sense.  Only one or the other of `-c' and `-f' should
-be used, and both require a field list.  Then the program calls either
-`set_fieldlist' or `set_charlist' to pull apart the list of fields or
-characters:
+   After dealing with the command-line options, the program verifies
+that the options make sense.  Only one or the other of `-c' and `-f'
+should be used, and both require a field list.  Then the program calls
+either `set_fieldlist' or `set_charlist' to pull apart the list of
+fields or characters:
 
          if (by_fields && by_chars)
              usage()
@@ -14399,7 +14546,7 @@ characters:
              set_charlist()
      }
 
-`set_fieldlist'  is used to split the field list apart at the commas
+   `set_fieldlist'  is used to split the field list apart at the commas
 and into an array.  Then, for each element of the array, it looks to
 see if it is actually a range, and if so, splits it apart. The range is
 verified to make sure the first number is smaller than the second.
@@ -14427,12 +14574,12 @@ The program lets `awk' handle the job of doing the field splitting:
          nfields = j - 1
      }
 
-The `set_charlist' function is more complicated than `set_fieldlist'.
+   The `set_charlist' function is more complicated than `set_fieldlist'.
 The idea here is to use `gawk''s `FIELDWIDTHS' variable (*note Constant
 Size::), which describes constant-width input.  When using a character
 list, that is exactly what we have.
 
-Setting up `FIELDWIDTHS' is more complicated than simply listing the
+   Setting up `FIELDWIDTHS' is more complicated than simply listing the
 fields that need to be printed.  We have to keep track of the fields to
 print and also the intervening characters that have to be skipped.  For
 example, suppose you wanted characters 1 through 8, 15, and 22 through
@@ -14483,13 +14630,13 @@ filler fields:
          nfields = j - 1
      }
 
-Next is the rule that actually processes the data.  If the `-s' option
-is given, then `suppress' is true.  The first `if' statement makes sure
-that the input record does have the field separator.  If `cut' is
-processing fields, `suppress' is true, and the field separator
+   Next is the rule that actually processes the data.  If the `-s'
+option is given, then `suppress' is true.  The first `if' statement
+makes sure that the input record does have the field separator.  If
+`cut' is processing fields, `suppress' is true, and the field separator
 character is not in the record, then the record is skipped.
 
-If the record is valid, then `gawk' has split the data into fields,
+   If the record is valid, then `gawk' has split the data into fields,
 either using the character in `FS' or using fixed-length fields and
 `FIELDWIDTHS'.  The loop goes through the list of fields that should be
 printed.  The corresponding field is printed if it contains data.  If
@@ -14510,8 +14657,8 @@ out between the fields:
          print ""
      }
 
-This version of `cut' relies on `gawk''s `FIELDWIDTHS' variable to do
-the character-based cutting.  While it is possible in other `awk'
+   This version of `cut' relies on `gawk''s `FIELDWIDTHS' variable to
+do the character-based cutting.  While it is possible in other `awk'
 implementations to use `substr' (*note String Functions::), it is also
 extremely painful.  The `FIELDWIDTHS' variable supplies an elegant
 solution to the problem of picking the input line apart by characters.
@@ -14528,14 +14675,14 @@ expressions that are almost identical to those available in `awk'
 
      egrep [ OPTIONS ] 'PATTERN' FILES ...
 
-The PATTERN is a regular expression.  In typical usage, the regular
+   The PATTERN is a regular expression.  In typical usage, the regular
 expression is quoted to prevent the shell from expanding any of the
 special characters as file name wildcards.  Normally, `egrep' prints
 the lines that matched.  If multiple file names are provided on the
 command line, each output line is preceded by the name of the file and
 a colon.
 
-The options to `egrep' are as follows:
+   The options to `egrep' are as follows:
 
 `-c'
      Print out a count of the lines that matched the pattern, instead
@@ -14561,11 +14708,11 @@ The options to `egrep' are as follows:
      Use PATTERN as the regexp to match.  The purpose of the `-e'
      option is to allow patterns that start with a `-'.
 
-This version uses the `getopt' library function (*note Getopt
+   This version uses the `getopt' library function (*note Getopt
 Function::) and the file transition library program (*note Filetrans
 Function::).
 
-The program begins with a descriptive comment and then a `BEGIN' rule
+   The program begins with a descriptive comment and then a `BEGIN' rule
 that processes the command-line arguments with `getopt'.  The `-i'
 (ignore case) option is particularly easy with `gawk'; we just use the
 `IGNORECASE' built-in variable (*note Built-in Variables::):
@@ -14599,7 +14746,7 @@ that processes the command-line arguments with `getopt'.  The `-i'
                  usage()
          }
 
-Next comes the code that handles the `egrep'-specific behavior. If no
+   Next comes the code that handles the `egrep'-specific behavior. If no
 pattern is supplied with `-e', the first nonoption on the command line
 is used.  The `awk' command-line arguments up to `ARGV[Optind]' are
 cleared, so that `awk' won't try to process them as files.  If no files
@@ -14622,11 +14769,11 @@ the matched lines in the output:
      #        pattern = tolower(pattern)
      }
 
-The last two lines are commented out, since they are not needed in
+   The last two lines are commented out, since they are not needed in
 `gawk'.  They should be uncommented if you have to use another version
 of `awk'.
 
-The next set of lines should be uncommented if you are not using
+   The next set of lines should be uncommented if you are not using
 `gawk'.  This rule translates all the characters in the input line into
 lowercase if the `-i' option is specified.(1) The rule is commented out
 since it is not necessary with `gawk':
@@ -14636,7 +14783,7 @@ since it is not necessary with `gawk':
      #        $0 = tolower($0)
      #}
 
-The `beginfile' function is called by the rule in `ftrans.awk' when
+   The `beginfile' function is called by the rule in `ftrans.awk' when
 each new file is processed.  In this case, it is very simple; all it
 does is initialize a variable `fcount' to zero. `fcount' tracks how
 many lines in the current file matched the pattern (naming the
@@ -14648,7 +14795,7 @@ parameter, but that we're not interested in its value):
          fcount = 0
      }
 
-The `endfile' function is called after each file has been processed.
+   The `endfile' function is called after each file has been processed.
 It affects the output only when the user wants a count of the number of
 lines that matched.  `no_print' is true only if the exit status is
 desired.  `count_only' is true if line counts are desired.  `egrep'
@@ -14668,16 +14815,16 @@ total number of lines that matched the pattern:
          total += fcount
      }
 
-The following rule does most of the work of matching lines. The variable
-`matches' is true if the line matched the pattern. If the user wants
-lines that did not match, the sense of `matches' is inverted using the
-`!' operator. `fcount' is incremented with the value of `matches',
-which is either one or zero, depending upon a successful or
+   The following rule does most of the work of matching lines. The
+variable `matches' is true if the line matched the pattern. If the user
+wants lines that did not match, the sense of `matches' is inverted
+using the `!' operator. `fcount' is incremented with the value of
+`matches', which is either one or zero, depending upon a successful or
 unsuccessful match.  If the line does not match, the `next' statement
 just moves on to the next record.
 
-A number of additional tests are made, but they are only done if we are
-not counting lines.  First, if the user only wants exit status
+   A number of additional tests are made, but they are only done if we
+are not counting lines.  First, if the user only wants exit status
 (`no_print' is true), then it is enough to know that _one_ line in this
 file matched, and we can skip on to the next file with `nextfile'.
 Similarly, if we are only printing file names, we can print the file
@@ -14710,7 +14857,7 @@ line is printed, with a leading file name and colon if necessary:
          }
      }
 
-The `END' rule takes care of producing the correct exit status. If
+   The `END' rule takes care of producing the correct exit status. If
 there are no matches, the exit status is one; otherwise it is zero:
 
      END    \
@@ -14720,8 +14867,8 @@ there are no matches, the exit status is one; otherwise it is zero:
          exit 0
      }
 
-The `usage' function prints a usage message in case of invalid options,
-and then exits:
+   The `usage' function prints a usage message in case of invalid
+options, and then exits:
 
      function usage(    e)
      {
@@ -14731,20 +14878,20 @@ and then exits:
          exit 1
      }
 
-The variable `e' is used so that the function fits nicely on the
+   The variable `e' is used so that the function fits nicely on the
 printed page.
 
-Just a note on programming style: you may have noticed that the `END'
+   Just a note on programming style: you may have noticed that the `END'
 rule uses backslash continuation, with the open brace on a line by
 itself.  This is so that it more closely resembles the way functions
 are written.  Many of the examples in this major node use this style.
 You can decide for yourself if you like writing your `BEGIN' and `END'
 rules this way or not.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) It also introduces a subtle bug; if a match happens, we output the
-translated line, not the original.
+   (1) It also introduces a subtle bug; if a match happens, we output
+the translated line, not the original.
 
 
 File: gawk.info,  Node: Id Program,  Next: Split Program,  Prev: Egrep Program,  Up: Clones
@@ -14761,15 +14908,15 @@ corresponding user and group names.  The output might look like this:
      $ id
      -| uid=2076(arnold) gid=10(staff) groups=10(staff),4(tty)
 
-This information is part of what is provided by `gawk''s `PROCINFO'
+   This information is part of what is provided by `gawk''s `PROCINFO'
 array (*note Built-in Variables::).  However, the `id' utility provides
 a more palatable output than just individual numbers.
 
-Here is a simple version of `id' written in `awk'.  It uses the user
+   Here is a simple version of `id' written in `awk'.  It uses the user
 database library functions (*note Passwd Functions::) and the group
 database library functions (*note Group Functions::):
 
-The program is fairly straightforward.  All the work is done in the
+   The program is fairly straightforward.  All the work is done in the
 `BEGIN' rule.  The user and group ID numbers are obtained from
 `PROCINFO'.  The code is repetitive.  The entry in the user database
 for the real user ID number is split into parts at the `:'. The name is
@@ -14839,19 +14986,19 @@ and the group numbers:
          print ""
      }
 
-The test in the `for' loop is worth noting.  Any supplementary groups
-in the `PROCINFO' array have the indices `"group1"' through `"groupN"'
-for some N, i.e., the total number of supplementary groups.  However,
-we don't know in advance how many of these groups there are.
+   The test in the `for' loop is worth noting.  Any supplementary
+groups in the `PROCINFO' array have the indices `"group1"' through
+`"groupN"' for some N, i.e., the total number of supplementary groups.
+However, we don't know in advance how many of these groups there are.
 
-This loop works by starting at one, concatenating the value with
+   This loop works by starting at one, concatenating the value with
 `"group"', and then using `in' to see if that value is in the array.
 Eventually, `i' is incremented past the last group in the array and the
 loop exits.
 
-The loop is also correct if there are _no_ supplementary groups; then
-the condition is false the first time it's tested, and the loop body
-never executes.
+   The loop is also correct if there are _no_ supplementary groups;
+then the condition is false the first time it's tested, and the loop
+body never executes.
 
 
 File: gawk.info,  Node: Split Program,  Next: Tee Program,  Prev: Id Program,  Up: Clones
@@ -14864,7 +15011,7 @@ is as follows:
 
      split [-COUNT] file [ PREFIX ]
 
-By default, the output files are named `xaa', `xab', and so on. Each
+   By default, the output files are named `xaa', `xab', and so on. Each
 file has 1000 lines in it, with the likely exception of the last file.
 To change the number of lines in each file, supply a number on the
 command line preceded with a minus; e.g., `-500' for files with 500
@@ -14872,13 +15019,13 @@ lines in them instead of 1000.  To change the name of the output files
 to something like `myfileaa', `myfileab', and so on, supply an
 additional argument that specifies the file name prefix.
 
-Here is a version of `split' in `awk'. It uses the `ord' and `chr'
-functions presented in *Note Ordinal Functions::.
+   Here is a version of `split' in `awk'. It uses the `ord' and `chr'
+functions presented in *note Ordinal Functions::.
 
-The program first sets its defaults, and then tests to make sure there
-are not too many arguments.  It then looks at each argument in turn.
-The first argument could be a minus sign followed by a number. If it
-is, this happens to look like a negative number, so it is made
+   The program first sets its defaults, and then tests to make sure
+there are not too many arguments.  It then looks at each argument in
+turn.  The first argument could be a minus sign followed by a number.
+If it is, this happens to look like a negative number, so it is made
 positive, and that is the count of lines.  The data file name is
 skipped over and the final argument is used as the prefix for the
 output file names:
@@ -14912,12 +15059,13 @@ output file names:
          out = (outfile s1 s2)
      }
 
-The next rule does most of the work. `tcount' (temporary count) tracks
-how many lines have been printed to the output file so far. If it is
-greater than `count', it is time to close the current file and start a
-new one.  `s1' and `s2' track the current suffixes for the file name. If
-they are both `z', the file is just too big.  Otherwise, `s1' moves to
-the next letter in the alphabet and `s2' starts over again at `a':
+   The next rule does most of the work. `tcount' (temporary count)
+tracks how many lines have been printed to the output file so far. If
+it is greater than `count', it is time to close the current file and
+start a new one.  `s1' and `s2' track the current suffixes for the file
+name. If they are both `z', the file is just too big.  Otherwise, `s1'
+moves to the next letter in the alphabet and `s2' starts over again at
+`a':
 
      {
          if (++tcount > count) {
@@ -14950,10 +15098,10 @@ The `usage' function simply prints an error message and exits:
 
 The variable `e' is used so that the function fits nicely on the screen.
 
-This program is a bit sloppy; it relies on `awk' to automatically close
-the last file instead of doing it in an `END' rule.  It also assumes
-that letters are contiguous in the character set, which isn't true for
-EBCDIC systems.
+   This program is a bit sloppy; it relies on `awk' to automatically
+close the last file instead of doing it in an `END' rule.  It also
+assumes that letters are contiguous in the character set, which isn't
+true for EBCDIC systems.
 
 
 File: gawk.info,  Node: Tee Program,  Next: Uniq Program,  Prev: Split Program,  Up: Clones
@@ -14967,16 +15115,16 @@ files named on the command line.  Its usage is as follows:
 
      tee [-a] file ...
 
-The `-a' option tells `tee' to append to the named files, instead of
+   The `-a' option tells `tee' to append to the named files, instead of
 truncating them and starting over.
 
-The `BEGIN' rule first makes a copy of all the command-line arguments
+   The `BEGIN' rule first makes a copy of all the command-line arguments
 into an array named `copy'.  `ARGV[0]' is not copied, since it is not
 needed.  `tee' cannot use `ARGV' directly, since `awk' attempts to
 process each file name in `ARGV' as input data.
 
-If the first argument is `-a', then the flag variable `append' is set
-to true, and both `ARGV[1]' and `copy[1]' are deleted. If `ARGC' is
+   If the first argument is `-a', then the flag variable `append' is
+set to true, and both `ARGV[1]' and `copy[1]' are deleted. If `ARGC' is
 less than two, then no file names were supplied and `tee' prints a
 usage message and exits.  Finally, `awk' is forced to read the standard
 input by setting `ARGV[1]' to `"-"' and `ARGC' to two:
@@ -15001,7 +15149,7 @@ input by setting `ARGV[1]' to `"-"' and `ARGC' to two:
          ARGC = 2
      }
 
-The single rule does all the work.  Since there is no pattern, it is
+   The single rule does all the work.  Since there is no pattern, it is
 executed for each line of input.  The body of the rule simply prints the
 line into each file on the command line, and then to the standard
 output:
@@ -15031,7 +15179,7 @@ body, the `if' is only tested once for each input record.  If there are
 N input records and M output files, the first method only executes N
 `if' statements, while the second executes N`*'M `if' statements.
 
-Finally, the `END' rule cleans up by closing all the output files:
+   Finally, the `END' rule cleans up by closing all the output files:
 
      END    \
      {
@@ -15052,7 +15200,7 @@ usage is as follows:
 
      uniq [-udc [-N]] [+N] [ INPUT FILE [ OUTPUT FILE ]]
 
-The options for `uniq' are:
+   The options for `uniq' are:
 
 `-d'
      Pnly print only repeated lines.
@@ -15081,14 +15229,14 @@ The options for `uniq' are:
      The generated output is sent to the named output file, instead of
      to the standard output.
 
-Normally `uniq' behaves as if both the `-d' and `-u' options are
+   Normally `uniq' behaves as if both the `-d' and `-u' options are
 provided.
 
-`uniq' uses the `getopt' library function (*note Getopt Function::) and
-the `join' library function (*note Join Function::).
+   `uniq' uses the `getopt' library function (*note Getopt Function::)
+and the `join' library function (*note Join Function::).
 
-The program begins with a `usage' function and then a brief outline of
-the options and their meanings in a comment.  The `BEGIN' rule deals
+   The program begins with a `usage' function and then a brief outline
+of the options and their meanings in a comment.  The `BEGIN' rule deals
 with the command-line arguments and options. It uses a trick to get
 `getopt' to handle options of the form `-25', treating such an option
 as the option letter `2' with an argument of `5'. If indeed two or more
@@ -15099,7 +15247,7 @@ then `Optarg' is not needed. In this case, `Optind' must be decremented
 so that `getopt' processes it next time.  This code is admittedly a bit
 tricky.
 
-If no options are supplied, then the default is taken, to print both
+   If no options are supplied, then the default is taken, to print both
 repeated and nonrepeated lines.  The output file, if provided, is
 assigned to `outputfile'.  Early on, `outputfile' is initialized to the
 standard output, `/dev/stdout':
@@ -15162,8 +15310,8 @@ standard output, `/dev/stdout':
          }
      }
 
-The following function, `are_equal', compares the current line, `$0',
-to the previous line, `last'.  It handles skipping fields and
+   The following function, `are_equal', compares the current line,
+`$0', to the previous line, `last'.  It handles skipping fields and
 characters.  If no field count and no character count are specified,
 `are_equal' simply returns one or zero depending upon the result of a
 simple string comparison of `last' and `$0'.  Otherwise, things get more
@@ -15198,23 +15346,24 @@ and `are_equal' returns the result:
          return (clast == cline)
      }
 
-The following two rules are the body of the program.  The first one is
-executed only for the very first line of data.  It sets `last' equal to
-`$0', so that subsequent lines of text have something to be compared to.
+   The following two rules are the body of the program.  The first one
+is executed only for the very first line of data.  It sets `last' equal
+to `$0', so that subsequent lines of text have something to be compared
+to.
 
-The second rule does the work. The variable `equal' is one or zero,
+   The second rule does the work. The variable `equal' is one or zero,
 depending upon the results of `are_equal''s comparison. If `uniq' is
 counting repeated lines, and the lines are equal, then it increments
 the `count' variable.  Otherwise, it prints the line and resets `count',
 since the two lines are not equal.
 
-If `uniq' is not counting, and if the lines are equal, `count' is
+   If `uniq' is not counting, and if the lines are equal, `count' is
 incremented.  Nothing is printed, since the point is to remove
 duplicates.  Otherwise, if `uniq' is counting repeated lines and more
 than one line is seen, or if `uniq' is counting nonrepeated lines and
 only one line is seen, then the line is printed, and `count' is reset.
 
-Finally, similar logic is used in the `END' rule to print the final
+   Finally, similar logic is used in the `END' rule to print the final
 line of input data:
 
      NR == 1 {
@@ -15266,10 +15415,10 @@ one or more input files. Its usage is as follows:
 
      wc [-lwc] [ FILES ... ]
 
-If no files are specified on the command line, `wc' reads its standard
-input. If there are multiple files, it also prints total counts for all
-the files.  The options and their meanings are shown in the following
-list:
+   If no files are specified on the command line, `wc' reads its
+standard input. If there are multiple files, it also prints total
+counts for all the files.  The options and their meanings are shown in
+the following list:
 
 `-l'
      Count only lines.
@@ -15283,20 +15432,20 @@ list:
 `-c'
      Count only characters.
 
-Implementing `wc' in `awk' is particularly elegant, since `awk' does a
-lot of the work for us; it splits lines into words (i.e., fields) and
+   Implementing `wc' in `awk' is particularly elegant, since `awk' does
+a lot of the work for us; it splits lines into words (i.e., fields) and
 counts them, it counts lines (i.e., records), and it can easily tell us
 how long a line is.
 
-This uses the `getopt' library function (*note Getopt Function::) and
-the file-transition functions (*note Filetrans Function::).
+   This uses the `getopt' library function (*note Getopt Function::)
+and the file-transition functions (*note Filetrans Function::).
 
-This version has one notable difference from traditional versions of
+   This version has one notable difference from traditional versions of
 `wc': it always prints the counts in the order lines, words, and
 characters.  Traditional versions note the order of the `-l', `-w', and
 `-c' options on the command line, and print the counts in that order.
 
-The `BEGIN' rule does the argument processing.  The variable
+   The `BEGIN' rule does the argument processing.  The variable
 `print_total' is true if more than one file is named on the command
 line:
 
@@ -15332,8 +15481,8 @@ line:
          print_total = (ARGC - i > 2)
      }
 
-The `beginfile' function is simple; it just resets the counts of lines,
-words, and characters to zero, and saves the current file name in
+   The `beginfile' function is simple; it just resets the counts of
+lines, words, and characters to zero, and saves the current file name in
 `fname':
 
      function beginfile(file)
@@ -15342,7 +15491,7 @@ words, and characters to zero, and saves the current file name in
          fname = FILENAME
      }
 
-The `endfile' function adds the current file's numbers to the running
+   The `endfile' function adds the current file's numbers to the running
 totals of lines, words, and characters.(1)  It then prints out those
 numbers for the file that was just read. It relies on `beginfile' to
 reset the numbers for the following data file:
@@ -15361,10 +15510,10 @@ reset the numbers for the following data file:
          printf "\t%s\n", fname
      }
 
-There is one rule that is executed for each line. It adds the length of
-the record, plus one, to `chars'.  Adding one plus the record length is
-needed because the newline character separating records (the value of
-`RS') is not part of the record itself, and thus not included in its
+   There is one rule that is executed for each line. It adds the length
+of the record, plus one, to `chars'.  Adding one plus the record length
+is needed because the newline character separating records (the value
+of `RS') is not part of the record itself, and thus not included in its
 length.  Next, `lines' is incremented for each line read, and `words'
 is incremented by the value of `NF', which is the number of "words" on
 this line:
@@ -15376,7 +15525,7 @@ this line:
          words += NF
      }
 
-Finally, the `END' rule simply prints the totals for all the files:
+   Finally, the `END' rule simply prints the totals for all the files:
 
      END {
          if (print_total) {
@@ -15390,11 +15539,11 @@ Finally, the `END' rule simply prints the totals for all the files:
          }
      }
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) `wc' can't just use the value of `FNR' in `endfile'. If you examine
-the code in *Note Filetrans Function::, you will see that `FNR' has
-already been reset by the time `endfile' is called.
+   (1) `wc' can't just use the value of `FNR' in `endfile'. If you
+examine the code in *note Filetrans Function::, you will see that `FNR'
+has already been reset by the time `endfile' is called.
 
 
 File: gawk.info,  Node: Miscellaneous Programs,  Prev: Clones,  Up: Sample Programs
@@ -15432,13 +15581,13 @@ duplicate words.  Typically you will see this in text as something like
 the duplicated words occur at the end of one line and the beginning of
 another, making them very difficult to spot.
 
-This program, `dupword.awk', scans through a file one line at a time
+   This program, `dupword.awk', scans through a file one line at a time
 and looks for adjacent occurrences of the same word.  It also saves the
 last word on a line (in the variable `prev') for comparison with the
 first word on the next line.
 
-The first two statements make sure that the line is all lowercase, so
-that, for example, "The" and "the" compare equal to each other.  The
+   The first two statements make sure that the line is all lowercase,
+so that, for example, "The" and "the" compare equal to each other.  The
 next statement replaces nonalphanumeric and nonwhitespace characters
 with spaces, so that punctuation does not affect the comparison either.
 The characters are replaced with spaces so that formatting controls
@@ -15447,7 +15596,7 @@ don't create nonsense words (e.g., the Texinfo `@code{NF}' becomes
 into fields, yielding just the actual words on the line, and ensuring
 that there are no empty fields.
 
-If there are no fields left after removing all the punctuation, the
+   If there are no fields left after removing all the punctuation, the
 current record is skipped.  Otherwise, the program loops through each
 word, comparing it to the previous one:
 
@@ -15477,16 +15626,16 @@ File: gawk.info,  Node: Alarm Program,  Next: Translate Program,  Prev: Dupword
      Nothing cures insomnia like a ringing alarm clock.
      Arnold Robbins
 
-The following program is a simple "alarm clock" program.  You give it a
-time of day and an optional message.  At the specified time, it prints
-the message on the standard output. In addition, you can give it the
-number of times to repeat the message as well as a delay between
+   The following program is a simple "alarm clock" program.  You give
+it a time of day and an optional message.  At the specified time, it
+prints the message on the standard output. In addition, you can give it
+the number of times to repeat the message as well as a delay between
 repetitions.
 
-This program uses the `gettimeofday' function from *Note Gettimeofday
-Function::.
+   This program uses the `gettimeofday' function from *note
+Gettimeofday Function::.
 
-All the work is done in the `BEGIN' rule.  The first part is argument
+   All the work is done in the `BEGIN' rule.  The first part is argument
 checking and setting of defaults: the delay, the count, and the message
 to print.  If the user supplied a message without the ASCII BEL
 character (known as the "alert" character, `"\a"'), then it is added to
@@ -15535,11 +15684,12 @@ Here is the program:
          else if (index(message, "\a") == 0)
              message = "\a" message "\a"
 
-The next minor node of code turns the alarm time into hours and minutes,
-converts it (if necessary) to a 24-hour clock, and then turns that time
-into a count of the seconds since midnight.  Next it turns the current
-time into a count of seconds since midnight.  The difference between
-the two is how long to wait before setting off the alarm:
+   The next minor node of code turns the alarm time into hours and
+minutes, converts it (if necessary) to a 24-hour clock, and then turns
+that time into a count of the seconds since midnight.  Next it turns
+the current time into a count of seconds since midnight.  The
+difference between the two is how long to wait before setting off the
+alarm:
 
          # split up alarm time
          split(ARGV[1], atime, ":")
@@ -15569,12 +15719,13 @@ the two is how long to wait before setting off the alarm:
              exit 1
          }
 
-Finally, the program uses the `system' function (*note I/O Functions::)
-to call the `sleep' utility.  The `sleep' utility simply pauses for the
-given number of seconds.  If the exit status is not zero, the program
-assumes that `sleep' was interrupted and exits. If `sleep' exited with
-an OK status (zero), then the program prints the message in a loop,
-again using `sleep' to delay for however many seconds are necessary:
+   Finally, the program uses the `system' function (*note I/O
+Functions::) to call the `sleep' utility.  The `sleep' utility simply
+pauses for the given number of seconds.  If the exit status is not zero,
+the program assumes that `sleep' was interrupted and exits. If `sleep'
+exited with an OK status (zero), then the program prints the message in
+a loop, again using `sleep' to delay for however many seconds are
+necessary:
 
          # zzzzzz..... go away if interrupted
          if (system(sprintf("sleep %d", naptime)) != 0)
@@ -15604,21 +15755,21 @@ processing:
 
      GENERATE DATA | tr 'A-Z' 'a-z' | PROCESS DATA ...
 
-`tr' requires two lists of characters.(1)  When processing the input,
-the first character in the first list is replaced with the first
+   `tr' requires two lists of characters.(1)  When processing the
+input, the first character in the first list is replaced with the first
 character in the second list, the second character in the first list is
 replaced with the second character in the second list, and so on.  If
 there are more characters in the "from" list than in the "to" list, the
 last character of the "to" list is used for the remaining characters in
 the "from" list.
 
-Some time ago, a user proposed that a transliteration function should
+   Some time ago, a user proposed that a transliteration function should
 be added to `gawk'.  The following program was written to prove that
 character transliteration could be done with a user-level function.
 This program is not as complete as the system `tr' utility but it does
 most of the job.
 
-The `translate' program demonstrates one of the few weaknesses of
+   The `translate' program demonstrates one of the few weaknesses of
 standard `awk': dealing with individual characters is very painful,
 requiring repeated use of the `substr', `index', and `gsub' built-in
 functions (*note String Functions::).(2) There are two functions.  The
@@ -15633,18 +15784,19 @@ first, `stranslate', takes three arguments:
 `target'
      The string on which to do the translation.
 
-Associative arrays make the translation part fairly easy. `t_ar' holds
-the "to" characters, indexed by the "from" characters.  Then a simple
-loop goes through `from', one character at a time.  For each character
-in `from', if the character appears in `target', `gsub' is used to
-change it to the corresponding `to' character.
+   Associative arrays make the translation part fairly easy. `t_ar'
+holds the "to" characters, indexed by the "from" characters.  Then a
+simple loop goes through `from', one character at a time.  For each
+character in `from', if the character appears in `target', `gsub' is
+used to change it to the corresponding `to' character.
 
-The `translate' function simply calls `stranslate' using `$0' as the
+   The `translate' function simply calls `stranslate' using `$0' as the
 target.  The main program sets two global variables, `FROM' and `TO',
 from the command line, and then changes `ARGV' so that `awk' reads from
 the standard input.
 
-Finally, the processing rule simply calls `translate' for each record:
+   Finally, the processing rule simply calls `translate' for each
+record:
 
      # translate.awk --- do tr-like stuff
      # Bugs: does not handle things like: tr A-Z a-z, it has
@@ -15690,7 +15842,7 @@ Finally, the processing rule simply calls `translate' for each record:
          print
      }
 
-While it is possible to do character transliteration in a user-level
+   While it is possible to do character transliteration in a user-level
 function, it is not necessarily efficient, and we (the `gawk' authors)
 started to consider adding a built-in function.  However, shortly after
 writing this program, we learned that the System V Release 4 `awk' had
@@ -15699,19 +15851,19 @@ These functions handle the vast majority of the cases where character
 transliteration is necessary, and so we chose to simply add those
 functions to `gawk' as well and then leave well enough alone.
 
-An obvious improvement to this program would be to set up the `t_ar'
+   An obvious improvement to this program would be to set up the `t_ar'
 array only once, in a `BEGIN' rule. However, this assumes that the
 "from" and "to" lists will never change throughout the lifetime of the
 program.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) On some older System V systems, `tr' may require that the lists be
-written as range expressions enclosed in square brackets (`[a-z]') and
-quoted, to prevent the shell from attempting a file name expansion.
+   (1) On some older System V systems, `tr' may require that the lists
+be written as range expressions enclosed in square brackets (`[a-z]')
+and quoted, to prevent the shell from attempting a file name expansion.
 This is not a feature.
 
-(2) This program was written before `gawk' acquired the ability to
+   (2) This program was written before `gawk' acquired the ability to
 split each character in a string into separate array elements.
 
 
@@ -15726,25 +15878,25 @@ labels on it, 2 across and 10 down.  The addresses are guaranteed to be
 no more than 5 lines of data.  Each address is separated from the next
 by a blank line.
 
-The basic idea is to read 20 labels worth of data.  Each line of each
-label is stored in the `line' array.  The single rule takes care of
-filling the `line' array and printing the page when 20 labels have been
-read.
+   The basic idea is to read 20 labels worth of data.  Each line of
+each label is stored in the `line' array.  The single rule takes care
+of filling the `line' array and printing the page when 20 labels have
+been read.
 
-The `BEGIN' rule simply sets `RS' to the empty string, so that `awk'
+   The `BEGIN' rule simply sets `RS' to the empty string, so that `awk'
 splits records at blank lines (*note Records::).  It sets `MAXLINES' to
 100, since 100 is the maximum number of lines on the page (20 * 5 =
 100).
 
-Most of the work is done in the `printpage' function.  The label lines
-are stored sequentially in the `line' array.  But they have to print
-horizontally; `line[1]' next to `line[6]', `line[2]' next to `line[7]',
-and so on.  Two loops are used to accomplish this.  The outer loop,
-controlled by `i', steps through every 10 lines of data; this is each
-row of labels.  The inner loop, controlled by `j', goes through the
-lines within the row.  As `j' goes from 0 to 4, `i+j' is the `j'-th
-line in the row, and `i+j+5' is the entry next to it.  The output ends
-up looking something like this:
+   Most of the work is done in the `printpage' function.  The label
+lines are stored sequentially in the `line' array.  But they have to
+print horizontally; `line[1]' next to `line[6]', `line[2]' next to
+`line[7]', and so on.  Two loops are used to accomplish this.  The
+outer loop, controlled by `i', steps through every 10 lines of data;
+this is each row of labels.  The inner loop, controlled by `j', goes
+through the lines within the row.  As `j' goes from 0 to 4, `i+j' is
+the `j'-th line in the row, and `i+j+5' is the entry next to it.  The
+output ends up looking something like this:
 
      line 1          line 6
      line 2          line 7
@@ -15753,13 +15905,13 @@ up looking something like this:
      line 5          line 10
      ...
 
-As a final note, an extra blank line is printed at lines 21 and 61, to
-keep the output lined up on the labels.  This is dependent on the
+   As a final note, an extra blank line is printed at lines 21 and 61,
+to keep the output lined up on the labels.  This is dependent on the
 particular brand of labels in use when the program was written.  You
 will also note that there are 2 blank lines at the top and 2 blank
 lines at the bottom.
 
-The `END' rule arranges to flush the final page of labels; there may
+   The `END' rule arranges to flush the final page of labels; there may
 not have been an even multiple of 20 labels in the data:
 
      # labels.awk --- print mailing labels
@@ -15814,9 +15966,9 @@ not have been an even multiple of 20 labels in the data:
          printpage()
      }
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) "Real world" is defined as "a program actually used to get
+   (1) "Real world" is defined as "a program actually used to get
 something done."
 
 
@@ -15844,7 +15996,7 @@ program listing:
              printf "%s\t%d\n", word, freq[word]
      }
 
-This program has two rules.  The first rule, because it has an empty
+   This program has two rules.  The first rule, because it has an empty
 pattern, is executed for every input line.  It uses `awk''s
 field-accessing mechanism (*note Fields::) to pick out the individual
 words from the line, and the built-in variable `NF' (*note Built-in
@@ -15852,7 +16004,7 @@ Variables::) to know how many fields are available.  For each input
 word, it increments an element of the array `freq' to reflect that the
 word has been seen an additional time.
 
-The second rule, because it has the pattern `END', is not executed
+   The second rule, because it has the pattern `END', is not executed
 until the input has been exhausted.  It prints out the contents of the
 `freq' table that has been built up inside the first action.  This
 program has several problems that would prevent it from being useful by
@@ -15873,11 +16025,11 @@ itself on real text files:
      likely to be interested in which words occur most frequently or in
      having an alphabetized table of how frequently each word occurs.
 
-The way to solve these problems is to use some of `awk''s more advanced
-features.  First, we use `tolower' to remove case distinctions.  Next,
-we use `gsub' to remove punctuation characters.  Finally, we use the
-system `sort' utility to process the output of the `awk' script.  Here
-is the new version of the program:
+   The way to solve these problems is to use some of `awk''s more
+advanced features.  First, we use `tolower' to remove case
+distinctions.  Next, we use `gsub' to remove punctuation characters.
+Finally, we use the system `sort' utility to process the output of the
+`awk' script.  Here is the new version of the program:
 
      # wordfreq.awk --- print list of word frequencies
 
@@ -15894,8 +16046,8 @@ is the new version of the program:
              printf "%s\t%d\n", word, freq[word]
      }
 
-Assuming we have saved this program in a file named `wordfreq.awk', and
-that the data is in `file1', the following pipeline:
+   Assuming we have saved this program in a file named `wordfreq.awk',
+and that the data is in `file1', the following pipeline:
 
      awk -f wordfreq.awk file1 | sort -k 2nr
 
@@ -15903,15 +16055,15 @@ produces a table of the words appearing in `file1' in order of
 decreasing frequency.  The `awk' program suitably massages the data and
 produces a word frequency table, which is not ordered.
 
-The `awk' script's output is then sorted by the `sort' utility and
+   The `awk' script's output is then sorted by the `sort' utility and
 printed on the terminal.  The options given to `sort' specify a sort
 that uses the second field of each input line (skipping one field),
 that the sort keys should be treated as numeric quantities (otherwise
 `15' would come before `5'), and that the sorting should be done in
 descending (reverse) order.
 
-The `sort' could even be done from within the program, by changing the
-`END' action to:
+   The `sort' could even be done from within the program, by changing
+the `END' action to:
 
      END {
          sort = "sort -k 2nr"
@@ -15920,10 +16072,10 @@ The `sort' could even be done from within the program, by changing the
          close(sort)
      }
 
-This way of sorting must be used on systems that do not have true pipes
-at the command-line (or batch-file) level.  See the general operating
-system documentation for more information on how to use the `sort'
-program.
+   This way of sorting must be used on systems that do not have true
+pipes at the command-line (or batch-file) level.  See the general
+operating system documentation for more information on how to use the
+`sort' program.
 
 
 File: gawk.info,  Node: History Sorting,  Next: Extract Program,  Prev: Word Sorting,  Up: Miscellaneous Programs
@@ -15934,15 +16086,15 @@ File: gawk.info,  Node: History Sorting,  Next: Extract Program,  Prev: Word Sor
 The `uniq' program (*note Uniq Program::), removes duplicate lines from
 _sorted_ data.
 
-Suppose, however, you need to remove duplicate lines from a data file
-but that you want to preserve the order the lines are in.  A good
+   Suppose, however, you need to remove duplicate lines from a data
+file but that you want to preserve the order the lines are in.  A good
 example of this might be a shell history file.  The history file keeps
 a copy of all the commands you have entered, and it is not unusual to
 repeat a command several times in a row.  Occasionally you might want
 to compact the history by removing duplicate entries.  Yet it is
 desirable to maintain the order of the original commands.
 
-This simple program does the job.  It uses two arrays.  The `data'
+   This simple program does the job.  It uses two arrays.  The `data'
 array is indexed by the text of each line.  For each line, `data[$0]'
 is incremented.  If a particular line has not been seen before, then
 `data[$0]' is zero.  In this case, the text of the line is stored in
@@ -15962,13 +16114,14 @@ encountered.  The `END' rule simply prints out the lines, in order:
              print lines[i]
      }
 
-This program also provides a foundation for generating other useful
+   This program also provides a foundation for generating other useful
 information.  For example, using the following `print' statement in the
 `END' rule indicates how often a particular command is used:
 
      print data[lines[i]], lines[i]
 
-This works because `data[$0]' is incremented each time a line is seen.
+   This works because `data[$0]' is incremented each time a line is
+seen.
 
 
 File: gawk.info,  Node: Extract Program,  Next: Simple Sed,  Prev: History Sorting,  Up: Miscellaneous Programs
@@ -15976,7 +16129,7 @@ File: gawk.info,  Node: Extract Program,  Next: Simple Sed,  Prev: History Sorti
 13.3.7 Extracting Programs from Texinfo Source Files
 ----------------------------------------------------
 
-The nodes *Note Library Functions::, and *Note Sample Programs::, are
+The nodes *note Library Functions::, and *note Sample Programs::, are
 the top level nodes for a large number of `awk' programs.  If you want
 to experiment with these programs, it is tedious to have to type them
 in by hand.  Here we present a program that can extract parts of a
@@ -15985,10 +16138,10 @@ Texinfo input file into separate files.
 This Info file is written in Texinfo, the GNU project's document
 formatting language.  A single Texinfo source file can be used to
 produce both printed and online documentation.  The Texinfo language is
-described fully, starting with *Note Top::.
+described fully, starting with *note Top::.
 
-For our purposes, it is enough to know three things about Texinfo input
-files:
+   For our purposes, it is enough to know three things about Texinfo
+input files:
 
    * The "at" symbol (`@') is special in Texinfo, much as the backslash
      (`\') is in C or `awk'.  Literal `@' symbols are represented in
@@ -16003,7 +16156,7 @@ files:
      (Unfortunately, TeX isn't always smart enough to do things exactly
      right, and we have to give it some help.)
 
-The following program, `extract.awk', reads through a Texinfo source
+   The following program, `extract.awk', reads through a Texinfo source
 file and does two things, based on the special comments.  Upon seeing
 `@c system ...', it runs a command, by extracting the command text from
 the control line and passing it on to the `system' function (*note I/O
@@ -16014,12 +16167,12 @@ rules in `extract.awk' match either `@c' or `@comment' by letting the
 are simply removed.  `extract.awk' uses the `join' library function
 (*note Join Function::).
 
-The example programs in the online Texinfo source for `GAWK: Effective
-AWK Programming' (`gawk.texi') have all been bracketed inside `file' and
-`endfile' lines.  The `gawk' distribution uses a copy of `extract.awk'
-to extract the sample programs and install many of them in a standard
-directory where `gawk' can find them.  The Texinfo file looks something
-like this:
+   The example programs in the online Texinfo source for `GAWK:
+Effective AWK Programming' (`gawk.texi') have all been bracketed inside
+`file' and `endfile' lines.  The `gawk' distribution uses a copy of
+`extract.awk' to extract the sample programs and install many of them
+in a standard directory where `gawk' can find them.  The Texinfo file
+looks something like this:
 
      ...
      This program has a @code{BEGIN} rule,
@@ -16040,10 +16193,10 @@ like this:
      @end example
      ...
 
-`extract.awk' begins by setting `IGNORECASE' to one, so that mixed
+   `extract.awk' begins by setting `IGNORECASE' to one, so that mixed
 upper- and lowercase letters in the directives won't matter.
 
-The first rule handles calling `system', checking that a command is
+   The first rule handles calling `system', checking that a command is
 given (`NF' is at least three) and also checking that the command exits
 with a zero exit status, signifying OK:
 
@@ -16071,32 +16224,33 @@ with a zero exit status, signifying OK:
 
 The variable `e' is used so that the function fits nicely on the screen.
 
-The second rule handles moving data into files.  It verifies that a
+   The second rule handles moving data into files.  It verifies that a
 file name is given in the directive.  If the file named is not the
 current file, then the current file is closed.  Keeping the current file
 open until a new file is encountered allows the use of the `>'
 redirection for printing the contents, keeping open file management
 simple.
 
-The `for' loop does the work.  It reads lines using `getline' (*note
+   The `for' loop does the work.  It reads lines using `getline' (*note
 Getline::).  For an unexpected end of file, it calls the
 `unexpected_eof' function.  If the line is an "endfile" line, then it
 breaks out of the loop.  If the line is an `@group' or `@end group'
 line, then it ignores it and goes on to the next line.  Similarly,
 comments within examples are also ignored.
 
-Most of the work is in the following few lines.  If the line has no `@'
-symbols, the program can print it directly.  Otherwise, each leading
-`@' must be stripped off.  To remove the `@' symbols, the line is split
-into separate elements of the array `a', using the `split' function
-(*note String Functions::).  The `@' symbol is used as the separator
-character.  Each element of `a' that is empty indicates two successive
-`@' symbols in the original line.  For each two empty elements (`@@' in
-the original file), we have to add a single `@' symbol back in.
+   Most of the work is in the following few lines.  If the line has no
+`@' symbols, the program can print it directly.  Otherwise, each
+leading `@' must be stripped off.  To remove the `@' symbols, the line
+is split into separate elements of the array `a', using the `split'
+function (*note String Functions::).  The `@' symbol is used as the
+separator character.  Each element of `a' that is empty indicates two
+successive `@' symbols in the original line.  For each two empty
+elements (`@@' in the original file), we have to add a single `@'
+symbol back in.
 
-When the processing of the array is finished, `join' is called with the
-value of `SUBSEP', to rejoin the pieces back into a single line.  That
-line is then printed to the output file:
+   When the processing of the array is finished, `join' is called with
+the value of `SUBSEP', to rejoin the pieces back into a single line.
+That line is then printed to the output file:
 
      /^@c(omment)?[ \t]+file/    \
      {
@@ -16138,15 +16292,15 @@ line is then printed to the output file:
          }
      }
 
-An important thing to note is the use of the `>' redirection.  Output
-done with `>' only opens the file once; it stays open and subsequent
-output is appended to the file (*note Redirection::).  This makes it
-easy to mix program text and explanatory prose for the same sample
-source file (as has been done here!) without any hassle.  The file is
-only closed when a new data file name is encountered or at the end of
-the input file.
+   An important thing to note is the use of the `>' redirection.
+Output done with `>' only opens the file once; it stays open and
+subsequent output is appended to the file (*note Redirection::).  This
+makes it easy to mix program text and explanatory prose for the same
+sample source file (as has been done here!) without any hassle.  The
+file is only closed when a new data file name is encountered or at the
+end of the input file.
 
-Finally, the function `unexpected_eof' prints an appropriate error
+   Finally, the function `unexpected_eof' prints an appropriate error
 message and then exits.  The `END' rule handles the final cleanup,
 closing the open file:
 
@@ -16176,15 +16330,15 @@ middle of a pipeline:
 
      command1 < orig.data | sed 's/old/new/g' | command2 > result
 
-Here, `s/old/new/g' tells `sed' to look for the regexp `old' on each
+   Here, `s/old/new/g' tells `sed' to look for the regexp `old' on each
 input line and globally replace it with the text `new', i.e., all the
 occurrences on a line.  This is similar to `awk''s `gsub' function
 (*note String Functions::).
 
-The following program, `awksed.awk', accepts at least two command-line
-arguments: the pattern to look for and the text to replace it with. Any
-additional arguments are treated as data file names to process. If none
-are provided, the standard input is used:
+   The following program, `awksed.awk', accepts at least two
+command-line arguments: the pattern to look for and the text to replace
+it with. Any additional arguments are treated as data file names to
+process. If none are provided, the standard input is used:
 
      # awksed.awk --- do s/foo/bar/g using just print
      #    Thanks to Michael Brennan for the idea
@@ -16214,32 +16368,32 @@ are provided, the standard input is used:
              print
      }
 
-The program relies on `gawk''s ability to have `RS' be a regexp, as
+   The program relies on `gawk''s ability to have `RS' be a regexp, as
 well as on the setting of `RT' to the actual text that terminates the
 record (*note Records::).
 
-The idea is to have `RS' be the pattern to look for. `gawk'
+   The idea is to have `RS' be the pattern to look for. `gawk'
 automatically sets `$0' to the text between matches of the pattern.
 This is text that we want to keep, unmodified.  Then, by setting `ORS'
 to the replacement text, a simple `print' statement outputs the text we
 want to keep, followed by the replacement text.
 
-There is one wrinkle to this scheme, which is what to do if the last
+   There is one wrinkle to this scheme, which is what to do if the last
 record doesn't end with text that matches `RS'.  Using a `print'
 statement unconditionally prints the replacement text, which is not
 correct.  However, if the file did not end in text that matches `RS',
 `RT' is set to the null string.  In this case, we can print `$0' using
 `printf' (*note Printf::).
 
-The `BEGIN' rule handles the setup, checking for the right number of
+   The `BEGIN' rule handles the setup, checking for the right number of
 arguments and calling `usage' if there is a problem. Then it sets `RS'
 and `ORS' from the command-line arguments and sets `ARGV[1]' and
 `ARGV[2]' to the null string, so that they are not treated as file names
 (*note ARGC and ARGV::).
 
-The `usage' function prints an error message and exits.  Finally, the
-single rule handles the printing scheme outlined above, using `print'
-or `printf' as appropriate, depending upon the value of `RT'.
+   The `usage' function prints an error message and exits.  Finally,
+the single rule handles the printing scheme outlined above, using
+`print' or `printf' as appropriate, depending upon the value of `RT'.
 
 
 File: gawk.info,  Node: Igawk Program,  Prev: Simple Sed,  Up: Miscellaneous Programs
@@ -16268,19 +16422,19 @@ able to write programs in the following manner:
          ...
      }
 
-The following program, `igawk.sh', provides this service.  It simulates
-`gawk''s searching of the `AWKPATH' variable and also allows "nested"
-includes; i.e., a file that is included with `@include' can contain
-further `@include' statements.  `igawk' makes an effort to only include
-files once, so that nested includes don't accidentally include a
-library function twice.
+   The following program, `igawk.sh', provides this service.  It
+simulates `gawk''s searching of the `AWKPATH' variable and also allows
+"nested" includes; i.e., a file that is included with `@include' can
+contain further `@include' statements.  `igawk' makes an effort to only
+include files once, so that nested includes don't accidentally include
+a library function twice.
 
-`igawk' should behave just like `gawk' externally.  This means it
+   `igawk' should behave just like `gawk' externally.  This means it
 should accept all of `gawk''s command-line arguments, including the
 ability to have multiple source files specified via `-f', and the
 ability to mix command-line and library source files.
 
-The program is written using the POSIX Shell (`sh') command
+   The program is written using the POSIX Shell (`sh') command
 language.(1) It works as follows:
 
   1. Loop through the arguments, saving anything that doesn't represent
@@ -16306,18 +16460,18 @@ language.(1) It works as follows:
      command-line arguments that the user supplied (such as the data
      file names).
 
-This program uses shell variables extensively; for storing command line
-arguments, the text of the `awk' program that will expand the user's
-program, for the user's original program, and for the expanded program.
-Doing so removes some potential problems that might arise were we to
-use temporary files instead, at the cost of making the script somewhat
-more complicated.
+   This program uses shell variables extensively; for storing command
+line arguments, the text of the `awk' program that will expand the
+user's program, for the user's original program, and for the expanded
+program.  Doing so removes some potential problems that might arise
+were we to use temporary files instead, at the cost of making the
+script somewhat more complicated.
 
-The initial part of the program turns on shell tracing if the first
+   The initial part of the program turns on shell tracing if the first
 argument is `debug'.
 
-The next part loops through all the command-line arguments.  There are
-several cases of interest:
+   The next part loops through all the command-line arguments.  There
+are several cases of interest:
 
 `--'
      This ends the arguments to `igawk'.  Anything else should be
@@ -16349,7 +16503,7 @@ several cases of interest:
      `igawk' prints its version number, runs `gawk --version' to get
      the `gawk' version information, and then exits.
 
-If none of the `-f', `--file', `-Wfile', `--source', or `-Wsource'
+   If none of the `-f', `--file', `-Wfile', `--source', or `-Wsource'
 arguments are supplied, then the first nonoption argument should be the
 `awk' program.  If there are no command-line arguments left, `igawk'
 prints an error message and exits.  Otherwise, the first argument is
@@ -16357,7 +16511,7 @@ appended to `program'.  In any case, after the arguments have been
 processed, `program' contains the complete text of the original `awk'
 program.
 
-The program is as follows:
+   The program is as follows:
 
      #! /bin/sh
      # igawk --- like gawk but do @include processing
@@ -16367,7 +16521,7 @@ The program is as follows:
          shift
      fi
 
-     # A literal newline, so that program text is formmatted correctly
+     # A literal newline, so that program text is formatted correctly
      n='
      '
 
@@ -16433,7 +16587,7 @@ The program is as follows:
 
      # At this point, `program' has the program.
 
-The `awk' program to process `@include' directives is stored in the
+   The `awk' program to process `@include' directives is stored in the
 shell variable `expand_prog'.  Doing this keeps the shell script
 readable.  The `awk' program reads through the user's program, one line
 at a time, using `getline' (*note Getline::).  The input file names and
@@ -16444,8 +16598,8 @@ As each file is finished, the stack is "popped," and the previous input
 file becomes the current input file again.  The process is started by
 making the original file the first one on the stack.
 
-The `pathto' function does the work of finding the full path to a file.
-It simulates `gawk''s behavior when searching the `AWKPATH'
+   The `pathto' function does the work of finding the full path to a
+file.  It simulates `gawk''s behavior when searching the `AWKPATH'
 environment variable (*note AWKPATH Variable::).  If a file name has a
 `/' in it, no path search is done. Otherwise, the file name is
 concatenated with the name of each directory in the path, and an
@@ -16472,8 +16626,8 @@ is closed and the file name is returned:
          return ""
      }
 
-The main program is contained inside one `BEGIN' rule.  The first thing
-it does is set up the `pathlist' array that `pathto' uses.  After
+   The main program is contained inside one `BEGIN' rule.  The first
+thing it does is set up the `pathlist' array that `pathto' uses.  After
 splitting the path on `:', null elements are replaced with `"."', which
 represents the current directory:
 
@@ -16485,22 +16639,22 @@ represents the current directory:
                  pathlist[i] = "."
          }
 
-The stack is initialized with `ARGV[1]', which will be `/dev/stdin'.
+   The stack is initialized with `ARGV[1]', which will be `/dev/stdin'.
 The main loop comes next.  Input lines are read in succession. Lines
 that do not start with `@include' are printed verbatim.  If the line
 does start with `@include', the file name is in `$2'.  `pathto' is
 called to generate the full path.  If it cannot, then we print an error
 message and continue.
 
-The next thing to check is if the file is included already.  The
+   The next thing to check is if the file is included already.  The
 `processed' array is indexed by the full file name of each included
 file and it tracks this information for us.  If the file is seen again,
 a warning message is printed. Otherwise, the new file name is pushed
 onto the stack and processing continues.
 
-Finally, when `getline' encounters the end of the input file, the file
-is closed and the stack is popped.  When `stackptr' is less than zero,
-the program is done:
+   Finally, when `getline' encounters the end of the input file, the
+file is closed and the stack is popped.  When `stackptr' is less than
+zero, the program is done:
 
          stackptr = 0
          input[stackptr] = ARGV[1] # ARGV[1] is first file
@@ -16534,18 +16688,18 @@ the program is done:
      EOF
      `
 
-The shell construct `COMMAND << MARKER' is called a "here document".
+   The shell construct `COMMAND << MARKER' is called a "here document".
 Everything in the shell script up to the MARKER is fed to COMMAND as
 input.  The shell processes the contents of the here document for
 variable and command substitution (and possibly other things as well,
 depending upon the shell).
 
-The shell construct ``...`' is called "command substitution".  The
+   The shell construct ``...`' is called "command substitution".  The
 output of the command between the two backquotes (grave accents) is
 substituted into the command line.  It is saved as a single string,
 even if the results contain whitespace.
 
-The expanded program is saved in the variable `processed_program'.
+   The expanded program is saved in the variable `processed_program'.
 It's done in these steps:
 
   1. Run `gawk' with the `@include'-processing program (the value of
@@ -16558,15 +16712,16 @@ It's done in these steps:
   3. The results of this processing are saved in the shell variable
      `processed_program' by using command substitution.
 
-The last step is to call `gawk' with the expanded program, along with
-the original options and command-line arguments that the user supplied.
+   The last step is to call `gawk' with the expanded program, along
+with the original options and command-line arguments that the user
+supplied.
 
      eval gawk $opts -- '"$processed_program"' '"$@"'
 
-The `eval' command is a shell construct that reruns the shell's parsing
-process.  This keeps things properly quoted.
+   The `eval' command is a shell construct that reruns the shell's
+parsing process.  This keeps things properly quoted.
 
-This version of `igawk' represents my fourth attempt at this program.
+   This version of `igawk' represents my fourth attempt at this program.
 There are four key simplifications that make the program work better:
 
    * Using `@include' even for the files named with `-f' makes building
@@ -16587,19 +16742,19 @@ There are four key simplifications that make the program work better:
      more features of the `sh' language, making it harder to follow for
      those who aren't familiar with `sh'.
 
-Also, this program illustrates that it is often worthwhile to combine
+   Also, this program illustrates that it is often worthwhile to combine
 `sh' and `awk' programming together.  You can usually accomplish quite
 a lot, without having to resort to low-level programming in C or C++,
 and it is frequently easier to do certain kinds of string and argument
 manipulation using the shell than it is in `awk'.
 
-Finally, `igawk' shows that it is not always necessary to add new
+   Finally, `igawk' shows that it is not always necessary to add new
 features to a program; they can often be layered on top.  With `igawk',
 there is no real reason to build `@include' processing into `gawk'
 itself.
 
-As an additional example of this, consider the idea of having two files
-in a directory in the search path:
+   As an additional example of this, consider the idea of having two
+files in a directory in the search path:
 
 `default.awk'
      This file contains a set of default library functions, such as
@@ -16612,20 +16767,20 @@ in a directory in the search path:
      releases, without requiring the system administrator to update it
      each time by adding the local functions.
 
-One user suggested that `gawk' be modified to automatically read these
-files upon startup.  Instead, it would be very simple to modify `igawk'
-to do this. Since `igawk' can process nested `@include' directives,
-`default.awk' could simply contain `@include' statements for the
-desired library functions.
+   One user suggested that `gawk' be modified to automatically read
+these files upon startup.  Instead, it would be very simple to modify
+`igawk' to do this. Since `igawk' can process nested `@include'
+directives, `default.awk' could simply contain `@include' statements
+for the desired library functions.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Fully explaining the `sh' language is beyond the scope of this
+   (1) Fully explaining the `sh' language is beyond the scope of this
 book. We provide some minimal explanations, but see a good shell
 programming book if you wish to understand things in more depth.
 
-(2) On some very old versions of `awk', the test `getline junk < t' can
-loop forever if the file exists but is empty.  Caveat emptor.
+   (2) On some very old versions of `awk', the test `getline junk < t'
+can loop forever if the file exists but is empty.  Caveat emptor.
 
 
 File: gawk.info,  Node: Language History,  Next: Installation,  Prev: Sample Programs,  Up: Top
@@ -16689,9 +16844,14 @@ the changes, with cross-references to further details:
    * The `ARGC', `ARGV', `FNR', `RLENGTH', `RSTART', and `SUBSEP'
      built-in variables (*note Built-in Variables::).
 
+   * Assignable `$0'.
+
    * The conditional expression using the ternary operator `?:' (*note
      Conditional Exp::).
 
+   * The expression `INDEX in ARRAY' outside of `for' statements (*note
+     Reference to Elements::).
+
    * The exponentiation operator `^' (*note Arithmetic Ops::) and its
      assignment operator form `^=' (*note Assignment Ops::).
 
@@ -16699,7 +16859,8 @@ the changes, with cross-references to further details:
      programs (*note Precedence::).
 
    * Regexps as the value of `FS' (*note Field Separators::) and as the
-     third argument to the `split' function (*note String Functions::).
+     third argument to the `split' function (*note String Functions::),
+     rather than using only the first character of `FS'.
 
    * Dynamic regexps as operands of the `~' and `!~' operators (*note
      Regexp Usage::).
@@ -16777,7 +16938,8 @@ introduced the following changes into the language:
    * More complete documentation of many of the previously undocumented
      features of the language.
 
-The following common extensions are not permitted by the POSIX standard:
+   The following common extensions are not permitted by the POSIX
+standard:
 
    * `\x' escape sequences are not recognized (*note Escape
      Sequences::).
@@ -16792,11 +16954,14 @@ The following common extensions are not permitted by the POSIX standard:
      (*note Definition Syntax::).
 
    * The operators `**' and `**=' cannot be used in place of `^' and
-     `^=' (*note Arithmetic Ops::, and *Note Assignment Ops::).
+     `^=' (*note Arithmetic Ops::, and *note Assignment Ops::).
 
    * Specifying `-Ft' on the command line does not set the value of
      `FS' to be a single TAB character (*note Field Separators::).
 
+   * The locale's decimal point character is used for parsing input
+     data (*note Locales::).
+
    * The `fflush' built-in function is not supported (*note I/O
      Functions::).
 
@@ -16820,15 +16985,15 @@ POSIX `awk':
    * The `fflush' built-in function for flushing buffered output (*note
      I/O Functions::).
 
-   * The `**' and `**=' operators (*note Arithmetic Ops:: and *Note
+   * The `**' and `**=' operators (*note Arithmetic Ops:: and *note
      Assignment Ops::).
 
    * The use of `func' as an abbreviation for `function' (*note
      Definition Syntax::).
 
 
-The Bell Laboratories `awk' also incorporates the following extensions,
-originally developed for `gawk':
+   The Bell Laboratories `awk' also incorporates the following
+extensions, originally developed for `gawk':
 
    * The `\x' escape sequence (*note Escape Sequences::).
 
@@ -16854,7 +17019,7 @@ minor node lists them in the order they were added to `gawk'.  They can
 all be disabled with either the `--traditional' or `--posix' options
 (*note Options::).
 
-Version 2.10 of `gawk' introduced the following features:
+   Version 2.10 of `gawk' introduced the following features:
 
    * The `AWKPATH' environment variable for specifying a path search for
      the `-f' command-line option (*note Options::).
@@ -16865,7 +17030,7 @@ Version 2.10 of `gawk' introduced the following features:
    * The `/dev/stdin', `/dev/stdout', `/dev/stderr' and `/dev/fd/N'
      special file names (*note Special Files::).
 
-Version 2.13 of `gawk' introduced the following features:
+   Version 2.13 of `gawk' introduced the following features:
 
    * The `FIELDWIDTHS' variable and its effects (*note Constant Size::).
 
@@ -16880,12 +17045,12 @@ Version 2.13 of `gawk' introduced the following features:
 
    * The `-W posix' option for full POSIX compliance (*note Options::).
 
-Version 2.14 of `gawk' introduced the following feature:
+   Version 2.14 of `gawk' introduced the following feature:
 
    * The `next file' statement for skipping to the next data file
      (*note Nextfile Statement::).
 
-Version 2.15 of `gawk' introduced the following features:
+   Version 2.15 of `gawk' introduced the following features:
 
    * The `ARGIND' variable, which tracks the movement of `FILENAME'
      through `ARGV'  (*note Built-in Variables::).
@@ -16905,7 +17070,7 @@ Version 2.15 of `gawk' introduced the following features:
    * The `--source' option for mixing command-line and library-file
      source code (*note Options::).
 
-Version 3.0 of `gawk' introduced the following features:
+   Version 3.0 of `gawk' introduced the following features:
 
    * `IGNORECASE' changed, now applying to string comparison as well as
      regexp operations (*note Case-sensitivity::).
@@ -16949,7 +17114,7 @@ Version 3.0 of `gawk' introduced the following features:
    * Amiga support (*note Amiga Installation::).
 
 
-Version 3.1 of `gawk' introduced the following features:
+   Version 3.1 of `gawk' introduced the following features:
 
    * The `BINMODE' special variable for non-POSIX systems, which allows
      binary I/O for input and/or output files (*note PC Using::).
@@ -16962,7 +17127,7 @@ Version 3.1 of `gawk' introduced the following features:
 
    * The `TEXTDOMAIN' special variable for setting an application's
      internationalization text domain (*note Built-in Variables::, and
-     *Note Internationalization::).
+     *note Internationalization::).
 
    * The ability to use octal and hexadecimal constants in `awk'
      program source code (*note Nondecimal-numbers::).
@@ -17015,10 +17180,17 @@ Version 3.1 of `gawk' introduced the following features:
      `gawk', for producing execution profiles of `awk' programs (*note
      Profiling::).
 
+   * The `--use-lc-numeric' option to force `gawk' to use the locale's
+     decimal point for parsing input data (*note Conversion::).
+
    * The `--enable-portals' configuration option to enable special
      treatment of pathnames that begin with `/p' as BSD portals (*note
      Portal Files::).
 
+   * The `--disable-directories-fatal' configuration option which
+     causes `gawk' to silently skip directories named on the command
+     line (*note Additional Configuration Options::).
+
    * The use of GNU Automake to help in standardizing the configuration
      process (*note Quick Installation::).
 
@@ -17040,12 +17212,15 @@ Version 3.1 of `gawk' introduced the following features:
 
    * POSIX compliance for `sub' and `gsub' (*note Gory Details::).
 
-   * The `--exec' option, for use in CGI scripts.  (*note Options::).
+   * The `--exec' option, for use in CGI scripts (*note Options::).
 
    * The `length' function was extended to accept an array argument and
      return the number of elements in the array (*note String
      Functions::).
 
+   * The `strftime' function acquired a third argument to enable
+     printing times as UTC (*note Time Functions::).
+
 
 
 File: gawk.info,  Node: Contributors,  Prev: POSIX/GNU,  Up: Language History
@@ -17056,7 +17231,7 @@ A.6 Major Contributors to `gawk'
      Always give credit where credit is due.
      Anonymous
 
-This minor node names the major contributors to `gawk' and/or this
+   This minor node names the major contributors to `gawk' and/or this
 Info file, in approximate chronological order:
 
    * Dr. Alfred V. Aho, Dr. Peter J. Weinberger, and Dr. Brian W.
@@ -17115,8 +17290,9 @@ Info file, in approximate chronological order:
      networking code and documentation, and motivated the inclusion of
      the `|&' operator.
 
-   * Stephen Davies provided the port to Tandem systems and its
-     documentation.
+   * Stephen Davies provided the initial port to Tandem systems and its
+     documentation.  Matthew Woehlke provided improvements for Tandem's
+     POSIX-compliant systems.
 
    * Martin Brown provided the port to BeOS and its documentation.
 
@@ -17208,8 +17384,8 @@ There are three ways to get GNU software:
    * Retrieve `gawk' by using anonymous `ftp' to the Internet host
      `ftp.gnu.org', in the directory `/gnu/gawk'.
 
-The GNU software archive is mirrored around the world.  The up-to-date
-list of mirror sites is available from the main FSF web site
+   The GNU software archive is mirrored around the world.  The
+up-to-date list of mirror sites is available from the main FSF web site
 (http://www.gnu.org/order/ftp.html).  Try to use one of the mirrors;
 they will be less busy, and you can usually find one closer to your
 site.
@@ -17223,20 +17399,20 @@ B.1.2 Extracting the Distribution
 `gawk' is distributed as a `tar' file compressed with the GNU Zip
 program, `gzip'.
 
-Once you have the distribution (for example, `gawk-3.1.5.tar.gz'), use
-`gzip' to expand the file and then use `tar' to extract it.  You can
-use the following pipeline to produce the `gawk' distribution:
+   Once you have the distribution (for example, `gawk-3.1.6.tar.gz'),
+use `gzip' to expand the file and then use `tar' to extract it.  You
+can use the following pipeline to produce the `gawk' distribution:
 
      # Under System V, add 'o' to the tar options
-     gzip -d -c gawk-3.1.5.tar.gz | tar -xvpf -
+     gzip -d -c gawk-3.1.6.tar.gz | tar -xvpf -
 
-This creates a directory named `gawk-3.1.5' in the current directory.
+This creates a directory named `gawk-3.1.6' in the current directory.
 
-The distribution file name is of the form `gawk-V.R.P.tar.gz'.  The V
-represents the major version of `gawk', the R represents the current
+   The distribution file name is of the form `gawk-V.R.P.tar.gz'.  The
+V represents the major version of `gawk', the R represents the current
 release of version V, and the P represents a "patch level", meaning
 that minor bugs have been fixed in the release.  The current patch
-level is 5, but when retrieving distributions, you should get the
+level is 6, but when retrieving distributions, you should get the
 version with the highest version, release, and patch level.  (Note,
 however, that patch levels greater than or equal to 80 denote "beta" or
 nonproduction software; you might not want to retrieve such a version
@@ -17330,7 +17506,7 @@ Various `.c', `.y', and `.h' files
 
 `doc/igawk.1'
      The `troff' source for a manual page describing the `igawk'
-     program presented in *Note Igawk Program::.
+     program presented in *note Igawk Program::.
 
 `doc/Makefile.in'
      The input file used during the configuration process to generate
@@ -17352,7 +17528,7 @@ Various `.c', `.y', and `.h' files
 `missing_d/*'
 `m4/*'
      These files and subdirectories are used when configuring `gawk'
-     for various Unix systems.  They are explained in *Note Unix
+     for various Unix systems.  They are explained in *note Unix
      Installation::.
 
 `po/*'
@@ -17367,8 +17543,8 @@ Various `.c', `.y', and `.h' files
      programs from the Texinfo source file for this Info file. It also
      contains a `Makefile.in' file, which `configure' uses to generate
      a `Makefile'.  `Makefile.am' is used by GNU Automake to create
-     `Makefile.in'.  The library functions from *Note Library
-     Functions::, and the `igawk' program from *Note Igawk Program::,
+     `Makefile.in'.  The library functions from *note Library
+     Functions::, and the `igawk' program from *note Igawk Program::,
      are included as ready-to-use files in the `gawk' distribution.
      They are installed as part of the installation process.  The rest
      of the programs in this Info file are available in appropriate
@@ -17422,30 +17598,32 @@ B.2.1 Compiling `gawk' for Unix
 -------------------------------
 
 After you have extracted the `gawk' distribution, `cd' to
-`gawk-3.1.5'.  Like most GNU software, `gawk' is configured
+`gawk-3.1.6'.  Like most GNU software, `gawk' is configured
 automatically for your Unix system by running the `configure' program.
 This program is a Bourne shell script that is generated automatically
 using GNU `autoconf'.  (The `autoconf' software is described fully
-starting with *Note Top::.)
+starting with *note Top::.)
 
-To configure `gawk', simply run `configure':
+   To configure `gawk', simply run `configure':
 
      sh ./configure
 
-This produces a `Makefile' and `config.h' tailored to your system.  The
-`config.h' file describes various facts about your system.  You might
-want to edit the `Makefile' to change the `CFLAGS' variable, which
-controls the command-line options that are passed to the C compiler
-(such as optimization levels or compiling for debugging).
+   This produces a `Makefile' and `config.h' tailored to your system.
+The `config.h' file describes various facts about your system.  You
+might want to edit the `Makefile' to change the `CFLAGS' variable,
+which controls the command-line options that are passed to the C
+compiler (such as optimization levels or compiling for debugging).
 
-Alternatively, you can add your own values for most `make' variables on
-the command line, such as `CC' and `CFLAGS', when running `configure':
+   Alternatively, you can add your own values for most `make' variables
+on the command line, such as `CC' and `CFLAGS', when running
+`configure':
 
      CC=cc CFLAGS=-g sh ./configure
 
 See the file `INSTALL' in the `gawk' distribution for all the details.
 
-After you have run `configure' and possibly edited the `Makefile', type:
+   After you have run `configure' and possibly edited the `Makefile',
+type:
 
      make
 
@@ -17494,9 +17672,13 @@ command line when compiling `gawk' from scratch, including:
      desirable, but it may bring you some slight performance
      improvement.
 
-As of version 3.1.5, the `--with-included-gettext' configuration option
-is no longer available, since `gawk' expects the GNU `gettext' library
-to be installed as an external library.
+`--disable-directories-fatal'
+     Causes `gawk' to silently skip directories named on the command
+     line.
+
+   As of version 3.1.5, the `--with-included-gettext' configuration
+option is no longer available, since `gawk' expects the GNU `gettext'
+library to be installed as an external library.
 
 
 File: gawk.info,  Node: Configuration Philosophy,  Prev: Additional Configuration Options,  Up: Unix Installation
@@ -17507,19 +17689,19 @@ B.2.3 The Configuration Process
 This minor node is of interest only if you know something about using
 the C language and the Unix operating system.
 
-The source code for `gawk' generally attempts to adhere to formal
+   The source code for `gawk' generally attempts to adhere to formal
 standards wherever possible.  This means that `gawk' uses library
 routines that are specified by the ISO C standard and by the POSIX
 operating system interface standard.  When using an ISO C compiler,
 function prototypes are used to help improve the compile-time checking.
 
-Many Unix systems do not support all of either the ISO or the POSIX
+   Many Unix systems do not support all of either the ISO or the POSIX
 standards.  The `missing_d' subdirectory in the `gawk' distribution
 contains replacement versions of those functions that are most likely
 to be missing.
 
-The `config.h' file that `configure' creates contains definitions that
-describe features of the particular operating system where you are
+   The `config.h' file that `configure' creates contains definitions
+that describe features of the particular operating system where you are
 attempting to compile `gawk'.  The three things described by this file
 are: what header files are available, so that they can be correctly
 included, what (supposedly) standard functions are actually available
@@ -17527,15 +17709,15 @@ in your C libraries, and various miscellaneous facts about your variant
 of Unix.  For example, there may not be an `st_blksize' element in the
 `stat' structure.  In this case, `HAVE_ST_BLKSIZE' is undefined.
 
-It is possible for your C compiler to lie to `configure'. It may do so
-by not exiting with an error when a library function is not available.
-To get around this, edit the file `custom.h'.  Use an `#ifdef' that is
-appropriate for your system, and either `#define' any constants that
-`configure' should have defined but didn't, or `#undef' any constants
-that `configure' defined and should not have.  `custom.h' is
-automatically included by `config.h'.
+   It is possible for your C compiler to lie to `configure'. It may do
+so by not exiting with an error when a library function is not
+available.  To get around this, edit the file `custom.h'.  Use an
+`#ifdef' that is appropriate for your system, and either `#define' any
+constants that `configure' should have defined but didn't, or `#undef'
+any constants that `configure' defined and should not have.  `custom.h'
+is automatically included by `config.h'.
 
-It is also possible that the `configure' program generated by
+   It is also possible that the `configure' program generated by
 `autoconf' will not work on your system in some other fashion.  If you
 do have a problem, the file `configure.in' is the input for `autoconf'.
 You may be able to change this file and generate a new version of
@@ -17572,7 +17754,7 @@ the directory `pub/ade/current'.  This includes a shell based on
 `pdksh'.  The primary component of this environment is a Unix emulation
 library, `ixemul.lib'.
 
-A more complete distribution for the Amiga is available on the Geek
+   A more complete distribution for the Amiga is available on the Geek
 Gadgets CD-ROM, available from:
 
      CRONUS
@@ -17585,13 +17767,13 @@ Gadgets CD-ROM, available from:
      WWW: `http://www.ninemoons.com'
      Anonymous `ftp' site: `ftp.ninemoons.com'
 
-Once you have the distribution, you can configure `gawk' simply by
+   Once you have the distribution, you can configure `gawk' simply by
 running `configure':
 
      configure -v m68k-amigaos
 
-Then run `make' and you should be all set!  If these steps do not work,
-please send in a bug report (*note Bugs::).
+   Then run `make' and you should be all set!  If these steps do not
+work, please send in a bug report (*note Bugs::).
 
 
 File: gawk.info,  Node: BeOS Installation,  Next: PC Installation,  Prev: Amiga Installation,  Up: Non-Unix Installation
@@ -17604,24 +17786,24 @@ included with BeOS. The process is basically identical to the Unix
 process of running `configure' and then `make'. Full instructions are
 given below.
 
-You can compile `gawk' under BeOS by extracting the standard sources
+   You can compile `gawk' under BeOS by extracting the standard sources
 and running `configure'. You _must_ specify the location prefix for the
 installation directory. For BeOS DR9 and beyond, the best directory to
 use is `/boot/home/config', so the `configure' command is:
 
      configure --prefix=/boot/home/config
 
-This installs the compiled application into `/boot/home/config/bin',
+   This installs the compiled application into `/boot/home/config/bin',
 which is already specified in the standard `PATH'.
 
-Once the configuration process is completed, you can run `make', and
+   Once the configuration process is completed, you can run `make', and
 then `make install':
 
      $ make
      ...
      $ make install
 
-BeOS uses `bash' as its shell; thus, you use `gawk' the same way you
+   BeOS uses `bash' as its shell; thus, you use `gawk' the same way you
 would under Unix.  If these steps do not work, please send in a bug
 report (*note Bugs::).
 
@@ -17635,8 +17817,8 @@ This minor node covers installation and usage of `gawk' on x86 machines
 running DOS, any version of Windows, or OS/2.  In this minor node, the
 term "Windows32" refers to any of Windows-95/98/ME/NT/2000.
 
-The limitations of DOS (and DOS shells under Windows or OS/2) has meant
-that various "DOS extenders" are often used with programs such as
+   The limitations of DOS (and DOS shells under Windows or OS/2) has
+meant that various "DOS extenders" are often used with programs such as
 `gawk'.  The varying capabilities of Microsoft Windows 3.1 and
 Windows32 can add to the confusion.  For an overview of the
 considerations, please refer to `README_d/README.pc' in the
@@ -17668,11 +17850,11 @@ files can be installed anywhere provided `AWKPATH' is set properly.
 Regardless of the installation directory, the first line of `igawk.cmd'
 and `igawk.bat' (in `gnu/bin') may need to be edited.
 
-The binary distribution contains a separate file describing the
+   The binary distribution contains a separate file describing the
 contents. In particular, it may include more than one version of the
 `gawk' executable.
 
-OS/2 (32 bit, EMX) binary distributions are prepared for the `/usr'
+   OS/2 (32 bit, EMX) binary distributions are prepared for the `/usr'
 directory of your preferred drive. Set `UNIXROOT' to your installation
 drive (e.g., `e:') if you want to install `gawk' onto another drive
 than the hardcoded default `c:'. Executables appear in `/usr/bin',
@@ -17685,10 +17867,10 @@ commands at your prompt (replace `x:' by your installation drive):
      install-info --info-dir=x:/usr/info x:/usr/info/gawk.info
      install-info --info-dir=x:/usr/info x:/usr/info/gawkinet.info
 
-However, the files can be installed anywhere provided `AWKPATH' is set
-properly.
+   However, the files can be installed anywhere provided `AWKPATH' is
+set properly.
 
-The binary distribution may contain a separate file containing
+   The binary distribution may contain a separate file containing
 additional or more detailed installation instructions.
 
 
@@ -17707,38 +17889,38 @@ it.)  The file `README_d/README.pc' in the `gawk' distribution contains
 additional notes, and `pc/Makefile' contains important information on
 compilation options.
 
-To build `gawk' for MS-DOS, Windows32, and OS/2 (16 bit only; for 32 bit
-(EMX) you can use the `configure' script and skip the following
+   To build `gawk' for MS-DOS, Windows32, and OS/2 (16 bit only; for 32
+bit (EMX) you can use the `configure' script and skip the following
 paragraphs; for details see below), copy the files in the `pc'
 directory (_except_ for `ChangeLog') to the directory with the rest of
 the `gawk' sources. The `Makefile' contains a configuration section
 with comments and may need to be edited in order to work with your
 `make' utility.
 
-The `Makefile' contains a number of targets for building various MS-DOS,
-Windows32, and OS/2 versions. A list of targets is printed if the `make'
-command is given without a target. As an example, to build `gawk' using
-the DJGPP tools, enter `make djgpp'.  (The DJGPP tools may be found at
-`ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/'.)
-
-Using `make' to run the standard tests and to install `gawk' requires
-additional Unix-like tools, including `sh', `sed', and `cp'. In order
-to run the tests, the `test/*.ok' files may need to be converted so
-that they have the usual DOS-style end-of-line markers. Most of the
-tests work properly with Stewartson's shell along with the companion
-utilities or appropriate GNU utilities.  However, some editing of
-`test/Makefile' is required. It is recommended that you copy the file
-`pc/Makefile.tst' over the file `test/Makefile' as a replacement.
-Details can be found in `README_d/README.pc' and in the file
-`pc/Makefile.tst'.
-
-The 32 bit EMX version of `gawk' works "out of the box" under OS/2.  In
-principle, it is possible to compile `gawk' the following way:
+   The `Makefile' contains a number of targets for building various
+MS-DOS, Windows32, and OS/2 versions. A list of targets is printed if
+the `make' command is given without a target. As an example, to build
+`gawk' using the DJGPP tools, enter `make djgpp'.  (The DJGPP tools may
+be found at `ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/'.)
+
+   Using `make' to run the standard tests and to install `gawk'
+requires additional Unix-like tools, including `sh', `sed', and `cp'.
+In order to run the tests, the `test/*.ok' files may need to be
+converted so that they have the usual DOS-style end-of-line markers.
+Most of the tests work properly with Stewartson's shell along with the
+companion utilities or appropriate GNU utilities.  However, some
+editing of `test/Makefile' is required. It is recommended that you copy
+the file `pc/Makefile.tst' over the file `test/Makefile' as a
+replacement. Details can be found in `README_d/README.pc' and in the
+file `pc/Makefile.tst'.
+
+   The 32 bit EMX version of `gawk' works "out of the box" under OS/2.
+In principle, it is possible to compile `gawk' the following way:
 
      $ ./configure
      $ make
 
-This is not recommended, though. To get an OMF executable you should
+   This is not recommended, though. To get an OMF executable you should
 use the following commands at your `sh' prompt:
 
      $ CPPFLAGS="-D__ST_MT_ERRNO__"
@@ -17752,19 +17934,19 @@ use the following commands at your `sh' prompt:
      $ ./configure --prefix=c:/usr --without-included-gettext
      $ make AR=emxomfar
 
-These are just suggestions. You may use any other set of
+   These are just suggestions. You may use any other set of
 (self-consistent) environment variables and compiler flags.
 
-To get an FHS-compliant file hierarchy it is recommended to use the
+   To get an FHS-compliant file hierarchy it is recommended to use the
 additional `configure' options `--infodir=c:/usr/share/info',
 `--mandir=c:/usr/share/man' and `--libexecdir=c:/usr/lib'.
 
-If you use GCC 2.95 it is recommended to use also:
+   If you use GCC 2.95 it is recommended to use also:
 
      $ LIBS="-lgcc"
      $ export LIBS
 
-You can also get an `a.out' executable if you prefer:
+   You can also get an `a.out' executable if you prefer:
 
      $ CPPFLAGS="-D__ST_MT_ERRNO__"
      $ export CPPFLAGS
@@ -17785,12 +17967,12 @@ You can also get an `a.out' executable if you prefer:
      added to `CPPFLAGS'.  But then some nonstandard extensions of
      `gawk' (e.g., `|&') do not work!
 
-After compilation the internal tests can be performed. Enter `make
+   After compilation the internal tests can be performed. Enter `make
 check CMP="diff -a"' at your command prompt. All tests except for the
 `pid' test are expected to work properly.  The `pid' test fails because
 child processes are not started by `fork()'.
 
-`make install' works as expected.
+   `make install' works as expected.
 
      NOTE: Most OS/2 ports of GNU `make' are not able to handle the
      Makefiles of this package. If you encounter any problems with
@@ -17809,22 +17991,22 @@ definitions of `DYN_FLAGS', `DYN_EXP', `DYN_OBJ', and `DYN_MAKEXP' in
 the configuration section of the `Makefile'. There are two definitions
 for `DYN_MAKEXP': pick the one that matches your target.
 
-To build some of the example extension libraries, `cd' to the extension
-directory and copy `Makefile.pc' to `Makefile'. You can then build
-using the same two targets. To run the example `awk' scripts, you'll
-need to either change the call to the `extension' function to match the
-name of the library (for instance, change `"./ordchr.so"' to
+   To build some of the example extension libraries, `cd' to the
+extension directory and copy `Makefile.pc' to `Makefile'. You can then
+build using the same two targets. To run the example `awk' scripts,
+you'll need to either change the call to the `extension' function to
+match the name of the library (for instance, change `"./ordchr.so"' to
 `"ordchr.dll"' or simply `"ordchr"'), or rename the library to match
 the call (for instance, rename `ordchr.dll' to `ordchr.so').
 
-If you build `gawk.exe' with one compiler but want to build an
+   If you build `gawk.exe' with one compiler but want to build an
 extension library with the other, you need to copy the import library.
 Visual C uses a library called `gawk.lib', while MinGW uses a library
 called `libgawk.a'. These files are equivalent and will interoperate if
 you give them the correct name.  The resulting shared libraries are
 also interoperable.
 
-To create your own extension library, you can use the examples as
+   To create your own extension library, you can use the examples as
 models, but you're essentially on your own. Post to `comp.lang.awk' or
 send electronic mail to <ptjm@interlog.com> if you have problems getting
 started. If you need to access functions or variables which are not
@@ -17832,7 +18014,7 @@ exported by `gawk.exe', add them to `gawkw32.def' and rebuild. You
 should also add `ATTRIBUTE_EXPORTED' to the declaration in `awk.h' of
 any variables you add to `gawkw32.def'.
 
-Note that extension libraries have the name of the `awk' executable
+   Note that extension libraries have the name of the `awk' executable
 embedded in them at link time, so they will work only with `gawk.exe'.
 In particular, they won't work if you rename `gawk.exe' to `awk.exe' or
 if you try to use `pgawk.exe'. You can perform profiling by temporarily
@@ -17840,9 +18022,9 @@ renaming `pgawk.exe' to `gawk.exe'. You can resolve this problem by
 changing the program name in the definition of `DYN_MAKEXP' for your
 compiler.
 
-On Windows32, libraries are sought first in the current directory, then
-in the directory containing `gawk.exe', and finally through the `PATH'
-environment variable.
+   On Windows32, libraries are sought first in the current directory,
+then in the directory containing `gawk.exe', and finally through the
+`PATH' environment variable.
 
 
 File: gawk.info,  Node: PC Using,  Next: Cygwin,  Prev: PC Dynamic,  Up: PC Installation
@@ -17855,13 +18037,13 @@ TCP/IP networking (*note TCP/IP Networking::) are not supported for
 MS-DOS or MS-Windows. EMX (OS/2 only) does support at least the `|&'
 operator.
 
-The OS/2 and MS-DOS versions of `gawk' search for program files as
-described in *Note AWKPATH Variable::.  However, semicolons (rather
+   The OS/2 and MS-DOS versions of `gawk' search for program files as
+described in *note AWKPATH Variable::.  However, semicolons (rather
 than colons) separate elements in the `AWKPATH' variable. If `AWKPATH'
 is not set or is empty, then the default search path for OS/2 (16 bit)
 and MS-DOS versions is `".;c:/lib/awk;c:/gnu/lib/awk"'.
 
-The search path for OS/2 (32 bit, EMX) is determined by the prefix
+   The search path for OS/2 (32 bit, EMX) is determined by the prefix
 directory (most likely `/usr' or `c:/usr') that has been specified as
 an option of the `configure' script like it is the case for the Unix
 versions.  If `c:/usr' is the prefix directory then the default search
@@ -17873,7 +18055,7 @@ specific drive is also searched for program files.  E.g., if `UNIXROOT'
 is set to `e:' the complete default search path is
 `".;c:/usr/share/awk;e:/usr/share/awk"'.
 
-An `sh'-like shell (as opposed to `command.com' under MS-DOS or
+   An `sh'-like shell (as opposed to `command.com' under MS-DOS or
 `cmd.exe' under OS/2) may be useful for `awk' programming.  Ian
 Stewartson has written an excellent shell for MS-DOS and OS/2, Daisuke
 Aoyama has ported GNU `bash' to MS-DOS using the DJGPP tools, and
@@ -17884,7 +18066,7 @@ documentation for handling command lines; in particular, the setting
 for `gawk' in the shell configuration may need to be changed and the
 `ignoretype' option may also be of interest.
 
-Under OS/2 and DOS, `gawk' (and many other text programs) silently
+   Under OS/2 and DOS, `gawk' (and many other text programs) silently
 translate end-of-line `"\r\n"' to `"\n"' on input and `"\n"' to
 `"\r\n"' on output.  A special `BINMODE' variable allows control over
 these translations and is interpreted as follows:
@@ -17909,18 +18091,18 @@ accomplished by using an appropriate `-v BINMODE=N' option on the
 command line.  `BINMODE' is set at the time a file or pipe is opened
 and cannot be changed mid-stream.
 
-The name `BINMODE' was chosen to match `mawk' (*note Other Versions::).
-Both `mawk' and `gawk' handle `BINMODE' similarly; however, `mawk' adds
-a `-W BINMODE=N' option and an environment variable that can set
-`BINMODE', `RS', and `ORS'.  The files `binmode[1-3].awk' (under
-`gnu/lib/awk' in some of the prepared distributions) have been chosen
-to match `mawk''s `-W BINMODE=N' option.  These can be changed or
-discarded; in particular, the setting of `RS' giving the fewest
-"surprises" is open to debate.  `mawk' uses `RS = "\r\n"' if binary
-mode is set on read, which is appropriate for files with the DOS-style
-end-of-line.
-
-To illustrate, the following examples set binary mode on writes for
+   The name `BINMODE' was chosen to match `mawk' (*note Other
+Versions::).  Both `mawk' and `gawk' handle `BINMODE' similarly;
+however, `mawk' adds a `-W BINMODE=N' option and an environment
+variable that can set `BINMODE', `RS', and `ORS'.  The files
+`binmode[1-3].awk' (under `gnu/lib/awk' in some of the prepared
+distributions) have been chosen to match `mawk''s `-W BINMODE=N'
+option.  These can be changed or discarded; in particular, the setting
+of `RS' giving the fewest "surprises" is open to debate.  `mawk' uses
+`RS = "\r\n"' if binary mode is set on read, which is appropriate for
+files with the DOS-style end-of-line.
+
+   To illustrate, the following examples set binary mode on writes for
 standard output and other files, and set `ORS' as the "usual" DOS-style
 end-of-line:
 
@@ -17955,22 +18137,22 @@ simulation of Unix, using the GNU tools, such as `bash', the GNU
 Compiler Collection (GCC), GNU Make, and other GNU tools.  Compilation
 and installation for Cygwin is the same as for a Unix system:
 
-     tar -xvpzf gawk-3.1.5.tar.gz
-     cd gawk-3.1.5
+     tar -xvpzf gawk-3.1.6.tar.gz
+     cd gawk-3.1.6
      ./configure
      make
 
-When compared to GNU/Linux on the same system, the `configure' step on
-Cygwin takes considerably longer.  However, it does finish, and then
+   When compared to GNU/Linux on the same system, the `configure' step
+on Cygwin takes considerably longer.  However, it does finish, and then
 the `make' proceeds as usual.
 
      NOTE: The `|&' operator and TCP/IP networking (*note TCP/IP
      Networking::) are fully supported in the Cygwin environment.  This
      is not true for any other environment for MS-DOS or MS-Windows.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) `http://www.cygwin.com'
+   (1) `http://www.cygwin.com'
 
 
 File: gawk.info,  Node: VMS Installation,  Prev: PC Installation,  Up: Non-Unix Installation
@@ -17986,6 +18168,7 @@ This node describes how to compile and install `gawk' under VMS.
 * VMS Installation Details::    How to install `gawk' under VMS.
 * VMS Running::                 How to run `gawk' under VMS.
 * VMS POSIX::                   Alternate instructions for VMS POSIX.
+* VMS Old Gawk::                An old version comes with some VMS systems.
 
 
 File: gawk.info,  Node: VMS Compilation,  Next: VMS Installation Details,  Up: VMS Installation
@@ -18004,7 +18187,7 @@ or:
 
      $ MMS/DESCRIPTION=[.VMS]DESCRIP.MMS GAWK
 
-Depending upon which C compiler you are using, follow one of the sets
+   Depending upon which C compiler you are using, follow one of the sets
 of instructions in this table:
 
 VAX C V3.x
@@ -18028,8 +18211,9 @@ DEC C
      Edit `vmsbuild.com' or `descrip.mms' according to their comments.
      No changes to `config.h' are needed.
 
-`gawk' has been tested under VAX/VMS 5.5-1 using VAX C V3.2, and GNU C
-1.40 and 2.3.  It should work without modifications for VMS V4.6 and up.
+   `gawk' has been tested under VAX/VMS 5.5-1 using VAX C V3.2, and GNU
+C 1.40 and 2.3.  It should work without modifications for VMS V4.6 and
+up.
 
 
 File: gawk.info,  Node: VMS Installation Details,  Next: VMS Running,  Prev: VMS Compilation,  Up: VMS Installation
@@ -18048,7 +18232,7 @@ symbol should be placed in the `login.com' of any user who wants to run
 Alternatively, the symbol may be placed in the system-wide
 `sylogin.com' procedure, which allows all users to run `gawk'.
 
-Optionally, the help entry can be loaded into a VMS help library:
+   Optionally, the help entry can be loaded into a VMS help library:
 
      $ LIBRARY/HELP SYS$HELP:HELPLIB [.VMS]GAWK.HLP
 
@@ -18061,7 +18245,7 @@ command:
 provides information about both the `gawk' implementation and the `awk'
 programming language.
 
-The logical name `AWK_LIBRARY' can designate a default location for
+   The logical name `AWK_LIBRARY' can designate a default location for
 `awk' program files.  For the `-f' option, if the specified file name
 has no device or directory path information in it, `gawk' looks in the
 current directory first, then in the directory specified by the
@@ -18082,7 +18266,7 @@ on VMS, so examples in this Info file or from other sources often need
 minor changes.  They _are_ minor though, and all `awk' programs should
 run correctly.
 
-Here are a couple of trivial tests:
+   Here are a couple of trivial tests:
 
      $ gawk -- "BEGIN {print ""Hello, World!""}"
      $ gawk -"W" version
@@ -18090,8 +18274,8 @@ Here are a couple of trivial tests:
 
 Note that uppercase and mixed-case text must be quoted.
 
-The VMS port of `gawk' includes a `DCL'-style interface in addition to
-the original shell-style interface (see the help entry for details).
+   The VMS port of `gawk' includes a `DCL'-style interface in addition
+to the original shell-style interface (see the help entry for details).
 One side effect of dual command-line parsing is that if there is only a
 single parameter (as in the quoted string program above), the command
 becomes ambiguous.  To work around this, the normally optional `--'
@@ -18099,15 +18283,15 @@ flag is required to force Unix style rather than `DCL' parsing.  If any
 other dash-type options (or multiple parameters such as data files to
 process) are present, there is no ambiguity and `--' can be omitted.
 
-The default search path, when looking for `awk' program files specified
-by the `-f' option, is `"SYS$DISK:[],AWK_LIBRARY:"'.  The logical name
-`AWKPATH' can be used to override this default.  The format of
-`AWKPATH' is a comma-separated list of directory specifications.  When
-defining it, the value should be quoted so that it retains a single
+   The default search path, when looking for `awk' program files
+specified by the `-f' option, is `"SYS$DISK:[],AWK_LIBRARY:"'.  The
+logical name `AWKPATH' can be used to override this default.  The format
+of `AWKPATH' is a comma-separated list of directory specifications.
+When defining it, the value should be quoted so that it retains a single
 translation and not a multitranslation `RMS' searchlist.
 
 
-File: gawk.info,  Node: VMS POSIX,  Prev: VMS Running,  Up: VMS Installation
+File: gawk.info,  Node: VMS POSIX,  Next: VMS Old Gawk,  Prev: VMS Running,  Up: VMS Installation
 
 B.3.4.4 Building and Using `gawk' on VMS POSIX
 ..............................................
@@ -18129,13 +18313,28 @@ compiler directly; ignore any warnings from `make' about being unable
 to redefine `CC'.  `configure' takes a very long time to execute, but
 at least it provides incremental feedback as it runs.
 
-This has been tested with VAX/VMS V6.2, VMS POSIX V2.0, and DEC C V5.2.
+   This has been tested with VAX/VMS V6.2, VMS POSIX V2.0, and DEC C
+V5.2.
 
-Once built, `gawk' works like any other shell utility.  Unlike the
+   Once built, `gawk' works like any other shell utility.  Unlike the
 normal VMS port of `gawk', no special command-line manipulation is
 needed in the VMS POSIX environment.
 
 
+File: gawk.info,  Node: VMS Old Gawk,  Prev: VMS POSIX,  Up: VMS Installation
+
+B.3.4.5 Some VMS Systems Have An Old Version of `gawk'
+......................................................
+
+Some versions of VMS have an old version of `gawk'.  To access it,
+define a symbol, as follows:
+
+     $ gawk :== $ sys$common:[syshlp.examples.tcpip.snmp]gawk.exe
+
+   This is apparently version 2.15.6, which is quite old. We recommend
+compiling and using the current version.
+
+
 File: gawk.info,  Node: Unsupported,  Next: Bugs,  Prev: Non-Unix Installation,  Up: Installation
 
 B.4 Unsupported Operating System Ports
@@ -18158,13 +18357,13 @@ B.4.1 Installing `gawk' on the Atari ST
 The Atari port is no longer supported.  It is included for those who
 might want to use it but it is no longer being actively maintained.
 
-There are no substantial differences when installing `gawk' on various
-Atari models.  Compiled `gawk' executables do not require a large
-amount of memory with most `awk' programs, and should run on all
+   There are no substantial differences when installing `gawk' on
+various Atari models.  Compiled `gawk' executables do not require a
+large amount of memory with most `awk' programs, and should run on all
 Motorola processor-based models (called further ST, even if that is not
 exactly right).
 
-In order to use `gawk', you need to have a shell, either text or
+   In order to use `gawk', you need to have a shell, either text or
 graphics, that does not map all the characters of a command line to
 uppercase.  Maintaining case distinction in option flags is very
 important (*note Options::).  These days this is the default and it may
@@ -18190,28 +18389,28 @@ A proper compilation of `gawk' sources when `sizeof(int)' differs from
 with `gcc'.  You may actually prefer executables where `int's are four
 bytes wide but the other variant works as well.
 
-You may need quite a bit of memory when trying to recompile the `gawk'
-sources, as some source files (`regex.c' in particular) are quite big.
-If you run out of memory compiling such a file, try reducing the
+   You may need quite a bit of memory when trying to recompile the
+`gawk' sources, as some source files (`regex.c' in particular) are quite
+big.  If you run out of memory compiling such a file, try reducing the
 optimization level for this particular file, which may help.
 
-With a reasonable shell (`bash' will do), you have a pretty good chance
-that the `configure' utility will succeed, and in particular if you run
-GNU/Linux, MiNT or a similar operating system.  Otherwise sample
-versions of `config.h' and `Makefile.st' are given in the `atari'
-subdirectory and can be edited and copied to the corresponding files in
-the main source directory.  Even if `configure' produces something, it
-might be advisable to compare its results with the sample versions and
-possibly make adjustments.
+   With a reasonable shell (`bash' will do), you have a pretty good
+chance that the `configure' utility will succeed, and in particular if
+you run GNU/Linux, MiNT or a similar operating system.  Otherwise
+sample versions of `config.h' and `Makefile.st' are given in the
+`atari' subdirectory and can be edited and copied to the corresponding
+files in the main source directory.  Even if `configure' produces
+something, it might be advisable to compare its results with the sample
+versions and possibly make adjustments.
 
-Some `gawk' source code fragments depend on a preprocessor define
+   Some `gawk' source code fragments depend on a preprocessor define
 `atarist'.  This basically assumes the TOS environment with `gcc'.
 Modify these sections as appropriate if they are not right for your
 environment.  Also see the remarks about `AWKPATH' and `envsep' in
-*Note Atari Using::.
+*note Atari Using::.
 
-As shipped, the sample `config.h' claims that the `system' function is
-missing from the libraries, which is not true, and an alternative
+   As shipped, the sample `config.h' claims that the `system' function
+is missing from the libraries, which is not true, and an alternative
 implementation of this function is provided in
 `unsupported/atari/system.c'.  Depending upon your particular
 combination of shell and operating system, you might want to change the
@@ -18226,7 +18425,7 @@ B.4.1.2 Running `gawk' on the Atari ST
 An executable version of `gawk' should be placed, as usual, anywhere in
 your `PATH' where your shell can find it.
 
-While executing, the Atari version of `gawk' creates a number of
+   While executing, the Atari version of `gawk' creates a number of
 temporary files.  When using `gcc' libraries for TOS, `gawk' looks for
 either of the environment variables, `TEMP' or `TMPDIR', in that order.
 If either one is found, its value is assumed to be a directory for
@@ -18235,20 +18434,21 @@ memory, it is a good idea to put it on a RAM drive.  If neither `TEMP'
 nor `TMPDIR' are found, then `gawk' uses the current directory for its
 temporary files.
 
-The ST version of `gawk' searches for its program files, as described in
-*Note AWKPATH Variable::.  The default value for the `AWKPATH' variable
-is taken from `DEFPATH' defined in `Makefile'. The sample `gcc'/TOS
-`Makefile' for the ST in the distribution sets `DEFPATH' to
-`".,c:\lib\awk,c:\gnu\lib\awk"'.  The search path can be modified by
-explicitly setting `AWKPATH' to whatever you want.  Note that colons
-cannot be used on the ST to separate elements in the `AWKPATH'
-variable, since they have another reserved meaning.  Instead, you must
-use a comma to separate elements in the path.  When recompiling, the
-separating character can be modified by initializing the `envsep'
-variable in `unsupported/atari/gawkmisc.atr' to another value.
-
-Although `awk' allows great flexibility in doing I/O redirections from
-within a program, this facility should be used with care on the ST
+   The ST version of `gawk' searches for its program files, as
+described in *note AWKPATH Variable::.  The default value for the
+`AWKPATH' variable is taken from `DEFPATH' defined in `Makefile'. The
+sample `gcc'/TOS `Makefile' for the ST in the distribution sets
+`DEFPATH' to `".,c:\lib\awk,c:\gnu\lib\awk"'.  The search path can be
+modified by explicitly setting `AWKPATH' to whatever you want.  Note
+that colons cannot be used on the ST to separate elements in the
+`AWKPATH' variable, since they have another reserved meaning.  Instead,
+you must use a comma to separate elements in the path.  When
+recompiling, the separating character can be modified by initializing
+the `envsep' variable in `unsupported/atari/gawkmisc.atr' to another
+value.
+
+   Although `awk' allows great flexibility in doing I/O redirections
+from within a program, this facility should be used with care on the ST
 running under TOS.  In some circumstances, the OS routines for
 file-handle pool processing lose track of certain events, causing the
 computer to crash and requiring a reboot.  Often a warm reboot is
@@ -18258,7 +18458,7 @@ program using `print' statements explicitly redirected to
 `/dev/stdout', while other `print' statements use the default standard
 output, and a calling shell has redirected standard output to a file.
 
-When `gawk' is compiled with the ST version of `gcc' and its usual
+   When `gawk' is compiled with the ST version of `gcc' and its usual
 libraries, it accepts both `/' and `\' as path separators.  While this
 is convenient, it should be remembered that this removes one
 technically valid character (`/') from your file name.  It may also
@@ -18278,29 +18478,30 @@ B.4.2 Installing `gawk' on a Tandem
 The Tandem port is only minimally supported.  The port's contributor no
 longer has access to a Tandem system.
 
-The Tandem port was done on a Cyclone machine running D20.  The port is
-pretty clean and all facilities seem to work except for the I/O piping
-facilities (*note Getline/Pipe::, *Note Getline/Variable/Pipe::, and
-*Note Redirection::), which is just too foreign a concept for Tandem.
+   The Tandem port was done on a Cyclone machine running D20.  The port
+is pretty clean and all facilities seem to work except for the I/O
+piping facilities (*note Getline/Pipe::, *note Getline/Variable/Pipe::,
+and *note Redirection::), which is just too foreign a concept for
+Tandem.
 
-To build a Tandem executable from source, download all of the files so
-that the file names on the Tandem box conform to the restrictions of
+   To build a Tandem executable from source, download all of the files
+so that the file names on the Tandem box conform to the restrictions of
 D20.  For example, `array.c' becomes `ARRAYC', and `awk.h' becomes
 `AWKH'.  The totally Tandem-specific files are in the `tandem'
 "subvolume" (`unsupported/tandem' in the `gawk' distribution) and
 should be copied to the main source directory before building `gawk'.
 
-The file `compit' can then be used to compile and bind an executable.
+   The file `compit' can then be used to compile and bind an executable.
 Alas, there is no `configure' or `make'.
 
-Usage is the same as for Unix, except that D20 requires all `{' and `}'
-characters to be escaped with `~' on the command line (but _not_ in
+   Usage is the same as for Unix, except that D20 requires all `{' and
+`}' characters to be escaped with `~' on the command line (but _not_ in
 script files). Also, the standard Tandem syntax for `/in filename,out
 filename/' must be used instead of the usual Unix `<' and `>' for file
 redirection.  (Redirection options on `getline', `print' etc., are
 supported.)
 
-The `-mr VAL' option (*note Options::) has been "stolen" to enable
+   The `-mr VAL' option (*note Options::) has been "stolen" to enable
 Tandem users to process fixed-length records with no "end-of-line"
 character. That is, `-mr 74' tells `gawk' to read the input file as
 fixed 74-byte records.
@@ -18314,56 +18515,57 @@ B.5 Reporting Problems and Bugs
      There is nothing more dangerous than a bored archeologist.
      The Hitchhiker's Guide to the Galaxy
 
-If you have problems with `gawk' or think that you have found a bug,
+   If you have problems with `gawk' or think that you have found a bug,
 please report it to the developers; we cannot promise to do anything
 but we might well want to fix it.
 
-Before reporting a bug, make sure you have actually found a real bug.
+   Before reporting a bug, make sure you have actually found a real bug.
 Carefully reread the documentation and see if it really says you can do
 what you're trying to do.  If it's not clear whether you should be able
 to do something or not, report that too; it's a bug in the
 documentation!
 
-Before reporting a bug or trying to fix it yourself, try to isolate it
-to the smallest possible `awk' program and input data file that
+   Before reporting a bug or trying to fix it yourself, try to isolate
+it to the smallest possible `awk' program and input data file that
 reproduces the problem.  Then send us the program and data file, some
 idea of what kind of Unix system you're using, the compiler you used to
 compile `gawk', and the exact results `gawk' gave you.  Also say what
 you expected to occur; this helps us decide whether the problem is
 really in the documentation.
 
-Once you have a precise problem, send email to <bug-gawk@gnu.org>.
+   Once you have a precise problem, send email to <bug-gawk@gnu.org>.
 
-Please include the version number of `gawk' you are using.  You can get
-this information with the command `gawk --version'.  Using this address
-automatically sends a carbon copy of your mail to me.  If necessary, I
-can be reached directly at <arnold@gnu.org>.  The bug reporting address
-is preferred since the email list is archived at the GNU Project.  _All
-email should be in English, since that is my native language._
+   Please include the version number of `gawk' you are using.  You can
+get this information with the command `gawk --version'.  Using this
+address automatically sends a carbon copy of your mail to me.  If
+necessary, I can be reached directly at <arnold@skeeve.com>.  The bug
+reporting address is preferred since the email list is archived at the
+GNU Project.  _All email should be in English, since that is my native
+language._
 
-*Caution:* Do _not_ try to report bugs in `gawk' by posting to the
+   *Caution:* Do _not_ try to report bugs in `gawk' by posting to the
 Usenet/Internet newsgroup `comp.lang.awk'.  While the `gawk' developers
 do occasionally read this newsgroup, there is no guarantee that we will
 see your posting.  The steps described above are the official
 recognized ways for reporting bugs.
 
-Non-bug suggestions are always welcome as well.  If you have questions
-about things that are unclear in the documentation or are just obscure
-features, ask me; I will try to help you out, although I may not have
-the time to fix the problem.  You can send me electronic mail at the
-Internet address noted previously.
+   Non-bug suggestions are always welcome as well.  If you have
+questions about things that are unclear in the documentation or are
+just obscure features, ask me; I will try to help you out, although I
+may not have the time to fix the problem.  You can send me electronic
+mail at the Internet address noted previously.
 
-If you find bugs in one of the non-Unix ports of `gawk', please send an
-electronic mail message to the person who maintains that port.  They
+   If you find bugs in one of the non-Unix ports of `gawk', please send
+an electronic mail message to the person who maintains that port.  They
 are named in the following list, as well as in the `README' file in the
 `gawk' distribution.  Information in the `README' file should be
 considered authoritative if it conflicts with this Info file.
 
-The people maintaining the non-Unix ports of `gawk' are as follows:
+   The people maintaining the non-Unix ports of `gawk' are as follows:
 
 Amiga        Fred Fish, <fnf@ninemoons.com>.
 BeOS         Martin Brown, <mc@whoever.com>.
-MS-DOS       Scott Deifik, <scottd@amgen.com> and Darrel
+MS-DOS       Scott Deifik, <scottd.mail@sbcglobal.net> and Darrel
              Hankerson, <hankedr@mail.auburn.edu>.
 MS-Windows   Juan Grigera, <juan@biophnet.unlp.edu.ar>.
 OS/2         The Unix for OS/2 team,
@@ -18371,8 +18573,8 @@ OS/2         The Unix for OS/2 team,
 Tandem       Stephen Davies, <scldad@sdc.com.au>.
 VMS          Pat Rankin, <rankin@pactechdata.com>.
 
-If your bug is also reproducible under Unix, please send a copy of your
-report to the <bug-gawk@gnu.org> email list as well.
+   If your bug is also reproducible under Unix, please send a copy of
+your report to the <bug-gawk@gnu.org> email list as well.
 
 
 File: gawk.info,  Node: Other Versions,  Prev: Bugs,  Up: Installation
@@ -18384,8 +18586,8 @@ B.6 Other Freely Available `awk' Implementations
      `// Do C++ comments work? answer: yes! of course'
      Michael Brennan
 
-There are three other freely available `awk' implementations.  This
-minor node briefly describes where to get them:
+   There are a number of other freely available `awk' implementations.
+This minor node briefly describes where to get them:
 
 Unix `awk'
      Brian Kernighan has made his implementation of `awk' freely
@@ -18426,7 +18628,7 @@ Unix `awk'
           (*note I/O Functions::).
 
         * The `**' and `**=' operators (*note Arithmetic Ops:: and also
-          see *Note Assignment Ops::).
+          see *note Assignment Ops::).
 
         * The use of `func' as an abbreviation for `function' (*note
           Definition Syntax::).
@@ -18470,10 +18672,30 @@ Unix `awk'
      either `ftp://ftp.math.utah.edu/pub/pawk/pawk-20020210.tar.gz' or
      `http://www.math.utah.edu/pub/pawk/pawk-20020210.tar.gz'.
 
+The OpenSolaris POSIX `awk'
+     The version of `awk' in `/usr/xpg4/bin' on Solaris is POSIX
+     compliant. It is based on the `awk' from Mortice Kern Systems for
+     PCs.  The source code can be downloaded from the OpenSolaris web
+     site.(2) This author was able to make it compile and work under
+     GNU/Linux with 1-2 hours of work.  Making it more generally
+     portable (using GNU Autoconf and/or Automake) would take more
+     work, and this has not been done, at least to our knowledge.
+
+`jawk'
+     This is an interpreter for `awk' written in Java. It claims to be
+     a full interpreter, although because it uses Java facilities for
+     I/O and for regexp matching, the language it supports is different
+     from POSIX `awk'.  More information is available on the project's
+     home page.(3).
+
+
+   ---------- Footnotes ----------
 
----------- Footnotes ----------
+   (1) `http://cm.bell-labs.com/who/bwk'
 
-(1) `http://cm.bell-labs.com/who/bwk'
+   (2) `http://www.opensolaris.org'
+
+   (3) `http://jawk.sourceforge.net'
 
 
 File: gawk.info,  Node: Notes,  Next: Basic Concepts,  Prev: Installation,  Up: Top
@@ -18505,16 +18727,16 @@ language and program.  All of these features can be turned off by
 invoking `gawk' with the `--traditional' option or with the `--posix'
 option.
 
-If `gawk' is compiled for debugging with `-DDEBUG', then there is one
-more option available on the command line:
+   If `gawk' is compiled for debugging with `-DDEBUG', then there is
+one more option available on the command line:
 
 `-W parsedebug'
 `--parsedebug'
      Prints out the parse stack information as the program is being
      parsed.
 
-This option is intended only for serious `gawk' developers and not for
-the casual user.  It probably has not even been compiled into your
+   This option is intended only for serious `gawk' developers and not
+for the casual user.  It probably has not even been compiled into your
 version of `gawk', since it slows down execution.
 
 
@@ -18528,8 +18750,8 @@ you are perfectly free to do so.  That is the point of having free
 software; the source code is available and you are free to change it as
 you want (*note Copying::).
 
-This minor node discusses the ways you might want to change `gawk' as
-well as any considerations you should bear in mind.
+   This minor node discusses the ways you might want to change `gawk'
+as well as any considerations you should bear in mind.
 
 * Menu:
 
@@ -18666,8 +18888,8 @@ possible for me to include your changes:
      This helps further minimize the amount of work I have to do,
      making it easier for me to accept patches.
 
-Although this sounds like a lot of work, please remember that while you
-may write the new code, I have to maintain it and support it. If it
+   Although this sounds like a lot of work, please remember that while
+you may write the new code, I have to maintain it and support it. If it
 isn't possible for me to do that with a minimum of extra work, then I
 probably will not.
 
@@ -18680,7 +18902,7 @@ C.2.2 Porting `gawk' to a New Operating System
 If you want to port `gawk' to a new operating system, there are several
 steps:
 
-  1. Follow the guidelines in *Note Adding Code::, concerning coding
+  1. Follow the guidelines in *note Adding Code::, concerning coding
      style, submission of diffs, and so on.
 
   2. When doing a port, bear in mind that your code must coexist
@@ -18698,9 +18920,10 @@ steps:
      people at the Free Software Foundation.  Thus, you should not
      change them unless it is for a very good reason; i.e., changes are
      not out of the question, but changes to these files are
-     scrutinized extra carefully.  The files are `getopt.h', `getopt.c',
-     `getopt1.c', `regex.h', `regex.c', `dfa.h', `dfa.c', `install-sh',
-     and `mkinstalldirs'.
+     scrutinized extra carefully.  The files are `getopt.h',
+     `getopt.c', `getopt1.c', `regex.h', `regex.c', `regcomp.c',
+     `regex_internal.c', `regex_internal.h', `regexec.c', `dfa.h',
+     `dfa.c', `install-sh', and `mkinstalldirs'.
 
   4. Be willing to continue to maintain the port.  Non-Unix operating
      systems are supported by volunteers who maintain the code needed
@@ -18745,11 +18968,11 @@ steps:
      actions are easy to do and _many_ people have done so already. If
      you have questions, please contact me, or <gnu@gnu.org>.
 
-Following these steps makes it much easier to integrate your changes
+   Following these steps makes it much easier to integrate your changes
 into `gawk' and have them coexist happily with other operating systems'
 code that is already there.
 
-In the code that you supply and maintain, feel free to use a coding
+   In the code that you supply and maintain, feel free to use a coding
 style and brace layout that suits your taste.
 
 
@@ -18762,21 +18985,21 @@ C.3 Adding New Built-in Functions to `gawk'
      Warning! Warning!
      The Robot
 
-Beginning with `gawk' 3.1, it is possible to add new built-in functions
-to `gawk' using dynamically loaded libraries. This facility is
-available on systems (such as GNU/Linux) that support the `dlopen' and
-`dlsym' functions.  This minor node describes how to write and use
+   Beginning with `gawk' 3.1, it is possible to add new built-in
+functions to `gawk' using dynamically loaded libraries. This facility
+is available on systems (such as GNU/Linux) that support the `dlopen'
+and `dlsym' functions.  This minor node describes how to write and use
 dynamically loaded extensions for `gawk'.  Experience with programming
 in C or C++ is necessary when reading this minor node.
 
-*Caution:* The facilities described in this minor node are very much
+   *Caution:* The facilities described in this minor node are very much
 subject to change in a future `gawk' release.  Be aware that you may
 have to re-do everything, perhaps from scratch, at some future time.
 
-*Caution:* If you have written your own dynamic extensions, be sure to
-recompile them for each new `gawk' release.  There is no guarantee of
-binary compatibility between different releases, no will there ever be
-such a guarantee.
+   *Caution:* If you have written your own dynamic extensions, be sure
+to recompile them for each new `gawk' release.  There is no guarantee
+of binary compatibility between different releases, nor will there ever
+be such a guarantee.
 
 * Menu:
 
@@ -18798,7 +19021,7 @@ material presented here.  Of particular note are the files `awk.h',
 `builtin.c', and `eval.c'.  Reading `awkgram.y' in order to see how the
 parse tree is built would also be of use.
 
-With the disclaimers out of the way, the following types, structure
+   With the disclaimers out of the way, the following types, structure
 members, functions, and macros are declared in `awk.h' and are of use
 when writing extensions.  The next minor node shows how they are used:
 
@@ -18994,11 +19217,11 @@ when writing extensions.  The next minor node shows how they are used:
 
      *Caution:* This function is new as of `gawk' 3.1.5.
 
-An argument that is supposed to be an array needs to be handled with
+   An argument that is supposed to be an array needs to be handled with
 some extra code, in case the array being passed in is actually from a
 function parameter.
 
-In versions of `gawk' up to and including 3.1.2, the following
+   In versions of `gawk' up to and including 3.1.2, the following
 boilerplate code shows how to do this:
 
      NODE *the_arg;
@@ -19021,7 +19244,7 @@ boilerplate code shows how to do this:
      the_arg->type = Node_var_array;
      assoc_clear(the_arg);
 
-For versions 3.1.3 and later, the internals changed.  In particular,
+   For versions 3.1.3 and later, the internals changed.  In particular,
 the interface was actually _simplified_ drastically.  The following
 boilerplate code now suffices:
 
@@ -19035,15 +19258,15 @@ boilerplate code now suffices:
      /* if necessary, clear it: */
      assoc_clear(the_arg);
 
-As of version 3.1.4, the internals improved again, and became even
+   As of version 3.1.4, the internals improved again, and became even
 simpler:
 
      NODE *the_arg;
 
      the_arg = get_array_argument(tree, 2, FALSE); /* assume need 3rd arg, 0-based */
 
-Again, you should spend time studying the `gawk' internals; don't just
-blindly copy this code.
+   Again, you should spend time studying the `gawk' internals; don't
+just blindly copy this code.
 
 
 File: gawk.info,  Node: Sample Library,  Prev: Internals,  Up: Dynamic Extensions
@@ -19083,11 +19306,11 @@ directory to change to:
      }
      ...
 
-The return value is negative if the `chdir' failed, and `ERRNO' (*note
-Built-in Variables::) is set to a string indicating the error.
+   The return value is negative if the `chdir' failed, and `ERRNO'
+(*note Built-in Variables::) is set to a string indicating the error.
 
-Using `stat' is a bit more complicated.  The C `stat' function fills in
-a structure that has a fair amount of information.  The right way to
+   Using `stat' is a bit more complicated.  The C `stat' function fills
+in a structure that has a fair amount of information.  The right way to
 model this in `awk' is to fill in an associative array with the
 appropriate information:
 
@@ -19101,7 +19324,7 @@ appropriate information:
      }
      printf("size of %s is %d bytes\n", file, fdata["size"])
 
-The `stat' function always clears the data array, even if the `stat'
+   The `stat' function always clears the data array, even if the `stat'
 fails.  It fills in the following elements:
 
 `"name"'
@@ -19165,9 +19388,10 @@ fails.  It fills in the following elements:
     `"symlink"'
           The file is a symbolic link.
 
-Several additional elements may be present depending upon the operating
-system and the type of the file.  You can test for them in your `awk'
-program by using the `in' operator (*note Reference to Elements::):
+   Several additional elements may be present depending upon the
+operating system and the type of the file.  You can test for them in
+your `awk' program by using the `in' operator (*note Reference to
+Elements::):
 
 `"blksize"'
      The preferred block size for I/O to the file. This field is not
@@ -19213,18 +19437,18 @@ other POSIX-compliant systems:(1)
 
          newdir = get_scalar_argument(tree, 0);
 
-The file includes the `"awk.h"' header file for definitions for the
+   The file includes the `"awk.h"' header file for definitions for the
 `gawk' internals.  It includes `<sys/sysmacros.h>' for access to the
 `major' and `minor' macros.
 
-By convention, for an `awk' function `foo', the function that
+   By convention, for an `awk' function `foo', the function that
 implements it is called `do_foo'.  The function should take a `NODE *'
 argument, usually called `tree', that represents the argument list to
 the function.  The `newdir' variable represents the new directory to
 change to, retrieved with `get_argument'.  Note that the first argument
 is numbered zero.
 
-This code actually accomplishes the `chdir'. It first forces the
+   This code actually accomplishes the `chdir'. It first forces the
 argument to be a string and passes the string value to the `chdir'
 system call. If the `chdir' fails, `ERRNO' is updated.  The result of
 `force_string' has to be freed with `free_temp':
@@ -19235,7 +19459,7 @@ system call. If the `chdir' fails, `ERRNO' is updated.  The result of
              update_ERRNO();
          free_temp(newdir);
 
-Finally, the function returns the return value to the `awk' level,
+   Finally, the function returns the return value to the `awk' level,
 using `set_value'. Then it must return a value from the call to the new
 built-in (this value ignored by the interpreter):
 
@@ -19246,7 +19470,7 @@ built-in (this value ignored by the interpreter):
          return tmp_number((AWKNUM) 0);
      }
 
-The `stat' built-in is more involved.  First comes a function that
+   The `stat' built-in is more involved.  First comes a function that
 turns a numeric mode into a printable representation (e.g., 644 becomes
 `-rw-r--r--'). This is omitted here for brevity:
 
@@ -19260,7 +19484,7 @@ turns a numeric mode into a printable representation (e.g., 644 becomes
          ...
      }
 
-Next comes the actual `do_stat' function itself.  First come the
+   Next comes the actual `do_stat' function itself.  First come the
 variable declarations and argument checking:
 
      /* do_stat --- provide a stat() function for gawk */
@@ -19280,7 +19504,7 @@ variable declarations and argument checking:
          if (do_lint && get_curfunc_arg_count() > 2)
              lintwarn("stat: called with too many arguments");
 
-Then comes the actual work. First, we get the arguments.  Then, we
+   Then comes the actual work. First, we get the arguments.  Then, we
 always clear the array.  To get the file information, we use `lstat',
 in case the file is a symbolic link.  If there's an error, we set
 `ERRNO' and return:
@@ -19304,7 +19528,7 @@ in case the file is a symbolic link.  If there's an error, we set
              return tmp_number((AWKNUM) 0);
          }
 
-Now comes the tedious part: filling in the array.  Only a few of the
+   Now comes the tedious part: filling in the array.  Only a few of the
 calls are shown here, since they all follow the same pattern:
 
          /* fill in the array */
@@ -19318,7 +19542,7 @@ calls are shown here, since they all follow the same pattern:
          pmode = format_mode(sbuf.st_mode);
          *aptr = make_string(pmode, strlen(pmode));
 
-When done, we free the temporary value containing the file name, set
+   When done, we free the temporary value containing the file name, set
 the return value, and return:
 
          free_temp(file);
@@ -19330,7 +19554,7 @@ the return value, and return:
          return tmp_number((AWKNUM) 0);
      }
 
-Finally, it's necessary to provide the "glue" that loads the new
+   Finally, it's necessary to provide the "glue" that loads the new
 function(s) into `gawk'.  By convention, each library has a routine
 named `dlload' that does the job:
 
@@ -19346,12 +19570,12 @@ named `dlload' that does the job:
          return tmp_number((AWKNUM) 0);
      }
 
-And that's it!  As an exercise, consider adding functions to implement
-system calls such as `chown', `chmod', and `umask'.
+   And that's it!  As an exercise, consider adding functions to
+implement system calls such as `chown', `chmod', and `umask'.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) This version is edited slightly for presentation.  The complete
+   (1) This version is edited slightly for presentation.  The complete
 version can be found in `extension/filefuncs.c' in the `gawk'
 distribution.
 
@@ -19370,7 +19594,7 @@ a GNU/Linux shared library:
      $ gcc -shared -DHAVE_CONFIG_H -c -O -g -IIDIR filefuncs.c
      $ ld -o filefuncs.so -shared filefuncs.o
 
-Once the library exists, it is loaded by calling the `extension'
+   Once the library exists, it is loaded by calling the `extension'
 built-in function.  This function takes two arguments: the name of the
 library to load and the name of a function to call when the library is
 first loaded. This function adds the new functions to `gawk'.  It
@@ -19393,7 +19617,7 @@ shared library:
              strftime("%m %d %y %H:%M:%S", data["mtime"])
      }
 
-Here are the results of running the program:
+   Here are the results of running the program:
 
      $ gawk -f testff.awk
      -| Info for testff.awk
@@ -19427,12 +19651,12 @@ C.4 Probable Future Extensions
      Hey!
      Larry Wall
 
-This minor node briefly lists extensions and possible improvements that
-indicate the directions we are currently considering for `gawk'.  The
-file `FUTURES' in the `gawk' distribution lists these extensions as
+   This minor node briefly lists extensions and possible improvements
+that indicate the directions we are currently considering for `gawk'.
+The file `FUTURES' in the `gawk' distribution lists these extensions as
 well.
 
-Following is a list of probable future changes visible at the `awk'
+   Following is a list of probable future changes visible at the `awk'
 language level:
 
 Loadable module interface
@@ -19460,7 +19684,7 @@ Databases
 More `lint' warnings
      There are more things that could be checked for portability.
 
-Following is a list of probable improvements that will make `gawk''s
+   Following is a list of probable improvements that will make `gawk''s
 source code easier to work with:
 
 Loadable module mechanics
@@ -19486,7 +19710,7 @@ Integrating the DBUG library
      Integrating Fred Fish's DBUG library would be helpful during
      development, but it's a lot of work to do.
 
-Following is a list of probable improvements that will make `gawk'
+   Following is a list of probable improvements that will make `gawk'
 perform better:
 
 Compilation of `awk' programs
@@ -19509,10 +19733,10 @@ Compilation of `awk' programs
      intermediate in speed between running a compiled program and doing
      what `gawk' does now.
 
-Finally, the programs in the test suite could use documenting in this
-Info file.
+   Finally, the programs in the test suite could use documenting in
+this Info file.
 
-*Note Additions::, if you are interested in tackling any of these
+   *Note Additions::, if you are interested in tackling any of these
 projects.
 
 
@@ -19548,12 +19772,12 @@ data and produce results.
      | Data | -----> < Program > -----> | Results |
      +------+         \_______/         +---------+
 
-The "program" in the figure can be either a compiled program(1) (such
-as `ls'), or it may be "interpreted".  In the latter case, a
+   The "program" in the figure can be either a compiled program(1)
+(such as `ls'), or it may be "interpreted".  In the latter case, a
 machine-executable program such as `awk' reads your program, and then
 uses the instructions in your program to process the data.
 
-When you write a program, it usually consists of the following, very
+   When you write a program, it usually consists of the following, very
 basic set of steps:
 
                                    ______
@@ -19600,33 +19824,33 @@ Clean Up
      plastic wrap to keep anyone from tasting it, as well as wash the
      mixing bowls and utensils.
 
-An "algorithm" is a detailed set of instructions necessary to accomplish
-a task, or process data.  It is much the same as a recipe for baking a
-cake.  Programs implement algorithms.  Often, it is up to you to design
-the algorithm and implement it, simultaneously.
+   An "algorithm" is a detailed set of instructions necessary to
+accomplish a task, or process data.  It is much the same as a recipe
+for baking a cake.  Programs implement algorithms.  Often, it is up to
+you to design the algorithm and implement it, simultaneously.
 
-The "logical chunks" we talked about previously are called "records",
+   The "logical chunks" we talked about previously are called "records",
 similar to the records a company keeps on employees, a school keeps for
 students, or a doctor keeps for patients.  Each record has many
 component parts, such as first and last names, date of birth, address,
 and so on.  The component parts are referred to as the "fields" of the
 record.
 
-The act of reading data is termed "input", and that of generating
+   The act of reading data is termed "input", and that of generating
 results, not too surprisingly, is termed "output".  They are often
 referred to together as "input/output," and even more often, as "I/O"
 for short.  (You will also see "input" and "output" used as verbs.)
 
-`awk' manages the reading of data for you, as well as the breaking it
-up into records and fields.  Your program's job is to tell `awk' what
-to with the data.  You do this by describing "patterns" in the data to
-look for, and "actions" to execute when those patterns are seen.  This
-"data-driven" nature of `awk' programs usually makes them both easier
-to write and easier to read.
+   `awk' manages the reading of data for you, as well as the breaking
+it up into records and fields.  Your program's job is to tell `awk'
+what to with the data.  You do this by describing "patterns" in the
+data to look for, and "actions" to execute when those patterns are
+seen.  This "data-driven" nature of `awk' programs usually makes them
+both easier to write and easier to read.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Compiled programs are typically written in lower-level languages
+   (1) Compiled programs are typically written in lower-level languages
 such as C, C++, Fortran, or Ada, and then translated, or "compiled",
 into a form that the computer can execute directly.
 
@@ -19643,75 +19867,75 @@ predefined variables, and it has special names to refer to the current
 input record and the fields of the record.  You may also group multiple
 associated values under one name, as an array.
 
-Data, particularly in `awk', consists of either numeric values, such as
-42 or 3.1415927, or string values.  String values are essentially
+   Data, particularly in `awk', consists of either numeric values, such
+as 42 or 3.1415927, or string values.  String values are essentially
 anything that's not a number, such as a name.  Strings are sometimes
 referred to as "character data", since they store the individual
 characters that comprise them.  Individual variables, as well as
 numeric and string variables, are referred to as "scalar" values.
 Groups of values, such as arrays, are not scalars.
 
-Within computers, there are two kinds of numeric values: "integers" and
-"floating-point".  In school, integer values were referred to as
+   Within computers, there are two kinds of numeric values: "integers"
+and "floating-point".  In school, integer values were referred to as
 "whole" numbers--that is, numbers without any fractional part, such as
 1, 42, or -17.  The advantage to integer numbers is that they represent
 values exactly.  The disadvantage is that their range is limited.  On
 most modern systems, this range is -2,147,483,648 to 2,147,483,647.
 
-Integer values come in two flavors: "signed" and "unsigned".  Signed
+   Integer values come in two flavors: "signed" and "unsigned".  Signed
 values may be negative or positive, with the range of values just
 described.  Unsigned values are always positive.  On most modern
 systems, the range is from 0 to 4,294,967,295.
 
-Floating-point numbers represent what are called "real" numbers; i.e.,
-those that do have a fractional part, such as 3.1415927.  The advantage
-to floating-point numbers is that they can represent a much larger
-range of values.  The disadvantage is that there are numbers that they
-cannot represent exactly.  `awk' uses "double-precision" floating-point
-numbers, which can hold more digits than "single-precision"
-floating-point numbers.  Floating-point issues are discussed more fully
-in *Note Floating Point Issues::.
+   Floating-point numbers represent what are called "real" numbers;
+i.e., those that do have a fractional part, such as 3.1415927.  The
+advantage to floating-point numbers is that they can represent a much
+larger range of values.  The disadvantage is that there are numbers
+that they cannot represent exactly.  `awk' uses "double-precision"
+floating-point numbers, which can hold more digits than
+"single-precision" floating-point numbers.  Floating-point issues are
+discussed more fully in *note Floating Point Issues::.
 
-At the very lowest level, computers store values as groups of binary
+   At the very lowest level, computers store values as groups of binary
 digits, or "bits".  Modern computers group bits into groups of eight,
 called "bytes".  Advanced applications sometimes have to manipulate
 bits directly, and `gawk' provides functions for doing so.
 
-While you are probably used to the idea of a number without a value
+   While you are probably used to the idea of a number without a value
 (i.e., zero), it takes a bit more getting used to the idea of
 zero-length character data.  Nevertheless, such a thing exists.  It is
 called the "null string".  The null string is character data that has
 no value.  In other words, it is empty.  It is written in `awk' programs
 like this: `""'.
 
-Humans are used to working in decimal; i.e., base 10.  In base 10,
+   Humans are used to working in decimal; i.e., base 10.  In base 10,
 numbers go from 0 to 9, and then "roll over" into the next column.
 (Remember grade school? 42 is 4 times 10 plus 2.)
 
-There are other number bases though.  Computers commonly use base 2 or
-"binary", base 8 or "octal", and base 16 or "hexadecimal".  In binary,
-each column represents two times the value in the column to its right.
-Each column may contain either a 0 or a 1.  Thus, binary 1010
+   There are other number bases though.  Computers commonly use base 2
+or "binary", base 8 or "octal", and base 16 or "hexadecimal".  In
+binary, each column represents two times the value in the column to its
+right. Each column may contain either a 0 or a 1.  Thus, binary 1010
 represents 1 times 8, plus 0 times 4, plus 1 times 2, plus 0 times 1,
-or decimal 10.  Octal and hexadecimal are discussed more in *Note
+or decimal 10.  Octal and hexadecimal are discussed more in *note
 Nondecimal-numbers::.
 
-Programs are written in programming languages.  Hundreds, if not
+   Programs are written in programming languages.  Hundreds, if not
 thousands, of programming languages exist.  One of the most popular is
 the C programming language.  The C language had a very strong influence
 on the design of the `awk' language.
 
-There have been several versions of C.  The first is often referred to
-as "K&R" C, after the initials of Brian Kernighan and Dennis Ritchie,
+   There have been several versions of C.  The first is often referred
+to as "K&R" C, after the initials of Brian Kernighan and Dennis Ritchie,
 the authors of the first book on C.  (Dennis Ritchie created the
 language, and Brian Kernighan was one of the creators of `awk'.)
 
-In the mid-1980s, an effort began to produce an international standard
-for C.  This work culminated in 1989, with the production of the ANSI
-standard for C.  This standard became an ISO standard in 1990.  Where
-it makes sense, POSIX `awk' is compatible with 1990 ISO C.
+   In the mid-1980s, an effort began to produce an international
+standard for C.  This work culminated in 1989, with the production of
+the ANSI standard for C.  This standard became an ISO standard in 1990.
+Where it makes sense, POSIX `awk' is compatible with 1990 ISO C.
 
-In 1999, a revised ISO C standard was approved and released.  Future
+   In 1999, a revised ISO C standard was approved and released.  Future
 versions of `gawk' will be as compatible as possible with this standard.
 
 
@@ -19726,19 +19950,36 @@ double-precision floating-point numbers to represent all numeric
 values.  This minor node describes some of the issues involved in using
 floating-point numbers.
 
-There is a very nice paper on floating-point arithmetic by David
+   There is a very nice paper on floating-point arithmetic by David
 Goldberg, "What Every Computer Scientist Should Know About
 Floating-point Arithmetic," `ACM Computing Surveys' *23*, 1 (1991-03),
 5-48.(1) This is worth reading if you are interested in the details,
 but it does require a background in computer science.
 
+* Menu:
+
+* String Conversion Precision::    The String Value Can Lie.
+* Unexpected Results::             Floating Point Numbers Are Not
+                                   Abstract Numbers.
+* POSIX Floating Point Problems::  Standards Versus Existing Practice.
+
+   ---------- Footnotes ----------
+
+   (1) `http://www.validlab.com/goldberg/paper.ps'.
+
+
+File: gawk.info,  Node: String Conversion Precision,  Next: Unexpected Results,  Up: Floating Point Issues
+
+D.3.1 The String Value Can Lie
+------------------------------
+
 Internally, `awk' keeps both the numeric value (double-precision
 floating-point) and the string value for a variable.  Separately, `awk'
 keeps track of what type the variable has (*note Typing and
 Comparison::), which plays a role in how variables are used in
 comparisons.
 
-It is important to note that the string value for a number may not
+   It is important to note that the string value for a number may not
 reflect the full value (all the digits) that the numeric value actually
 contains.  The following program (`values.awk') illustrates this:
 
@@ -19757,21 +19998,32 @@ This program shows the full value of the sum of `$2' and `$3' using
 `printf', and then prints the string values obtained from both
 automatic conversion (via `CONVFMT') and from printing (via `OFMT').
 
-Here is what happens when the program is run:
+   Here is what happens when the program is run:
 
      $ echo 2 3.654321 1.2345678 | awk -f values.awk
      -| $1 = 4.8888888
      -| a = <4.88889>
      -| $1 = 4.88889
 
-This makes it clear that the full numeric value is different from what
-the default string representations show.
+   This makes it clear that the full numeric value is different from
+what the default string representations show.
 
-`CONVFMT''s default value is `"%.6g"', which yields a value with at
+   `CONVFMT''s default value is `"%.6g"', which yields a value with at
 least six significant digits.  For some applications, you might want to
 change it to specify more precision.  On most modern machines, most of
 the time, 17 digits is enough to capture a floating-point number's
-value exactly.(2)
+value exactly.(1)
+
+   ---------- Footnotes ----------
+
+   (1) Pathological cases can require up to 752 digits (!), but we
+doubt that you need to worry about this.
+
+
+File: gawk.info,  Node: Unexpected Results,  Next: POSIX Floating Point Problems,  Prev: String Conversion Precision,  Up: Floating Point Issues
+
+D.3.2 Floating Point Numbers Are Not Abstract Numbers
+-----------------------------------------------------
 
 Unlike numbers in the abstract sense (such as what you studied in high
 school or college math), numbers stored in computers are limited in
@@ -19795,14 +20047,14 @@ This shows that some values can be represented exactly, whereas others
 are only approximated.  This is not a "bug" in `awk', but simply an
 artifact of how computers represent numbers.
 
-Another peculiarity of floating-point numbers on modern systems is that
-they often have more than one representation for the number zero!  In
-particular, it is possible to represent "minus zero" as well as
+   Another peculiarity of floating-point numbers on modern systems is
+that they often have more than one representation for the number zero!
+In particular, it is possible to represent "minus zero" as well as
 regular, or "positive" zero.
 
-This example shows that negative and positive zero are distinct values
-when stored internally, but that they are in fact equal to each other,
-as well as to "regular" zero:
+   This example shows that negative and positive zero are distinct
+values when stored internally, but that they are in fact equal to each
+other, as well as to "regular" zero:
 
      $ gawk 'BEGIN { mz = -0 ; pz = 0
      > printf "-0 = %g, +0 = %g, (-0 == +0) -> %d\n", mz, pz, mz == pz
@@ -19811,16 +20063,88 @@ as well as to "regular" zero:
      -| -0 = -0, +0 = 0, (-0 == +0) -> 1
      -| mz == 0 -> 1, pz == 0 -> 1
 
-It helps to keep this in mind should you process numeric data that
+   It helps to keep this in mind should you process numeric data that
 contains negative zero values; the fact that the zero is negative is
 noted and can affect comparisons.
 
----------- Footnotes ----------
+
+File: gawk.info,  Node: POSIX Floating Point Problems,  Prev: Unexpected Results,  Up: Floating Point Issues
+
+D.3.3 Standards Versus Existing Practice
+----------------------------------------
+
+Historically, `awk' has converted any non-numeric looking string to the
+numeric value zero, when required.  Furthermore, the original
+definition of the language and the original POSIX standards specified
+that `awk' only understands decimal numbers (base 10), and not octal
+(base 8) or hexadecimal numbers (base 16).
+
+   As of this writing (February, 2007), changes in the language of the
+current POSIX standard can be interpreted to imply that `awk' should
+support additional features.  These features are:
+
+   * Interpretation of floating point data values specified in
+     hexadecimal notation (`0xDEADBEEF'). (Note: data values, _not_
+     source code constants.)
+
+   * Support for the special IEEE 754 floating point values "Not A
+     Number" (NaN), positive Infinity ("inf") and negative Infinity
+     ("-inf").  In particular, the format for these values is as
+     specified by the ISO C99 standard, which ignores case and can
+     allow machine-dependent additional characters after the `nan' and
+     allow either `inf' or `infinity'.
+
+   The first problem is that both of these are clear changes to
+historical practice:
 
-(1) `http://www.validlab.com/goldberg/paper.ps'.
+   * The `gawk' maintainer feels that hexadecimal floating point
+     values, in particular, is ugly, and was never intended by the
+     original designers to be part of the language.
 
-(2) Pathological cases can require up to 752 digits (!), but we doubt
-that you need to worry about this.
+   * Allowing completely alphabetic strings to have valid numeric
+     values is also a very severe departure from historical practice.
+
+   The second problem is that the `gawk' maintainer feels that this
+interpretation of the standard, which requires a certain amount of
+"language lawyering" to arrive at in the first place, was not intended
+by the standard developers, either.  In other words, "we see how you
+got where you are, but we don't think that that's where you want to be."
+
+   Nevertheless, on systems that support IEEE floating point, it seems
+reasonable to provide _some_ way to support NaN and Infinity values.
+The solution implemented in `gawk', as of version 3.1.6, is as follows:
+
+  1. With the `--posix' command-line option, `gawk' becomes "hands
+     off." String values are passed directly to the system library's
+     `strtod()' function, and if it successfuly returns a numeric value,
+     that is what's used.  By definition, the results are not portable
+     across different systems.(1) They are also a little surprising:
+
+          $ echo nanny | gawk --posix '{ print $1 + 0 }'
+          -| nan
+          $ echo 0xDeadBeef | gawk --posix '{ print $1 + 0 }'
+          -| 3735928559
+
+  2. Without `--posix', `gawk' interprets the four strings `+inf',
+     `-inf', `+nan', and `-nan' specially, producing the corresponding
+     special numeric values.  The leading sign acts a signal to `gawk'
+     (and the user) that the value is really numeric.  Hexadecimal
+     floating point is not supported (unless you also use
+     `--non-decimal-data', which is _not_ recommended). For example:
+
+          $ echo nanny | gawk '{ print $1 + 0 }'
+          -| 0
+          $ echo +nan | gawk '{ print $1 + 0 }'
+          -| nan
+          $ echo 0xDeadBeef | gawk '{ print $1 + 0 }'
+          -| 0
+
+     `gawk' does ignore case distinction in the four special values.
+     Thus `+nan' and `+NaN' are the same.
+
+   ---------- Footnotes ----------
+
+   (1) You asked for it, you got it.
 
 
 File: gawk.info,  Node: Glossary,  Next: Copying,  Prev: Basic Concepts,  Up: Top
@@ -19904,7 +20228,7 @@ Bit
      floating-point numbers, character data, addresses of other memory
      objects, or other data.  `awk' lets you work with floating-point
      numbers and strings.  `gawk' lets you manipulate bit values with
-     the built-in functions described in *Note Bitwise Functions::.
+     the built-in functions described in *note Bitwise Functions::.
 
      Computers are often defined by how many bits they use to represent
      integer values.  Typical systems are 32-bit systems, but 64-bit
@@ -20075,7 +20399,7 @@ Field
      change by setting the built-in variable `FS').  Such pieces are
      called fields.  If the pieces are of fixed length, you can use the
      built-in variable `FIELDWIDTHS' to describe their lengths.  (*Note
-     Field Separators::, and *Note Constant Size::.)
+     Field Separators::, and *note Constant Size::.)
 
 Flag
      A variable whose truth value indicates the existence or
@@ -20190,7 +20514,10 @@ Keyword
 
      `gawk''s keywords are: `BEGIN', `END', `if', `else', `while',
      `do...while', `for', `for...in', `break', `continue', `delete',
-     `next', `nextfile', `function', `func', and `exit'.
+     `next', `nextfile', `function', `func', and `exit'.  If `gawk' was
+     configured with the `--enable-switch' option (*note Switch
+     Statement::), then `switch', `case', and `default' are also
+     keywords.
 
 Lesser General Public License
      This document describes the terms under which binary library
@@ -20294,7 +20621,7 @@ Redirection
      You can redirect the output of the `print' and `printf' statements
      to a file or a system command, using the `>', `>>', `|', and `|&'
      operators.  You can redirect input to the `getline' statement using
-     the `<', `|', and `|&' operators.  (*Note Redirection::, and *Note
+     the `<', `|', and `|&' operators.  (*Note Redirection::, and *note
      Getline::.)
 
 Regexp
@@ -20426,294 +20753,665 @@ File: gawk.info,  Node: Copying,  Next: GNU Free Documentation License,  Prev: G
 GNU General Public License
 **************************
 
-                         Version 2, June 1991
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA 02111, USA
+                        Version 3, 29 June 2007
 
-     Everyone is permitted to copy and distribute verbatim copies
-     of this license document, but changing it is not allowed.
+     Copyright (C) 2007 Free Software Foundation, Inc. `http://fsf.org/'
+
+     Everyone is permitted to copy and distribute verbatim copies of this
+     license document, but changing it is not allowed.
 
 Preamble
 ========
 
-The licenses for most software are designed to take away your freedom
-to share and change it.  By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have
-the freedom to distribute copies of free software (and charge for this
-service if you wish), that you receive source code or can get it if you
+The GNU General Public License is a free, copyleft license for software
+and other kinds of works.
+
+   The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains
+free software for all its users.  We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors.  You can apply
+it to your programs, too.
+
+   When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
-free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights.  These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis
-or for a fee, you must give the recipients all the rights that you
-have.  You must make sure that they, too, receive or can get the source
-code.  And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary.  To prevent this, we have made it clear that any patent
-must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
+free programs, and that you know you can do these things.
+
+   To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you
+have certain responsibilities if you distribute copies of the software,
+or if you modify it: responsibilities to respect the freedom of others.
+
+   For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+   Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+   For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+   Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so.  This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software.  The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products.  If such problems arise substantially in
+other domains, we stand ready to extend this provision to those domains
+in future versions of the GPL, as needed to protect the freedom of
+users.
+
+   Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+   The precise terms and conditions for copying, distribution and
 modification follow.
 
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  0. This License applies to any program or other work which contains a
-     notice placed by the copyright holder saying it may be distributed
-     under the terms of this General Public License.  The "Program",
-     below, refers to any such program or work, and a "work based on
-     the Program" means either the Program or any derivative work under
-     copyright law: that is to say, a work containing the Program or a
-     portion of it, either verbatim or with modifications and/or
-     translated into another language.  (Hereinafter, translation is
-     included without limitation in the term "modification".)  Each
-     licensee is addressed as "you".
-
-     Activities other than copying, distribution and modification are
-     not covered by this License; they are outside its scope.  The act
-     of running the Program is not restricted, and the output from the
-     Program is covered only if its contents constitute a work based on
-     the Program (independent of having been made by running the
-     Program).  Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-     source code as you receive it, in any medium, provided that you
-     conspicuously and appropriately publish on each copy an appropriate
-     copyright notice and disclaimer of warranty; keep intact all the
-     notices that refer to this License and to the absence of any
-     warranty; and give any other recipients of the Program a copy of
-     this License along with the Program.
-
-     You may charge a fee for the physical act of transferring a copy,
-     and you may at your option offer warranty protection in exchange
-     for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-     of it, thus forming a work based on the Program, and copy and
-     distribute such modifications or work under the terms of Section 1
-     above, provided that you also meet all of these conditions:
-
-       a. You must cause the modified files to carry prominent notices
-          stating that you changed the files and the date of any change.
-
-       b. You must cause any work that you distribute or publish, that
-          in whole or in part contains or is derived from the Program
-          or any part thereof, to be licensed as a whole at no charge
-          to all third parties under the terms of this License.
-
-       c. If the modified program normally reads commands interactively
-          when run, you must cause it, when started running for such
-          interactive use in the most ordinary way, to print or display
-          an announcement including an appropriate copyright notice and
-          a notice that there is no warranty (or else, saying that you
-          provide a warranty) and that users may redistribute the
-          program under these conditions, and telling the user how to
-          view a copy of this License.  (Exception: if the Program
-          itself is interactive but does not normally print such an
-          announcement, your work based on the Program is not required
-          to print an announcement.)
-
-     These requirements apply to the modified work as a whole.  If
-     identifiable sections of that work are not derived from the
-     Program, and can be reasonably considered independent and separate
-     works in themselves, then this License, and its terms, do not
-     apply to those sections when you distribute them as separate
-     works.  But when you distribute the same sections as part of a
-     whole which is a work based on the Program, the distribution of
-     the whole must be on the terms of this License, whose permissions
-     for other licensees extend to the entire whole, and thus to each
-     and every part regardless of who wrote it.
-
-     Thus, it is not the intent of this section to claim rights or
-     contest your rights to work written entirely by you; rather, the
-     intent is to exercise the right to control the distribution of
-     derivative or collective works based on the Program.
-
-     In addition, mere aggregation of another work not based on the
-     Program with the Program (or with a work based on the Program) on
-     a volume of a storage or distribution medium does not bring the
-     other work under the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-     under Section 2) in object code or executable form under the terms
-     of Sections 1 and 2 above provided that you also do one of the
-     following:
-
-       a. Accompany it with the complete corresponding machine-readable
-          source code, which must be distributed under the terms of
-          Sections 1 and 2 above on a medium customarily used for
-          software interchange; or,
-
-       b. Accompany it with a written offer, valid for at least three
-          years, to give any third party, for a charge no more than your
-          cost of physically performing source distribution, a complete
-          machine-readable copy of the corresponding source code, to be
-          distributed under the terms of Sections 1 and 2 above on a
-          medium customarily used for software interchange; or,
-
-       c. Accompany it with the information you received as to the offer
-          to distribute corresponding source code.  (This alternative is
-          allowed only for noncommercial distribution and only if you
-          received the program in object code or executable form with
-          such an offer, in accord with Subsection b above.)
-
-     The source code for a work means the preferred form of the work for
-     making modifications to it.  For an executable work, complete
-     source code means all the source code for all modules it contains,
-     plus any associated interface definition files, plus the scripts
-     used to control compilation and installation of the executable.
-     However, as a special exception, the source code distributed need
-     not include anything that is normally distributed (in either
-     source or binary form) with the major components (compiler,
-     kernel, and so on) of the operating system on which the executable
-     runs, unless that component itself accompanies the executable.
-
-     If distribution of executable or object code is made by offering
-     access to copy from a designated place, then offering equivalent
-     access to copy the source code from the same place counts as
-     distribution of the source code, even though third parties are not
-     compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-     except as expressly provided under this License.  Any attempt
-     otherwise to copy, modify, sublicense or distribute the Program is
-     void, and will automatically terminate your rights under this
-     License.  However, parties who have received copies, or rights,
-     from you under this License will not have their licenses
-     terminated so long as such parties remain in full compliance.
+TERMS AND CONDITIONS
+====================
 
-  5. You are not required to accept this License, since you have not
-     signed it.  However, nothing else grants you permission to modify
-     or distribute the Program or its derivative works.  These actions
-     are prohibited by law if you do not accept this License.
-     Therefore, by modifying or distributing the Program (or any work
-     based on the Program), you indicate your acceptance of this
-     License to do so, and all its terms and conditions for copying,
-     distributing or modifying the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-     Program), the recipient automatically receives a license from the
-     original licensor to copy, distribute or modify the Program
-     subject to these terms and conditions.  You may not impose any
-     further restrictions on the recipients' exercise of the rights
-     granted herein.  You are not responsible for enforcing compliance
-     by third parties to this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-     infringement or for any other reason (not limited to patent
-     issues), conditions are imposed on you (whether by court order,
+  0. Definitions.
+
+     "This License" refers to version 3 of the GNU General Public
+     License.
+
+     "Copyright" also means copyright-like laws that apply to other
+     kinds of works, such as semiconductor masks.
+
+     "The Program" refers to any copyrightable work licensed under this
+     License.  Each licensee is addressed as "you".  "Licensees" and
+     "recipients" may be individuals or organizations.
+
+     To "modify" a work means to copy from or adapt all or part of the
+     work in a fashion requiring copyright permission, other than the
+     making of an exact copy.  The resulting work is called a "modified
+     version" of the earlier work or a work "based on" the earlier work.
+
+     A "covered work" means either the unmodified Program or a work
+     based on the Program.
+
+     To "propagate" a work means to do anything with it that, without
+     permission, would make you directly or secondarily liable for
+     infringement under applicable copyright law, except executing it
+     on a computer or modifying a private copy.  Propagation includes
+     copying, distribution (with or without modification), making
+     available to the public, and in some countries other activities as
+     well.
+
+     To "convey" a work means any kind of propagation that enables other
+     parties to make or receive copies.  Mere interaction with a user
+     through a computer network, with no transfer of a copy, is not
+     conveying.
+
+     An interactive user interface displays "Appropriate Legal Notices"
+     to the extent that it includes a convenient and prominently visible
+     feature that (1) displays an appropriate copyright notice, and (2)
+     tells the user that there is no warranty for the work (except to
+     the extent that warranties are provided), that licensees may
+     convey the work under this License, and how to view a copy of this
+     License.  If the interface presents a list of user commands or
+     options, such as a menu, a prominent item in the list meets this
+     criterion.
+
+  1. Source Code.
+
+     The "source code" for a work means the preferred form of the work
+     for making modifications to it.  "Object code" means any
+     non-source form of a work.
+
+     A "Standard Interface" means an interface that either is an
+     official standard defined by a recognized standards body, or, in
+     the case of interfaces specified for a particular programming
+     language, one that is widely used among developers working in that
+     language.
+
+     The "System Libraries" of an executable work include anything,
+     other than the work as a whole, that (a) is included in the normal
+     form of packaging a Major Component, but which is not part of that
+     Major Component, and (b) serves only to enable use of the work
+     with that Major Component, or to implement a Standard Interface
+     for which an implementation is available to the public in source
+     code form.  A "Major Component", in this context, means a major
+     essential component (kernel, window system, and so on) of the
+     specific operating system (if any) on which the executable work
+     runs, or a compiler used to produce the work, or an object code
+     interpreter used to run it.
+
+     The "Corresponding Source" for a work in object code form means all
+     the source code needed to generate, install, and (for an executable
+     work) run the object code and to modify the work, including
+     scripts to control those activities.  However, it does not include
+     the work's System Libraries, or general-purpose tools or generally
+     available free programs which are used unmodified in performing
+     those activities but which are not part of the work.  For example,
+     Corresponding Source includes interface definition files
+     associated with source files for the work, and the source code for
+     shared libraries and dynamically linked subprograms that the work
+     is specifically designed to require, such as by intimate data
+     communication or control flow between those subprograms and other
+     parts of the work.
+
+     The Corresponding Source need not include anything that users can
+     regenerate automatically from other parts of the Corresponding
+     Source.
+
+     The Corresponding Source for a work in source code form is that
+     same work.
+
+  2. Basic Permissions.
+
+     All rights granted under this License are granted for the term of
+     copyright on the Program, and are irrevocable provided the stated
+     conditions are met.  This License explicitly affirms your unlimited
+     permission to run the unmodified Program.  The output from running
+     a covered work is covered by this License only if the output,
+     given its content, constitutes a covered work.  This License
+     acknowledges your rights of fair use or other equivalent, as
+     provided by copyright law.
+
+     You may make, run and propagate covered works that you do not
+     convey, without conditions so long as your license otherwise
+     remains in force.  You may convey covered works to others for the
+     sole purpose of having them make modifications exclusively for
+     you, or provide you with facilities for running those works,
+     provided that you comply with the terms of this License in
+     conveying all material for which you do not control copyright.
+     Those thus making or running the covered works for you must do so
+     exclusively on your behalf, under your direction and control, on
+     terms that prohibit them from making any copies of your
+     copyrighted material outside their relationship with you.
+
+     Conveying under any other circumstances is permitted solely under
+     the conditions stated below.  Sublicensing is not allowed; section
+     10 makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+     No covered work shall be deemed part of an effective technological
+     measure under any applicable law fulfilling obligations under
+     article 11 of the WIPO copyright treaty adopted on 20 December
+     1996, or similar laws prohibiting or restricting circumvention of
+     such measures.
+
+     When you convey a covered work, you waive any legal power to forbid
+     circumvention of technological measures to the extent such
+     circumvention is effected by exercising rights under this License
+     with respect to the covered work, and you disclaim any intention
+     to limit operation or modification of the work as a means of
+     enforcing, against the work's users, your or third parties' legal
+     rights to forbid circumvention of technological measures.
+
+  4. Conveying Verbatim Copies.
+
+     You may convey verbatim copies of the Program's source code as you
+     receive it, in any medium, provided that you conspicuously and
+     appropriately publish on each copy an appropriate copyright notice;
+     keep intact all notices stating that this License and any
+     non-permissive terms added in accord with section 7 apply to the
+     code; keep intact all notices of the absence of any warranty; and
+     give all recipients a copy of this License along with the Program.
+
+     You may charge any price or no price for each copy that you convey,
+     and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+     You may convey a work based on the Program, or the modifications to
+     produce it from the Program, in the form of source code under the
+     terms of section 4, provided that you also meet all of these
+     conditions:
+
+       a. The work must carry prominent notices stating that you
+          modified it, and giving a relevant date.
+
+       b. The work must carry prominent notices stating that it is
+          released under this License and any conditions added under
+          section 7.  This requirement modifies the requirement in
+          section 4 to "keep intact all notices".
+
+       c. You must license the entire work, as a whole, under this
+          License to anyone who comes into possession of a copy.  This
+          License will therefore apply, along with any applicable
+          section 7 additional terms, to the whole of the work, and all
+          its parts, regardless of how they are packaged.  This License
+          gives no permission to license the work in any other way, but
+          it does not invalidate such permission if you have separately
+          received it.
+
+       d. If the work has interactive user interfaces, each must display
+          Appropriate Legal Notices; however, if the Program has
+          interactive interfaces that do not display Appropriate Legal
+          Notices, your work need not make them do so.
+
+     A compilation of a covered work with other separate and independent
+     works, which are not by their nature extensions of the covered
+     work, and which are not combined with it such as to form a larger
+     program, in or on a volume of a storage or distribution medium, is
+     called an "aggregate" if the compilation and its resulting
+     copyright are not used to limit the access or legal rights of the
+     compilation's users beyond what the individual works permit.
+     Inclusion of a covered work in an aggregate does not cause this
+     License to apply to the other parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+     You may convey a covered work in object code form under the terms
+     of sections 4 and 5, provided that you also convey the
+     machine-readable Corresponding Source under the terms of this
+     License, in one of these ways:
+
+       a. Convey the object code in, or embodied in, a physical product
+          (including a physical distribution medium), accompanied by the
+          Corresponding Source fixed on a durable physical medium
+          customarily used for software interchange.
+
+       b. Convey the object code in, or embodied in, a physical product
+          (including a physical distribution medium), accompanied by a
+          written offer, valid for at least three years and valid for
+          as long as you offer spare parts or customer support for that
+          product model, to give anyone who possesses the object code
+          either (1) a copy of the Corresponding Source for all the
+          software in the product that is covered by this License, on a
+          durable physical medium customarily used for software
+          interchange, for a price no more than your reasonable cost of
+          physically performing this conveying of source, or (2) access
+          to copy the Corresponding Source from a network server at no
+          charge.
+
+       c. Convey individual copies of the object code with a copy of
+          the written offer to provide the Corresponding Source.  This
+          alternative is allowed only occasionally and noncommercially,
+          and only if you received the object code with such an offer,
+          in accord with subsection 6b.
+
+       d. Convey the object code by offering access from a designated
+          place (gratis or for a charge), and offer equivalent access
+          to the Corresponding Source in the same way through the same
+          place at no further charge.  You need not require recipients
+          to copy the Corresponding Source along with the object code.
+          If the place to copy the object code is a network server, the
+          Corresponding Source may be on a different server (operated
+          by you or a third party) that supports equivalent copying
+          facilities, provided you maintain clear directions next to
+          the object code saying where to find the Corresponding Source.
+          Regardless of what server hosts the Corresponding Source, you
+          remain obligated to ensure that it is available for as long
+          as needed to satisfy these requirements.
+
+       e. Convey the object code using peer-to-peer transmission,
+          provided you inform other peers where the object code and
+          Corresponding Source of the work are being offered to the
+          general public at no charge under subsection 6d.
+
+
+     A separable portion of the object code, whose source code is
+     excluded from the Corresponding Source as a System Library, need
+     not be included in conveying the object code work.
+
+     A "User Product" is either (1) a "consumer product", which means
+     any tangible personal property which is normally used for personal,
+     family, or household purposes, or (2) anything designed or sold for
+     incorporation into a dwelling.  In determining whether a product
+     is a consumer product, doubtful cases shall be resolved in favor of
+     coverage.  For a particular product received by a particular user,
+     "normally used" refers to a typical or common use of that class of
+     product, regardless of the status of the particular user or of the
+     way in which the particular user actually uses, or expects or is
+     expected to use, the product.  A product is a consumer product
+     regardless of whether the product has substantial commercial,
+     industrial or non-consumer uses, unless such uses represent the
+     only significant mode of use of the product.
+
+     "Installation Information" for a User Product means any methods,
+     procedures, authorization keys, or other information required to
+     install and execute modified versions of a covered work in that
+     User Product from a modified version of its Corresponding Source.
+     The information must suffice to ensure that the continued
+     functioning of the modified object code is in no case prevented or
+     interfered with solely because modification has been made.
+
+     If you convey an object code work under this section in, or with,
+     or specifically for use in, a User Product, and the conveying
+     occurs as part of a transaction in which the right of possession
+     and use of the User Product is transferred to the recipient in
+     perpetuity or for a fixed term (regardless of how the transaction
+     is characterized), the Corresponding Source conveyed under this
+     section must be accompanied by the Installation Information.  But
+     this requirement does not apply if neither you nor any third party
+     retains the ability to install modified object code on the User
+     Product (for example, the work has been installed in ROM).
+
+     The requirement to provide Installation Information does not
+     include a requirement to continue to provide support service,
+     warranty, or updates for a work that has been modified or
+     installed by the recipient, or for the User Product in which it
+     has been modified or installed.  Access to a network may be denied
+     when the modification itself materially and adversely affects the
+     operation of the network or violates the rules and protocols for
+     communication across the network.
+
+     Corresponding Source conveyed, and Installation Information
+     provided, in accord with this section must be in a format that is
+     publicly documented (and with an implementation available to the
+     public in source code form), and must require no special password
+     or key for unpacking, reading or copying.
+
+  7. Additional Terms.
+
+     "Additional permissions" are terms that supplement the terms of
+     this License by making exceptions from one or more of its
+     conditions.  Additional permissions that are applicable to the
+     entire Program shall be treated as though they were included in
+     this License, to the extent that they are valid under applicable
+     law.  If additional permissions apply only to part of the Program,
+     that part may be used separately under those permissions, but the
+     entire Program remains governed by this License without regard to
+     the additional permissions.
+
+     When you convey a copy of a covered work, you may at your option
+     remove any additional permissions from that copy, or from any part
+     of it.  (Additional permissions may be written to require their own
+     removal in certain cases when you modify the work.)  You may place
+     additional permissions on material, added by you to a covered work,
+     for which you have or can give appropriate copyright permission.
+
+     Notwithstanding any other provision of this License, for material
+     you add to a covered work, you may (if authorized by the copyright
+     holders of that material) supplement the terms of this License
+     with terms:
+
+       a. Disclaiming warranty or limiting liability differently from
+          the terms of sections 15 and 16 of this License; or
+
+       b. Requiring preservation of specified reasonable legal notices
+          or author attributions in that material or in the Appropriate
+          Legal Notices displayed by works containing it; or
+
+       c. Prohibiting misrepresentation of the origin of that material,
+          or requiring that modified versions of such material be
+          marked in reasonable ways as different from the original
+          version; or
+
+       d. Limiting the use for publicity purposes of names of licensors
+          or authors of the material; or
+
+       e. Declining to grant rights under trademark law for use of some
+          trade names, trademarks, or service marks; or
+
+       f. Requiring indemnification of licensors and authors of that
+          material by anyone who conveys the material (or modified
+          versions of it) with contractual assumptions of liability to
+          the recipient, for any liability that these contractual
+          assumptions directly impose on those licensors and authors.
+
+     All other non-permissive additional terms are considered "further
+     restrictions" within the meaning of section 10.  If the Program as
+     you received it, or any part of it, contains a notice stating that
+     it is governed by this License along with a term that is a further
+     restriction, you may remove that term.  If a license document
+     contains a further restriction but permits relicensing or
+     conveying under this License, you may add to a covered work
+     material governed by the terms of that license document, provided
+     that the further restriction does not survive such relicensing or
+     conveying.
+
+     If you add terms to a covered work in accord with this section, you
+     must place, in the relevant source files, a statement of the
+     additional terms that apply to those files, or a notice indicating
+     where to find the applicable terms.
+
+     Additional terms, permissive or non-permissive, may be stated in
+     the form of a separately written license, or stated as exceptions;
+     the above requirements apply either way.
+
+  8. Termination.
+
+     You may not propagate or modify a covered work except as expressly
+     provided under this License.  Any attempt otherwise to propagate or
+     modify it is void, and will automatically terminate your rights
+     under this License (including any patent licenses granted under
+     the third paragraph of section 11).
+
+     However, if you cease all violation of this License, then your
+     license from a particular copyright holder is reinstated (a)
+     provisionally, unless and until the copyright holder explicitly
+     and finally terminates your license, and (b) permanently, if the
+     copyright holder fails to notify you of the violation by some
+     reasonable means prior to 60 days after the cessation.
+
+     Moreover, your license from a particular copyright holder is
+     reinstated permanently if the copyright holder notifies you of the
+     violation by some reasonable means, this is the first time you have
+     received notice of violation of this License (for any work) from
+     that copyright holder, and you cure the violation prior to 30 days
+     after your receipt of the notice.
+
+     Termination of your rights under this section does not terminate
+     the licenses of parties who have received copies or rights from
+     you under this License.  If your rights have been terminated and
+     not permanently reinstated, you do not qualify to receive new
+     licenses for the same material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+     You are not required to accept this License in order to receive or
+     run a copy of the Program.  Ancillary propagation of a covered work
+     occurring solely as a consequence of using peer-to-peer
+     transmission to receive a copy likewise does not require
+     acceptance.  However, nothing other than this License grants you
+     permission to propagate or modify any covered work.  These actions
+     infringe copyright if you do not accept this License.  Therefore,
+     by modifying or propagating a covered work, you indicate your
+     acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+     Each time you convey a covered work, the recipient automatically
+     receives a license from the original licensors, to run, modify and
+     propagate that work, subject to this License.  You are not
+     responsible for enforcing compliance by third parties with this
+     License.
+
+     An "entity transaction" is a transaction transferring control of an
+     organization, or substantially all assets of one, or subdividing an
+     organization, or merging organizations.  If propagation of a
+     covered work results from an entity transaction, each party to that
+     transaction who receives a copy of the work also receives whatever
+     licenses to the work the party's predecessor in interest had or
+     could give under the previous paragraph, plus a right to
+     possession of the Corresponding Source of the work from the
+     predecessor in interest, if the predecessor has it or can get it
+     with reasonable efforts.
+
+     You may not impose any further restrictions on the exercise of the
+     rights granted or affirmed under this License.  For example, you
+     may not impose a license fee, royalty, or other charge for
+     exercise of rights granted under this License, and you may not
+     initiate litigation (including a cross-claim or counterclaim in a
+     lawsuit) alleging that any patent claim is infringed by making,
+     using, selling, offering for sale, or importing the Program or any
+     portion of it.
+
+ 11. Patents.
+
+     A "contributor" is a copyright holder who authorizes use under this
+     License of the Program or a work on which the Program is based.
+     The work thus licensed is called the contributor's "contributor
+     version".
+
+     A contributor's "essential patent claims" are all patent claims
+     owned or controlled by the contributor, whether already acquired or
+     hereafter acquired, that would be infringed by some manner,
+     permitted by this License, of making, using, or selling its
+     contributor version, but do not include claims that would be
+     infringed only as a consequence of further modification of the
+     contributor version.  For purposes of this definition, "control"
+     includes the right to grant patent sublicenses in a manner
+     consistent with the requirements of this License.
+
+     Each contributor grants you a non-exclusive, worldwide,
+     royalty-free patent license under the contributor's essential
+     patent claims, to make, use, sell, offer for sale, import and
+     otherwise run, modify and propagate the contents of its
+     contributor version.
+
+     In the following three paragraphs, a "patent license" is any
+     express agreement or commitment, however denominated, not to
+     enforce a patent (such as an express permission to practice a
+     patent or covenant not to sue for patent infringement).  To
+     "grant" such a patent license to a party means to make such an
+     agreement or commitment not to enforce a patent against the party.
+
+     If you convey a covered work, knowingly relying on a patent
+     license, and the Corresponding Source of the work is not available
+     for anyone to copy, free of charge and under the terms of this
+     License, through a publicly available network server or other
+     readily accessible means, then you must either (1) cause the
+     Corresponding Source to be so available, or (2) arrange to deprive
+     yourself of the benefit of the patent license for this particular
+     work, or (3) arrange, in a manner consistent with the requirements
+     of this License, to extend the patent license to downstream
+     recipients.  "Knowingly relying" means you have actual knowledge
+     that, but for the patent license, your conveying the covered work
+     in a country, or your recipient's use of the covered work in a
+     country, would infringe one or more identifiable patents in that
+     country that you have reason to believe are valid.
+
+     If, pursuant to or in connection with a single transaction or
+     arrangement, you convey, or propagate by procuring conveyance of, a
+     covered work, and grant a patent license to some of the parties
+     receiving the covered work authorizing them to use, propagate,
+     modify or convey a specific copy of the covered work, then the
+     patent license you grant is automatically extended to all
+     recipients of the covered work and works based on it.
+
+     A patent license is "discriminatory" if it does not include within
+     the scope of its coverage, prohibits the exercise of, or is
+     conditioned on the non-exercise of one or more of the rights that
+     are specifically granted under this License.  You may not convey a
+     covered work if you are a party to an arrangement with a third
+     party that is in the business of distributing software, under
+     which you make payment to the third party based on the extent of
+     your activity of conveying the work, and under which the third
+     party grants, to any of the parties who would receive the covered
+     work from you, a discriminatory patent license (a) in connection
+     with copies of the covered work conveyed by you (or copies made
+     from those copies), or (b) primarily for and in connection with
+     specific products or compilations that contain the covered work,
+     unless you entered into that arrangement, or that patent license
+     was granted, prior to 28 March 2007.
+
+     Nothing in this License shall be construed as excluding or limiting
+     any implied license or other defenses to infringement that may
+     otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+     If conditions are imposed on you (whether by court order,
      agreement or otherwise) that contradict the conditions of this
      License, they do not excuse you from the conditions of this
-     License.  If you cannot distribute so as to satisfy simultaneously
-     your obligations under this License and any other pertinent
-     obligations, then as a consequence you may not distribute the
-     Program at all.  For example, if a patent license would not permit
-     royalty-free redistribution of the Program by all those who
-     receive copies directly or indirectly through you, then the only
-     way you could satisfy both it and this License would be to refrain
-     entirely from distribution of the Program.
-
-     If any portion of this section is held invalid or unenforceable
-     under any particular circumstance, the balance of the section is
-     intended to apply and the section as a whole is intended to apply
-     in other circumstances.
-
-     It is not the purpose of this section to induce you to infringe any
-     patents or other property right claims or to contest validity of
-     any such claims; this section has the sole purpose of protecting
-     the integrity of the free software distribution system, which is
-     implemented by public license practices.  Many people have made
-     generous contributions to the wide range of software distributed
-     through that system in reliance on consistent application of that
-     system; it is up to the author/donor to decide if he or she is
-     willing to distribute software through any other system and a
-     licensee cannot impose that choice.
-
-     This section is intended to make thoroughly clear what is believed
-     to be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-     certain countries either by patents or by copyrighted interfaces,
-     the original copyright holder who places the Program under this
-     License may add an explicit geographical distribution limitation
-     excluding those countries, so that distribution is permitted only
-     in or among countries not thus excluded.  In such case, this
-     License incorporates the limitation as if written in the body of
-     this License.
-
-  9. The Free Software Foundation may publish revised and/or new
-     versions of the General Public License from time to time.  Such
-     new versions will be similar in spirit to the present version, but
-     may differ in detail to address new problems or concerns.
+     License.  If you cannot convey a covered work so as to satisfy
+     simultaneously your obligations under this License and any other
+     pertinent obligations, then as a consequence you may not convey it
+     at all.  For example, if you agree to terms that obligate you to
+     collect a royalty for further conveying from those to whom you
+     convey the Program, the only way you could satisfy both those
+     terms and this License would be to refrain entirely from conveying
+     the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+     Notwithstanding any other provision of this License, you have
+     permission to link or combine any covered work with a work licensed
+     under version 3 of the GNU Affero General Public License into a
+     single combined work, and to convey the resulting work.  The terms
+     of this License will continue to apply to the part which is the
+     covered work, but the special requirements of the GNU Affero
+     General Public License, section 13, concerning interaction through
+     a network will apply to the combination as such.
+
+ 14. Revised Versions of this License.
+
+     The Free Software Foundation may publish revised and/or new
+     versions of the GNU General Public License from time to time.
+     Such new versions will be similar in spirit to the present
+     version, but may differ in detail to address new problems or
+     concerns.
 
      Each version is given a distinguishing version number.  If the
-     Program specifies a version number of this License which applies
-     to it and "any later version", you have the option of following
-     the terms and conditions either of that version or of any later
-     version published by the Free Software Foundation.  If the Program
-     does not specify a version number of this License, you may choose
+     Program specifies that a certain numbered version of the GNU
+     General Public License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that numbered version or of any later version published by the
+     Free Software Foundation.  If the Program does not specify a
+     version number of the GNU General Public License, you may choose
      any version ever published by the Free Software Foundation.
 
- 10. If you wish to incorporate parts of the Program into other free
-     programs whose distribution conditions are different, write to the
-     author to ask for permission.  For software which is copyrighted
-     by the Free Software Foundation, write to the Free Software
-     Foundation; we sometimes make exceptions for this.  Our decision
-     will be guided by the two goals of preserving the free status of
-     all derivatives of our free software and of promoting the sharing
-     and reuse of software generally.
-
-                                NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-     WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-     LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-     HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-     WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
-     NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-     FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE
-     QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-     PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
-     SERVICING, REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-     WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
-     MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
-     LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-     INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-     INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-     DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
-     OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
-     OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-                      END OF TERMS AND CONDITIONS
+     If the Program specifies that a proxy can decide which future
+     versions of the GNU General Public License can be used, that
+     proxy's public statement of acceptance of a version permanently
+     authorizes you to choose that version for the Program.
+
+     Later license versions may give you additional or different
+     permissions.  However, no additional obligations are imposed on any
+     author or copyright holder as a result of your choosing to follow a
+     later version.
+
+ 15. Disclaimer of Warranty.
+
+     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+     APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+     COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE
+     RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.
+     SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+     NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+     WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES
+     AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+     FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+     CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+     THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+     BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+     PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+     PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+     THE POSSIBILITY OF SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+     If the disclaimer of warranty and limitation of liability provided
+     above cannot be given local legal effect according to their terms,
+     reviewing courts shall apply local law that most closely
+     approximates an absolute waiver of all civil liability in
+     connection with the Program, unless a warranty or assumption of
+     liability accompanies a copy of the Program in return for a fee.
+
+
+END OF TERMS AND CONDITIONS
+===========================
 
 How to Apply These Terms to Your New Programs
 =============================================
@@ -20723,62 +21421,54 @@ possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these
 terms.
 
-To do so, attach the following notices to the program.  It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
+   To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least the
 "copyright" line and a pointer to where the full notice is found.
 
-     ONE LINE TO GIVE THE PROGRAM'S NAME AND AN IDEA OF WHAT IT DOES.
-     Copyright (C) YEAR  NAME OF AUTHOR
+     ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
+     Copyright (C) YEAR NAME OF AUTHOR
 
-     This program is free software; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License
-     as published by the Free Software Foundation; either version 2
-     of the License, or (at your option) any later version.
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or (at
+     your option) any later version.
 
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
 
      You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
+     along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-Also add information on how to contact you by electronic and paper mail.
+   Also add information on how to contact you by electronic and paper
+mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+   If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-     Gnomovision version 69, Copyright (C) YEAR NAME OF AUTHOR
-     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-     type `show w'.  This is free software, and you are welcome
-     to redistribute it under certain conditions; type `show c'
-     for details.
+     PROGRAM Copyright (C) YEAR NAME OF AUTHOR
+     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+     This is free software, and you are welcome to redistribute it
+     under certain conditions; type `show c' for details.
 
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
+   The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License.  Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
 
-You should also get your employer (if you work as a programmer) or your
+   You should also get your employer (if you work as a programmer) or
 school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-     Yoyodyne, Inc., hereby disclaims all copyright
-     interest in the program `Gnomovision'
-     (which makes passes at compilers) written
-     by James Hacker.
+necessary.  For more information on this, and how to apply and follow
+the GNU GPL, see `http://www.gnu.org/licenses/'.
 
-     SIGNATURE OF TY COON, 1 April 1989
-     Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library,
-you may consider it more useful to permit linking proprietary
+   The GNU General Public License does not permit incorporating your
+program into proprietary programs.  If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
 applications with the library.  If this is what you want to do, use the
-GNU Lesser General Public License instead of this License.
+GNU Lesser General Public License instead of this License.  But first,
+please read `http://www.gnu.org/philosophy/why-not-lgpl.html'.
 
 
 File: gawk.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Copying,  Up: Top
@@ -20787,6 +21477,7 @@ GNU Free Documentation License
 ******************************
 
                       Version 1.2, November 2002
+
      Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
      51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
@@ -21140,7 +21831,7 @@ GNU Free Documentation License
      translations of some or all Invariant Sections in addition to the
      original versions of these Invariant Sections.  You may include a
      translation of this License, and all the license notices in the
-     Document, and any Warrany Disclaimers, provided that you also
+     Document, and any Warranty Disclaimers, provided that you also
      include the original English version of this License and the
      original versions of those notices and disclaimers.  In case of a
      disagreement between the translation and the original version of
@@ -21195,18 +21886,18 @@ notices just after the title page:
        A copy of the license is included in the section entitled ``GNU
        Free Documentation License''.
 
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
+   If you have Invariant Sections, Front-Cover Texts and Back-Cover
+Texts, replace the "with...Texts." line with this:
 
          with the Invariant Sections being LIST THEIR TITLES, with
          the Front-Cover Texts being LIST, and with the Back-Cover Texts
          being LIST.
 
-If you have Invariant Sections without Cover Texts, or some other
+   If you have Invariant Sections without Cover Texts, or some other
 combination of the three, merge those two alternatives to suit the
 situation.
 
-If your document contains nontrivial examples of program code, we
+   If your document contains nontrivial examples of program code, we
 recommend releasing these examples in parallel under your choice of
 free software license, such as the GNU General Public License, to
 permit their use in free software.
@@ -21217,2895 +21908,2777 @@ File: gawk.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: Top
 Index
 *****
 
+
 * Menu:
 
-* ! (exclamation point), !  operator:    Boolean Ops.       (line  6524)
-* ! (exclamation point), ! operator <1>: Egrep Program.     (line 14679)
-* ! (exclamation point), ! operator:     Precedence.        (line  6698)
-* ! (exclamation point), != operator <1>: Precedence.       (line  6711)
-* ! (exclamation point), != operator:    Typing and Comparison.
-                                                            (line  6342)
+* ! (exclamation point), !  operator:    Boolean Ops.         (line  67)
+* ! (exclamation point), ! operator <1>: Egrep Program.       (line 160)
+* ! (exclamation point), ! operator:     Precedence.          (line  52)
+* ! (exclamation point), != operator <1>: Precedence.         (line  65)
+* ! (exclamation point), != operator:    Comparison Operators.
+                                                              (line  11)
 * ! (exclamation point), !~ operator <1>: Expression Patterns.
-                                                            (line  6851)
-* ! (exclamation point), !~ operator <2>: Precedence.       (line  6727)
-* ! (exclamation point), !~ operator <3>: Typing and Comparison.
-                                                            (line  6342)
-* ! (exclamation point), !~ operator <4>: Regexp Constants. (line  5532)
-* ! (exclamation point), !~ operator <5>: Computed Regexps. (line  2656)
-* ! (exclamation point), !~ operator <6>: Case-sensitivity. (line  2569)
-* ! (exclamation point), !~ operator:    Regexp Usage.      (line  1989)
-* ! operator <1>:                        Egrep Program.     (line 14687)
-* ! operator:                            Ranges.            (line  6955)
-* " (double quote) <1>:                  Quoting.           (line  1376)
-* " (double quote):                      Read Terminal.     (line  1165)
-* " (double quote), regexp constants:    Computed Regexps.  (line  2677)
+                                                              (line  24)
+* ! (exclamation point), !~ operator <2>: Precedence.         (line  81)
+* ! (exclamation point), !~ operator <3>: Comparison Operators.
+                                                              (line  11)
+* ! (exclamation point), !~ operator <4>: Regexp Constants.   (line   6)
+* ! (exclamation point), !~ operator <5>: Computed Regexps.   (line   6)
+* ! (exclamation point), !~ operator <6>: Case-sensitivity.   (line  26)
+* ! (exclamation point), !~ operator:    Regexp Usage.        (line  19)
+* ! operator <1>:                        Egrep Program.       (line 168)
+* ! operator:                            Ranges.              (line  48)
+* " (double quote) <1>:                  Quoting.             (line  33)
+* " (double quote):                      Read Terminal.       (line  25)
+* " (double quote), regexp constants:    Computed Regexps.    (line  28)
 * # (number sign), #! (executable scripts): Executable Scripts.
-                                                            (line  1233)
+                                                              (line   6)
 * # (number sign), #! (executable scripts), portability issues with: Executable Scripts.
-                                                            (line  1233)
-* # (number sign), commenting:           Comments.          (line  1296)
-* $ (dollar sign):                       Regexp Operators.  (line  2210)
-* $ (dollar sign), $ field operator <1>: Precedence.        (line  6689)
-* $ (dollar sign), $ field operator:     Fields.            (line  3027)
+                                                              (line   6)
+* # (number sign), commenting:           Comments.            (line   6)
+* $ (dollar sign):                       Regexp Operators.    (line  35)
+* $ (dollar sign), $ field operator <1>: Precedence.          (line  43)
+* $ (dollar sign), $ field operator:     Fields.              (line  19)
 * $ (dollar sign), incrementing fields and arrays: Increment Ops.
-                                                            (line  6184)
-* $ field operator:                      Fields.            (line  3027)
-* % (percent sign), % operator:          Precedence.        (line  6701)
-* % (percent sign), %= operator <1>:     Precedence.        (line  6742)
-* % (percent sign), %= operator:         Assignment Ops.    (line  6111)
-* & (ampersand), && operator <1>:        Precedence.        (line  6733)
-* & (ampersand), && operator:            Boolean Ops.       (line  6514)
-* & (ampersand), gsub/gensub/sub functions and: Gory Details.
-                                                            (line  9642)
-* ' (single quote) <1>:                  Quoting.           (line  1370)
-* ' (single quote) <2>:                  Long.              (line  1223)
-* ' (single quote):                      One-shot.          (line  1126)
-* ' (single quote), vs. apostrophe:      Comments.          (line  1317)
-* ' (single quote), with double quotes:  Quoting.           (line  1392)
-* () (parentheses):                      Regexp Operators.  (line  2253)
-* () (parentheses), pgawk program:       Profiling.         (line 11877)
+                                                              (line  30)
+* $ field operator:                      Fields.              (line  19)
+* % (percent sign), % operator:          Precedence.          (line  55)
+* % (percent sign), %= operator <1>:     Precedence.          (line  96)
+* % (percent sign), %= operator:         Assignment Ops.      (line 129)
+* & (ampersand), && operator <1>:        Precedence.          (line  87)
+* & (ampersand), && operator:            Boolean Ops.         (line  57)
+* & (ampersand), gsub/gensub/sub functions and: Gory Details. (line   6)
+* ' (single quote) <1>:                  Quoting.             (line  27)
+* ' (single quote) <2>:                  Long.                (line  33)
+* ' (single quote):                      One-shot.            (line  15)
+* ' (single quote), vs. apostrophe:      Comments.            (line  27)
+* ' (single quote), with double quotes:  Quoting.             (line  49)
+* () (parentheses):                      Regexp Operators.    (line  78)
+* () (parentheses), pgawk program:       Profiling.           (line 144)
 * * (asterisk), * operator, as multiplication operator: Precedence.
-                                                            (line  6701)
+                                                              (line  55)
 * * (asterisk), * operator, as regexp operator: Regexp Operators.
-                                                            (line  2261)
+                                                              (line  86)
 * * (asterisk), * operator, null strings, matching: Gory Details.
-                                                            (line  9796)
-* * (asterisk), ** operator <1>:         Options.           (line 12191)
-* * (asterisk), ** operator <2>:         Precedence.        (line  6695)
-* * (asterisk), ** operator:             Arithmetic Ops.    (line  5898)
-* * (asterisk), **= operator <1>:        Options.           (line 12191)
-* * (asterisk), **= operator <2>:        Precedence.        (line  6742)
-* * (asterisk), **= operator:            Assignment Ops.    (line  6111)
-* * (asterisk), *= operator <1>:         Precedence.        (line  6742)
-* * (asterisk), *= operator:             Assignment Ops.    (line  6111)
-* + (plus sign):                         Regexp Operators.  (line  2276)
-* + (plus sign), + operator:             Precedence.        (line  6698)
-* + (plus sign), ++ operator <1>:        Precedence.        (line  6692)
-* + (plus sign), ++ operator:            Increment Ops.     (line  6194)
-* + (plus sign), += operator <1>:        Precedence.        (line  6742)
-* + (plus sign), += operator:            Assignment Ops.    (line  6064)
+                                                              (line 160)
+* * (asterisk), ** operator <1>:         Options.             (line 192)
+* * (asterisk), ** operator <2>:         Precedence.          (line  49)
+* * (asterisk), ** operator:             Arithmetic Ops.      (line  81)
+* * (asterisk), **= operator <1>:        Options.             (line 192)
+* * (asterisk), **= operator <2>:        Precedence.          (line  96)
+* * (asterisk), **= operator:            Assignment Ops.      (line 129)
+* * (asterisk), *= operator <1>:         Precedence.          (line  96)
+* * (asterisk), *= operator:             Assignment Ops.      (line 129)
+* + (plus sign):                         Regexp Operators.    (line 101)
+* + (plus sign), + operator:             Precedence.          (line  52)
+* + (plus sign), ++ operator <1>:        Precedence.          (line  46)
+* + (plus sign), ++ operator:            Increment Ops.       (line  40)
+* + (plus sign), += operator <1>:        Precedence.          (line  96)
+* + (plus sign), += operator:            Assignment Ops.      (line  82)
 * + (plus sign), decrement/increment operators: Increment Ops.
-                                                            (line  6165)
-* , (comma), in range patterns:          Ranges.            (line  6913)
-* - (hyphen), - operator:                Precedence.        (line  6698)
-* - (hyphen), -- (decrement/increment) operator: Precedence.
-                                                            (line  6692)
-* - (hyphen), -- operator:               Increment Ops.     (line  6202)
-* - (hyphen), -= operator <1>:           Precedence.        (line  6742)
-* - (hyphen), -= operator:               Assignment Ops.    (line  6111)
-* - (hyphen), filenames beginning with:  Options.           (line 12073)
-* - (hyphen), in character lists:        Character Lists.   (line  2364)
-* --assign option:                       Options.           (line 12036)
-* --compat option:                       Options.           (line 12085)
-* --copyleft option:                     Options.           (line 12098)
-* --copyright option:                    Options.           (line 12093)
+                                                              (line  11)
+* , (comma), in range patterns:          Ranges.              (line   6)
+* - (hyphen), - operator:                Precedence.          (line  52)
+* - (hyphen), -- (decrement/increment) operator: Precedence.  (line  46)
+* - (hyphen), -- operator:               Increment Ops.       (line  48)
+* - (hyphen), -= operator <1>:           Precedence.          (line  96)
+* - (hyphen), -= operator:               Assignment Ops.      (line 129)
+* - (hyphen), filenames beginning with:  Options.             (line  67)
+* - (hyphen), in character lists:        Character Lists.     (line  17)
+* --assign option:                       Options.             (line  30)
+* --compat option:                       Options.             (line  79)
+* --copyleft option:                     Options.             (line  92)
+* --copyright option:                    Options.             (line  87)
+* --disable-directories-fatal configuration option: Additional Configuration Options.
+                                                              (line  37)
 * --disable-lint configuration option:   Additional Configuration Options.
-                                                            (line 17477)
+                                                              (line  17)
 * --disable-nls configuration option:    Additional Configuration Options.
-                                                            (line 17492)
-* --dump-variables option <1>:           Library Names.     (line 12580)
-* --dump-variables option:               Options.           (line 12101)
+                                                              (line  32)
+* --dump-variables option <1>:           Library Names.       (line  45)
+* --dump-variables option:               Options.             (line  95)
 * --enable-portals configuration option <1>: Additional Configuration Options.
-                                                            (line 17469)
-* --enable-portals configuration option: Portal Files.      (line 11725)
+                                                              (line   9)
+* --enable-portals configuration option: Portal Files.        (line   6)
 * --enable-switch configuration option:  Additional Configuration Options.
-                                                            (line 17473)
-* --exec option:                         Options.           (line 12117)
-* --field-separator option:              Options.           (line 12027)
-* --file option:                         Options.           (line 12031)
-* --gen-po option <1>:                   Options.           (line 12136)
-* --gen-po option:                       String Extraction. (line 11177)
-* --help option:                         Options.           (line 12145)
-* --lint option <1>:                     Options.           (line 12150)
-* --lint option:                         Command Line.      (line 12002)
-* --lint-old option:                     Options.           (line 12162)
-* --non-decimal-data option <1>:         Options.           (line 12167)
-* --non-decimal-data option:             Nondecimal Data.   (line 11480)
+                                                              (line  13)
+* --exec option:                         Options.             (line 111)
+* --field-separator option:              Options.             (line  21)
+* --file option:                         Options.             (line  25)
+* --gen-po option <1>:                   Options.             (line 130)
+* --gen-po option:                       String Extraction.   (line   6)
+* --help option:                         Options.             (line 139)
+* --lint option <1>:                     Options.             (line 144)
+* --lint option:                         Command Line.        (line  20)
+* --lint-old option:                     Options.             (line 163)
+* --non-decimal-data option <1>:         Options.             (line 168)
+* --non-decimal-data option:             Nondecimal Data.     (line   6)
 * --non-decimal-data option, strtonum function and: Nondecimal Data.
-                                                            (line 11510)
-* --posix option:                        Options.           (line 12175)
-* --posix option, --traditional option and: Options.        (line 12202)
-* --profile option <1>:                  Options.           (line 12208)
-* --profile option:                      Profiling.         (line 11749)
-* --re-interval option:                  Options.           (line 12220)
-* --source option:                       Options.           (line 12227)
-* --traditional option:                  Options.           (line 12085)
-* --traditional option, --posix option and: Options.        (line 12202)
-* --usage option:                        Options.           (line 12145)
-* --version option:                      Options.           (line 12235)
-* -f option:                             Options.           (line 12031)
-* -F option <1>:                         Options.           (line 12027)
+                                                              (line  36)
+* --posix option:                        Options.             (line 176)
+* --posix option, --traditional option and: Options.          (line 206)
+* --profile option <1>:                  Options.             (line 212)
+* --profile option:                      Profiling.           (line  15)
+* --re-interval option:                  Options.             (line 224)
+* --source option:                       Options.             (line 231)
+* --traditional option:                  Options.             (line  79)
+* --traditional option, --posix option and: Options.          (line 206)
+* --usage option:                        Options.             (line 139)
+* --use-lc-numeric option:               Options.             (line 239)
+* --version option:                      Options.             (line 244)
+* -f option:                             Options.             (line  25)
+* -F option <1>:                         Options.             (line  21)
 * -F option:                             Command Line Field Separator.
-                                                            (line  3427)
-* -f option:                             Long.              (line  1202)
-* -F option, -Ft sets FS to TAB:         Options.           (line 12243)
-* -f option, on command line:            Options.           (line 12248)
-* -F option, troubleshooting:            Known Bugs.        (line 12454)
-* -mf/-mr options:                       Options.           (line 12051)
-* -v option:                             Options.           (line 12036)
-* -v option, variables, assigning:       Assignment Options.
-                                                            (line  5677)
-* -W option:                             Options.           (line 12061)
-* . (period):                            Regexp Operators.  (line  2218)
-* .mo files:                             Explaining gettext.
-                                                            (line 10954)
-* .mo files, converting from .po:        I18N Example.      (line 11400)
-* .mo files, specifying directory of <1>: Programmer i18n.  (line 11090)
-* .mo files, specifying directory of:    Explaining gettext.
-                                                            (line 10966)
-* .po files <1>:                         Translator i18n.   (line 11156)
-* .po files:                             Explaining gettext.
-                                                            (line 10951)
-* .po files, converting to .mo:          I18N Example.      (line 11400)
-* / (forward slash):                     Regexp.            (line  1949)
-* / (forward slash), / operator:         Precedence.        (line  6701)
-* / (forward slash), /= operator <1>:    Precedence.        (line  6742)
-* / (forward slash), /= operator:        Assignment Ops.    (line  6111)
+                                                              (line   6)
+* -f option:                             Long.                (line  12)
+* -F option, -Ft sets FS to TAB:         Options.             (line 252)
+* -f option, on command line:            Options.             (line 257)
+* -F option, troubleshooting:            Known Bugs.          (line   6)
+* -mf/-mr options:                       Options.             (line  45)
+* -v option:                             Options.             (line  30)
+* -v option, variables, assigning:       Assignment Options.  (line  12)
+* -W option:                             Options.             (line  55)
+* . (period):                            Regexp Operators.    (line  43)
+* .mo files:                             Explaining gettext.  (line  39)
+* .mo files, converting from .po:        I18N Example.        (line  62)
+* .mo files, specifying directory of <1>: Programmer i18n.    (line  45)
+* .mo files, specifying directory of:    Explaining gettext.  (line  51)
+* .po files <1>:                         Translator i18n.     (line   6)
+* .po files:                             Explaining gettext.  (line  36)
+* .po files, converting to .mo:          I18N Example.        (line  62)
+* / (forward slash):                     Regexp.              (line  10)
+* / (forward slash), / operator:         Precedence.          (line  55)
+* / (forward slash), /= operator <1>:    Precedence.          (line  96)
+* / (forward slash), /= operator:        Assignment Ops.      (line 129)
 * / (forward slash), /= operator, vs. /=.../ regexp constant: Assignment Ops.
-                                                            (line  6137)
-* / (forward slash), patterns and:       Expression Patterns.
-                                                            (line  6851)
-* /= operator vs. /=.../ regexp constant: Assignment Ops.   (line  6137)
-* /dev/... special files (gawk):         Special FD.        (line  5054)
-* /inet/ files (gawk):                   TCP/IP Networking. (line 11658)
-* /p files (gawk):                       Portal Files.      (line 11725)
-* ; (semicolon):                         Statements/Lines.  (line  1853)
-* ; (semicolon), AWKPATH variable and:   PC Using.          (line 17858)
+                                                              (line 148)
+* / (forward slash), patterns and:       Expression Patterns. (line  24)
+* /= operator vs. /=.../ regexp constant: Assignment Ops.     (line 148)
+* /dev/... special files (gawk):         Special FD.          (line  41)
+* /inet/ files (gawk):                   TCP/IP Networking.   (line   6)
+* /p files (gawk):                       Portal Files.        (line   6)
+* ; (semicolon):                         Statements/Lines.    (line  90)
+* ; (semicolon), AWKPATH variable and:   PC Using.            (line  11)
 * ; (semicolon), separating statements in actions <1>: Statements.
-                                                            (line  7228)
+                                                              (line  10)
 * ; (semicolon), separating statements in actions: Action Overview.
-                                                            (line  7178)
-* < (left angle bracket), < operator <1>: Precedence.       (line  6711)
-* < (left angle bracket), < operator:    Typing and Comparison.
-                                                            (line  6342)
-* < (left angle bracket), < operator (I/O): Getline/File.   (line  3979)
-* < (left angle bracket), <= operator <1>: Precedence.      (line  6711)
-* < (left angle bracket), <= operator:   Typing and Comparison.
-                                                            (line  6342)
-* = (equals sign), = operator:           Assignment Ops.    (line  5989)
-* = (equals sign), == operator <1>:      Precedence.        (line  6711)
-* = (equals sign), == operator:          Typing and Comparison.
-                                                            (line  6342)
-* > (right angle bracket), > operator <1>: Precedence.      (line  6711)
-* > (right angle bracket), > operator:   Typing and Comparison.
-                                                            (line  6342)
-* > (right angle bracket), > operator (I/O): Redirection.   (line  4864)
-* > (right angle bracket), >= operator <1>: Precedence.     (line  6711)
-* > (right angle bracket), >= operator:  Typing and Comparison.
-                                                            (line  6342)
-* > (right angle bracket), >> operator (I/O) <1>: Precedence.
-                                                            (line  6711)
-* > (right angle bracket), >> operator (I/O): Redirection.  (line  4892)
+                                                              (line  19)
+* < (left angle bracket), < operator <1>: Precedence.         (line  65)
+* < (left angle bracket), < operator:    Comparison Operators.
+                                                              (line  11)
+* < (left angle bracket), < operator (I/O): Getline/File.     (line   6)
+* < (left angle bracket), <= operator <1>: Precedence.        (line  65)
+* < (left angle bracket), <= operator:   Comparison Operators.
+                                                              (line  11)
+* = (equals sign), = operator:           Assignment Ops.      (line   6)
+* = (equals sign), == operator <1>:      Precedence.          (line  65)
+* = (equals sign), == operator:          Comparison Operators.
+                                                              (line  11)
+* > (right angle bracket), > operator <1>: Precedence.        (line  65)
+* > (right angle bracket), > operator:   Comparison Operators.
+                                                              (line  11)
+* > (right angle bracket), > operator (I/O): Redirection.     (line  19)
+* > (right angle bracket), >= operator <1>: Precedence.       (line  65)
+* > (right angle bracket), >= operator:  Comparison Operators.
+                                                              (line  11)
+* > (right angle bracket), >> operator (I/O) <1>: Precedence. (line  65)
+* > (right angle bracket), >> operator (I/O): Redirection.    (line  47)
 * ? (question mark) <1>:                 GNU Regexp Operators.
-                                                            (line  2506)
-* ? (question mark):                     Regexp Operators.  (line  2285)
-* ? (question mark), ?: operator:        Precedence.        (line  6739)
-* [] (square brackets):                  Regexp Operators.  (line  2230)
-* \ (backslash) <1>:                     Regexp Operators.  (line  2193)
-* \ (backslash) <2>:                     Quoting.           (line  1370)
-* \ (backslash) <3>:                     Comments.          (line  1339)
-* \ (backslash):                         Read Terminal.     (line  1165)
-* \ (backslash), \" escape sequence:     Escape Sequences.  (line  2108)
+                                                              (line  51)
+* ? (question mark):                     Regexp Operators.    (line 110)
+* ? (question mark), ?: operator:        Precedence.          (line  93)
+* [] (square brackets):                  Regexp Operators.    (line  55)
+* \ (backslash) <1>:                     Regexp Operators.    (line  18)
+* \ (backslash) <2>:                     Quoting.             (line  27)
+* \ (backslash) <3>:                     Comments.            (line  50)
+* \ (backslash):                         Read Terminal.       (line  25)
+* \ (backslash), \" escape sequence:     Escape Sequences.    (line  76)
 * \ (backslash), \' operator (gawk):     GNU Regexp Operators.
-                                                            (line  2503)
-* \ (backslash), \/ escape sequence:     Escape Sequences.  (line  2101)
+                                                              (line  48)
+* \ (backslash), \/ escape sequence:     Escape Sequences.    (line  69)
 * \ (backslash), \< operator (gawk):     GNU Regexp Operators.
-                                                            (line  2477)
+                                                              (line  22)
 * \ (backslash), \> operator (gawk):     GNU Regexp Operators.
-                                                            (line  2481)
+                                                              (line  26)
 * \ (backslash), \` operator (gawk):     GNU Regexp Operators.
-                                                            (line  2501)
-* \ (backslash), \a escape sequence:     Escape Sequences.  (line  2066)
-* \ (backslash), \b escape sequence:     Escape Sequences.  (line  2070)
+                                                              (line  46)
+* \ (backslash), \a escape sequence:     Escape Sequences.    (line  34)
+* \ (backslash), \b escape sequence:     Escape Sequences.    (line  38)
 * \ (backslash), \B operator (gawk):     GNU Regexp Operators.
-                                                            (line  2490)
-* \ (backslash), \f escape sequence:     Escape Sequences.  (line  2073)
-* \ (backslash), \n escape sequence:     Escape Sequences.  (line  2076)
-* \ (backslash), \NNN escape sequence:   Escape Sequences.  (line  2088)
-* \ (backslash), \r escape sequence:     Escape Sequences.  (line  2079)
-* \ (backslash), \t escape sequence:     Escape Sequences.  (line  2082)
-* \ (backslash), \v escape sequence:     Escape Sequences.  (line  2085)
+                                                              (line  35)
+* \ (backslash), \f escape sequence:     Escape Sequences.    (line  41)
+* \ (backslash), \n escape sequence:     Escape Sequences.    (line  44)
+* \ (backslash), \NNN escape sequence:   Escape Sequences.    (line  56)
+* \ (backslash), \r escape sequence:     Escape Sequences.    (line  47)
+* \ (backslash), \t escape sequence:     Escape Sequences.    (line  50)
+* \ (backslash), \v escape sequence:     Escape Sequences.    (line  53)
 * \ (backslash), \W operator (gawk):     GNU Regexp Operators.
-                                                            (line  2473)
+                                                              (line  18)
 * \ (backslash), \w operator (gawk):     GNU Regexp Operators.
-                                                            (line  2468)
-* \ (backslash), \x escape sequence:     Escape Sequences.  (line  2093)
+                                                              (line  13)
+* \ (backslash), \x escape sequence:     Escape Sequences.    (line  61)
 * \ (backslash), \y operator (gawk):     GNU Regexp Operators.
-                                                            (line  2485)
+                                                              (line  30)
 * \ (backslash), as field separators:    Command Line Field Separator.
-                                                            (line  3448)
-* \ (backslash), continuing lines and <1>: Egrep Program.   (line 14737)
-* \ (backslash), continuing lines and:   Statements/Lines.  (line  1783)
+                                                              (line  27)
+* \ (backslash), continuing lines and <1>: Egrep Program.     (line 218)
+* \ (backslash), continuing lines and:   Statements/Lines.    (line  19)
 * \ (backslash), continuing lines and, comments and: Statements/Lines.
-                                                            (line  1838)
+                                                              (line  75)
 * \ (backslash), continuing lines and, in csh <1>: Statements/Lines.
-                                                            (line  1807)
-* \ (backslash), continuing lines and, in csh: More Complex.
-                                                            (line  1708)
-* \ (backslash), gsub/gensub/sub functions and: Gory Details.
-                                                            (line  9642)
-* \ (backslash), in character lists:     Character Lists.   (line  2364)
-* \ (backslash), in escape sequences:    Escape Sequences.  (line  2038)
+                                                              (line  44)
+* \ (backslash), continuing lines and, in csh: More Complex.  (line  15)
+* \ (backslash), gsub/gensub/sub functions and: Gory Details. (line   6)
+* \ (backslash), in character lists:     Character Lists.     (line  17)
+* \ (backslash), in escape sequences:    Escape Sequences.    (line   6)
 * \ (backslash), in escape sequences, POSIX and: Escape Sequences.
-                                                            (line  2145)
-* \ (backslash), regexp constants:       Computed Regexps.  (line  2677)
+                                                              (line 113)
+* \ (backslash), regexp constants:       Computed Regexps.    (line  28)
 * ^ (caret) <1>:                         GNU Regexp Operators.
-                                                            (line  2506)
-* ^ (caret):                             Regexp Operators.  (line  2197)
-* ^ (caret), ^ operator <1>:             Options.           (line 12191)
-* ^ (caret), ^ operator:                 Precedence.        (line  6695)
-* ^ (caret), ^= operator <1>:            Options.           (line 12191)
-* ^ (caret), ^= operator <2>:            Precedence.        (line  6742)
-* ^ (caret), ^= operator:                Assignment Ops.    (line  6111)
-* ^ (caret), in character lists:         Character Lists.   (line  2364)
-* _ (underscore), _ C macro:             Explaining gettext.
-                                                            (line 10983)
+                                                              (line  51)
+* ^ (caret):                             Regexp Operators.    (line  22)
+* ^ (caret), ^ operator <1>:             Options.             (line 192)
+* ^ (caret), ^ operator:                 Precedence.          (line  49)
+* ^ (caret), ^= operator <1>:            Options.             (line 192)
+* ^ (caret), ^= operator <2>:            Precedence.          (line  96)
+* ^ (caret), ^= operator:                Assignment Ops.      (line 129)
+* ^ (caret), in character lists:         Character Lists.     (line  17)
+* _ (underscore), _ C macro:             Explaining gettext.  (line  68)
 * _ (underscore), in names of private variables: Library Names.
-                                                            (line 12564)
-* _ (underscore), translatable string:   Programmer i18n.   (line 11112)
-* _gr_init user-defined function:        Group Functions.   (line 14042)
-* _pw_init user-defined function:        Passwd Functions.  (line 13828)
-* accessing fields:                      Fields.            (line  3014)
-* account information <1>:               Group Functions.   (line 13968)
-* account information:                   Passwd Functions.  (line 13753)
-* actions:                               Action Overview.   (line  7165)
-* actions, control statements in:        Statements.        (line  7224)
-* actions, default:                      Very Simple.       (line  1559)
-* actions, empty:                        Very Simple.       (line  1564)
-* adding, features to gawk:              Adding Code.       (line 18547)
-* adding, fields:                        Changing Fields.   (line  3177)
-* adding, functions to gawk:             Dynamic Extensions.
-                                                            (line 18765)
-* advanced features, buffering:          I/O Functions.     (line  9904)
+                                                              (line  29)
+* _ (underscore), translatable string:   Programmer i18n.     (line  67)
+* _gr_init user-defined function:        Group Functions.     (line  80)
+* _pw_init user-defined function:        Passwd Functions.    (line  91)
+* accessing fields:                      Fields.              (line   6)
+* account information <1>:               Group Functions.     (line   6)
+* account information:                   Passwd Functions.    (line  16)
+* actions:                               Action Overview.     (line   6)
+* actions, control statements in:        Statements.          (line   6)
+* actions, default:                      Very Simple.         (line  34)
+* actions, empty:                        Very Simple.         (line  39)
+* adding, features to gawk:              Adding Code.         (line   6)
+* adding, fields:                        Changing Fields.     (line  53)
+* adding, functions to gawk:             Dynamic Extensions.  (line  10)
+* advanced features, buffering:          I/O Functions.       (line  95)
 * advanced features, close function:     Close Files And Pipes.
-                                                            (line  5323)
+                                                              (line 130)
 * advanced features, constants, values of: Nondecimal-numbers.
-                                                            (line  5518)
-* advanced features, data files as single record: Records.  (line  2979)
-* advanced features, fixed-width data:   Constant Size.     (line  3605)
-* advanced features, FNR/NR variables:   Auto-set.          (line  8148)
-* advanced features, gawk:               Advanced Features. (line 11449)
-* advanced features, gawk, BSD portals:  Portal Files.      (line 11725)
+                                                              (line  67)
+* advanced features, data files as single record: Records.    (line 170)
+* advanced features, fixed-width data:   Constant Size.       (line   9)
+* advanced features, FNR/NR variables:   Auto-set.            (line 187)
+* advanced features, gawk:               Advanced Features.   (line   6)
+* advanced features, gawk, BSD portals:  Portal Files.        (line   6)
 * advanced features, gawk, network programming: TCP/IP Networking.
-                                                            (line 11658)
+                                                              (line   6)
 * advanced features, gawk, nondecimal input data: Nondecimal Data.
-                                                            (line 11480)
+                                                              (line   6)
 * advanced features, gawk, processes, communicating with: Two-way I/O.
-                                                            (line 11539)
+                                                              (line  23)
 * advanced features, network connections, See Also networks, connections: Advanced Features.
-                                                            (line 11449)
-* advanced features, null strings, matching: Gory Details.  (line  9796)
-* advanced features, operators, precedence: Increment Ops.  (line  6215)
-* advanced features, piping into sh:     Redirection.       (line  4981)
-* advanced features, regexp constants:   Assignment Ops.    (line  6137)
-* Aho, Alfred <1>:                       Contributors.      (line 17062)
-* Aho, Alfred:                           History.           (line   640)
-* alarm clock example program:           Alarm Program.     (line 15480)
-* alarm.awk program:                     Alarm Program.     (line 15498)
-* algorithms:                            Basic High Level.  (line 19603)
-* Alpha (DEC):                           Manual History.    (line   886)
-* amazing awk assembler (aaa):           Glossary.          (line 19837)
-* amazingly workable formatter (awf):    Glossary.          (line 19845)
+                                                              (line   6)
+* advanced features, null strings, matching: Gory Details.    (line 160)
+* advanced features, operators, precedence: Increment Ops.    (line  61)
+* advanced features, piping into sh:     Redirection.         (line 140)
+* advanced features, regexp constants:   Assignment Ops.      (line 148)
+* Aho, Alfred <1>:                       Contributors.        (line  12)
+* Aho, Alfred:                           History.             (line  17)
+* alarm clock example program:           Alarm Program.       (line   9)
+* alarm.awk program:                     Alarm Program.       (line  27)
+* algorithms:                            Basic High Level.    (line  66)
+* Alpha (DEC):                           Manual History.      (line  28)
+* amazing awk assembler (aaa):           Glossary.            (line  12)
+* amazingly workable formatter (awf):    Glossary.            (line  20)
 * ambiguity, syntactic: /= operator vs. /=.../ regexp constant: Assignment Ops.
-                                                            (line  6137)
-* amiga:                                 Amiga Installation.
-                                                            (line 17569)
-* ampersand (&), && operator:            Boolean Ops.       (line  6514)
-* ampersand (&), &&operator:             Precedence.        (line  6733)
-* ampersand (&), gsub/gensub/sub functions and: Gory Details.
-                                                            (line  9642)
-* AND bitwise operation:                 Bitwise Functions. (line 10314)
-* and Boolean-logic operator:            Boolean Ops.       (line  6463)
-* and function (gawk):                   Bitwise Functions. (line 10347)
-* ANSI:                                  Glossary.          (line 19856)
-* archeologists:                         Bugs.              (line 18314)
-* ARGC/ARGV variables <1>:               ARGC and ARGV.     (line  8180)
-* ARGC/ARGV variables:                   Auto-set.          (line  7972)
+                                                              (line 148)
+* amiga:                                 Amiga Installation.  (line   6)
+* ampersand (&), && operator:            Boolean Ops.         (line  57)
+* ampersand (&), &&operator:             Precedence.          (line  87)
+* ampersand (&), gsub/gensub/sub functions and: Gory Details. (line   6)
+* AND bitwise operation:                 Bitwise Functions.   (line   6)
+* and Boolean-logic operator:            Boolean Ops.         (line   6)
+* and function (gawk):                   Bitwise Functions.   (line  39)
+* ANSI:                                  Glossary.            (line  31)
+* archeologists:                         Bugs.                (line   6)
+* ARGC/ARGV variables <1>:               ARGC and ARGV.       (line   6)
+* ARGC/ARGV variables:                   Auto-set.            (line  11)
 * ARGC/ARGV variables, command-line arguments: Other Arguments.
-                                                            (line 12311)
-* ARGC/ARGV variables, portability and:  Executable Scripts.
-                                                            (line  1270)
-* ARGIND variable:                       Auto-set.          (line  8001)
-* ARGIND variable, command-line arguments: Other Arguments. (line 12311)
-* arguments, command-line <1>:           Other Arguments.   (line 12305)
-* arguments, command-line <2>:           ARGC and ARGV.     (line  8180)
-* arguments, command-line:               Auto-set.          (line  7972)
-* arguments, command-line, invoking awk: Command Line.      (line 11988)
-* arguments, in function calls:          Function Calls.    (line  6603)
-* arguments, processing:                 Getopt Function.   (line 13460)
-* arguments, retrieving:                 Internals.         (line 18907)
-* arithmetic operators:                  Arithmetic Ops.    (line  5823)
-* arrays:                                Arrays.            (line  8276)
-* arrays, as parameters to functions:    Function Caveats.  (line 10716)
-* arrays, associative:                   Array Intro.       (line  8356)
-* arrays, associative, clearing:         Internals.         (line 18852)
-* arrays, associative, library functions and: Library Names.
-                                                            (line 12592)
-* arrays, deleting entire contents:      Delete.            (line  8618)
-* arrays, elements, assigning:           Assigning Elements.
-                                                            (line  8460)
-* arrays, elements, deleting:            Delete.            (line  8585)
-* arrays, elements, installing:          Internals.         (line 18856)
-* arrays, elements, order of:            Scanning an Array. (line  8571)
+                                                              (line  12)
+* ARGC/ARGV variables, portability and:  Executable Scripts.  (line  43)
+* ARGIND variable:                       Auto-set.            (line  40)
+* ARGIND variable, command-line arguments: Other Arguments.   (line  12)
+* arguments, command-line <1>:           Other Arguments.     (line   6)
+* arguments, command-line <2>:           ARGC and ARGV.       (line   6)
+* arguments, command-line:               Auto-set.            (line  11)
+* arguments, command-line, invoking awk: Command Line.        (line   6)
+* arguments, in function calls:          Function Calls.      (line  16)
+* arguments, processing:                 Getopt Function.     (line   6)
+* arguments, retrieving:                 Internals.           (line 121)
+* arithmetic operators:                  Arithmetic Ops.      (line   6)
+* arrays:                                Arrays.              (line   6)
+* arrays, as parameters to functions:    Function Caveats.    (line  55)
+* arrays, associative:                   Array Intro.         (line  45)
+* arrays, associative, clearing:         Internals.           (line  66)
+* arrays, associative, library functions and: Library Names.  (line  57)
+* arrays, deleting entire contents:      Delete.              (line  39)
+* arrays, elements, assigning:           Assigning Elements.  (line   6)
+* arrays, elements, deleting:            Delete.              (line   6)
+* arrays, elements, installing:          Internals.           (line  70)
+* arrays, elements, order of:            Scanning an Array.   (line  47)
 * arrays, elements, referencing:         Reference to Elements.
-                                                            (line  8413)
-* arrays, elements, retrieving number of: String Functions. (line  9176)
-* arrays, for statement and:             Scanning an Array. (line  8544)
-* arrays, IGNORECASE variable and:       Array Intro.       (line  8398)
-* arrays, indexing:                      Array Intro.       (line  8356)
-* arrays, merging into strings:          Join Function.     (line 13067)
-* arrays, multidimensional:              Multi-dimensional. (line  8754)
-* arrays, multidimensional, scanning:    Multi-scanning.    (line  8840)
-* arrays, names of:                      Arrays.            (line  8287)
-* arrays, scanning:                      Scanning an Array. (line  8530)
-* arrays, sorting:                       Array Sorting.     (line  8875)
-* arrays, sorting, IGNORECASE variable and: Array Sorting.  (line  8953)
-* arrays, sparse:                        Array Intro.       (line  8377)
+                                                              (line   6)
+* arrays, elements, retrieving number of: String Functions.   (line  18)
+* arrays, for statement and:             Scanning an Array.   (line  20)
+* arrays, IGNORECASE variable and:       Array Intro.         (line  87)
+* arrays, indexing:                      Array Intro.         (line  45)
+* arrays, merging into strings:          Join Function.       (line   6)
+* arrays, multidimensional:              Multi-dimensional.   (line   6)
+* arrays, multidimensional, scanning:    Multi-scanning.      (line  11)
+* arrays, names of:                      Arrays.              (line  17)
+* arrays, scanning:                      Scanning an Array.   (line   6)
+* arrays, sorting:                       Array Sorting.       (line   6)
+* arrays, sorting, IGNORECASE variable and: Array Sorting.    (line  86)
+* arrays, sparse:                        Array Intro.         (line  66)
 * arrays, subscripts:                    Numeric Array Subscripts.
-                                                            (line  8656)
+                                                              (line   6)
 * arrays, subscripts, uninitialized variables as: Uninitialized Subscripts.
-                                                            (line  8707)
+                                                              (line   6)
 * artificial intelligence, gawk and:     Distribution contents.
-                                                            (line 17294)
-* ASCII:                                 Ordinal Functions. (line 13014)
-* asort function (gawk) <1>:             String Functions.  (line  9176)
-* asort function (gawk):                 Array Sorting.     (line  8875)
-* asort function (gawk), arrays, sorting: Array Sorting.    (line  8875)
-* asorti function (gawk):                String Functions.  (line  9205)
-* assert function (C library):           Assert Function.   (line 12815)
-* assert user-defined function:          Assert Function.   (line 12837)
-* assertions:                            Assert Function.   (line 12815)
-* assignment operators:                  Assignment Ops.    (line  5989)
-* assignment operators, evaluation order: Assignment Ops.   (line  6093)
-* assignment operators, lvalues/rvalues: Assignment Ops.    (line  6014)
-* assignments as filenames:              Ignoring Assigns.  (line 13418)
-* assoc_clear internal function:         Internals.         (line 18852)
-* assoc_lookup internal function:        Internals.         (line 18856)
-* associative arrays:                    Array Intro.       (line  8356)
+                                                              (line  47)
+* ASCII:                                 Ordinal Functions.   (line  44)
+* asort function (gawk) <1>:             String Functions.    (line  18)
+* asort function (gawk):                 Array Sorting.       (line   6)
+* asort function (gawk), arrays, sorting: Array Sorting.      (line   6)
+* asorti function (gawk):                String Functions.    (line  47)
+* assert function (C library):           Assert Function.     (line   6)
+* assert user-defined function:          Assert Function.     (line  28)
+* assertions:                            Assert Function.     (line   6)
+* assignment operators:                  Assignment Ops.      (line   6)
+* assignment operators, evaluation order: Assignment Ops.     (line 111)
+* assignment operators, lvalues/rvalues: Assignment Ops.      (line  32)
+* assignments as filenames:              Ignoring Assigns.    (line   6)
+* assoc_clear internal function:         Internals.           (line  66)
+* assoc_lookup internal function:        Internals.           (line  70)
+* associative arrays:                    Array Intro.         (line  45)
 * asterisk (*), * operator, as multiplication operator: Precedence.
-                                                            (line  6701)
+                                                              (line  55)
 * asterisk (*), * operator, as regexp operator: Regexp Operators.
-                                                            (line  2261)
+                                                              (line  86)
 * asterisk (*), * operator, null strings, matching: Gory Details.
-                                                            (line  9796)
-* asterisk (*), ** operator <1>:         Options.           (line 12191)
-* asterisk (*), ** operator <2>:         Precedence.        (line  6695)
-* asterisk (*), ** operator:             Arithmetic Ops.    (line  5898)
-* asterisk (*), **= operator <1>:        Options.           (line 12191)
-* asterisk (*), **= operator <2>:        Precedence.        (line  6742)
-* asterisk (*), **= operator:            Assignment Ops.    (line  6111)
-* asterisk (*), *= operator <1>:         Precedence.        (line  6742)
-* asterisk (*), *= operator:             Assignment Ops.    (line  6111)
-* atan2 function:                        Numeric Functions. (line  9082)
-* atari:                                 Atari Installation.
-                                                            (line 18161)
-* awf (amazingly workable formatter) program: Glossary.     (line 19845)
-* awk language, POSIX version:           Assignment Ops.    (line  6122)
-* awk programs <1>:                      Two Rules.         (line  1647)
-* awk programs <2>:                      Executable Scripts.
-                                                            (line  1233)
-* awk programs:                          Getting Started.   (line  1038)
-* awk programs, complex:                 When.              (line  1923)
-* awk programs, documenting <1>:         Library Names.     (line 12541)
-* awk programs, documenting:             Comments.          (line  1296)
-* awk programs, examples of:             Sample Programs.   (line 14200)
-* awk programs, execution of:            Next Statement.    (line  7645)
-* awk programs, internationalizing <1>:  Programmer i18n.   (line 11051)
-* awk programs, internationalizing:      I18N Functions.    (line 10436)
-* awk programs, lengthy:                 Long.              (line  1196)
-* awk programs, lengthy, assertions:     Assert Function.   (line 12815)
-* awk programs, location of:             Options.           (line 12031)
-* awk programs, one-line examples:       Very Simple.       (line  1570)
-* awk programs, profiling:               Profiling.         (line 11740)
-* awk programs, profiling, enabling:     Options.           (line 12208)
-* awk programs, running <1>:             Long.              (line  1196)
-* awk programs, running:                 Running gawk.      (line  1084)
-* awk programs, running, from shell scripts: One-shot.      (line  1133)
-* awk programs, running, without input files: Read Terminal.
-                                                            (line  1157)
+                                                              (line 160)
+* asterisk (*), ** operator <1>:         Options.             (line 192)
+* asterisk (*), ** operator <2>:         Precedence.          (line  49)
+* asterisk (*), ** operator:             Arithmetic Ops.      (line  81)
+* asterisk (*), **= operator <1>:        Options.             (line 192)
+* asterisk (*), **= operator <2>:        Precedence.          (line  96)
+* asterisk (*), **= operator:            Assignment Ops.      (line 129)
+* asterisk (*), *= operator <1>:         Precedence.          (line  96)
+* asterisk (*), *= operator:             Assignment Ops.      (line 129)
+* atan2 function:                        Numeric Functions.   (line  37)
+* atari:                                 Atari Installation.  (line   9)
+* awf (amazingly workable formatter) program: Glossary.       (line  20)
+* awk language, POSIX version:           Assignment Ops.      (line 136)
+* awk programs <1>:                      Two Rules.           (line   6)
+* awk programs <2>:                      Executable Scripts.  (line   6)
+* awk programs:                          Getting Started.     (line  12)
+* awk programs, complex:                 When.                (line  30)
+* awk programs, documenting <1>:         Library Names.       (line   6)
+* awk programs, documenting:             Comments.            (line   6)
+* awk programs, examples of:             Sample Programs.     (line   6)
+* awk programs, execution of:            Next Statement.      (line  16)
+* awk programs, internationalizing <1>:  Programmer i18n.     (line   6)
+* awk programs, internationalizing:      I18N Functions.      (line   6)
+* awk programs, lengthy:                 Long.                (line   6)
+* awk programs, lengthy, assertions:     Assert Function.     (line   6)
+* awk programs, location of:             Options.             (line  25)
+* awk programs, one-line examples:       Very Simple.         (line  45)
+* awk programs, profiling:               Profiling.           (line   6)
+* awk programs, profiling, enabling:     Options.             (line 212)
+* awk programs, running <1>:             Long.                (line   6)
+* awk programs, running:                 Running gawk.        (line   6)
+* awk programs, running, from shell scripts: One-shot.        (line  22)
+* awk programs, running, without input files: Read Terminal.  (line  17)
 * awk programs, shell variables in:      Using Shell Variables.
-                                                            (line  7114)
-* awk, function of:                      Getting Started.   (line  1032)
-* awk, gawk and <1>:                     This Manual.       (line   718)
-* awk, gawk and:                         Preface.           (line   569)
-* awk, history of:                       History.           (line   640)
-* awk, implementation issues, pipes:     Redirection.       (line  4973)
-* awk, implementations:                  Other Versions.    (line 18383)
-* awk, implementations, limits:          Getline Notes.     (line  4193)
-* awk, invoking:                         Command Line.      (line 11988)
-* awk, new vs. old:                      Names.             (line   677)
-* awk, new vs. old, OFMT variable:       Conversion.        (line  5767)
-* awk, POSIX and:                        Preface.           (line   569)
-* awk, POSIX and, See Also POSIX awk:    Preface.           (line   569)
-* awk, regexp constants and:             Typing and Comparison.
-                                                            (line  6442)
-* awk, See Also gawk:                    Preface.           (line   582)
-* awk, terms describing:                 This Manual.       (line   711)
-* awk, uses for <1>:                     When.              (line  1899)
-* awk, uses for <2>:                     Getting Started.   (line  1038)
-* awk, uses for:                         Preface.           (line   569)
-* awk, versions of <1>:                  V7/SVR3.1.         (line 16665)
-* awk, versions of:                      Names.             (line   681)
-* awk, versions of, changes between SVR3.1 and SVR4: SVR4.  (line 16724)
+                                                              (line   6)
+* awk, function of:                      Getting Started.     (line   6)
+* awk, gawk and <1>:                     This Manual.         (line  13)
+* awk, gawk and:                         Preface.             (line  22)
+* awk, history of:                       History.             (line  17)
+* awk, implementation issues, pipes:     Redirection.         (line 132)
+* awk, implementations:                  Other Versions.      (line   6)
+* awk, implementations, limits:          Getline Notes.       (line  14)
+* awk, invoking:                         Command Line.        (line   6)
+* awk, new vs. old:                      Names.               (line   6)
+* awk, new vs. old, OFMT variable:       Conversion.          (line  54)
+* awk, POSIX and:                        Preface.             (line  22)
+* awk, POSIX and, See Also POSIX awk:    Preface.             (line  22)
+* awk, regexp constants and:             Comparison Operators.
+                                                              (line 102)
+* awk, See Also gawk:                    Preface.             (line  35)
+* awk, terms describing:                 This Manual.         (line   6)
+* awk, uses for <1>:                     When.                (line   6)
+* awk, uses for <2>:                     Getting Started.     (line  12)
+* awk, uses for:                         Preface.             (line  22)
+* awk, versions of <1>:                  V7/SVR3.1.           (line   6)
+* awk, versions of:                      Names.               (line  10)
+* awk, versions of, changes between SVR3.1 and SVR4: SVR4.    (line   6)
 * awk, versions of, changes between SVR4 and POSIX awk: POSIX.
-                                                            (line 16765)
-* awk, versions of, changes between V7 and SVR3.1: V7/SVR3.1.
-                                                            (line 16665)
-* awk, versions of, See Also Bell Laboratories awk: BTL.    (line 16809)
-* awk.h file (internal):                 Internals.         (line 18801)
-* awka compiler for awk:                 Other Versions.    (line 18453)
-* AWKNUM internal type:                  Internals.         (line 18805)
-* AWKPATH environment variable <1>:      PC Using.          (line 17858)
-* AWKPATH environment variable:          AWKPATH Variable.  (line 12361)
-* awkprof.out file:                      Profiling.         (line 11744)
-* awksed.awk program:                    Simple Sed.        (line 16189)
-* awkvars.out file:                      Options.           (line 12101)
-* backslash (\) <1>:                     Regexp Operators.  (line  2193)
-* backslash (\) <2>:                     Quoting.           (line  1370)
-* backslash (\) <3>:                     Comments.          (line  1339)
-* backslash (\):                         Read Terminal.     (line  1165)
-* backslash (\), \" escape sequence:     Escape Sequences.  (line  2108)
+                                                              (line   6)
+* awk, versions of, changes between V7 and SVR3.1: V7/SVR3.1. (line   6)
+* awk, versions of, See Also Bell Laboratories awk: BTL.      (line   6)
+* awk.h file (internal):                 Internals.           (line  15)
+* awka compiler for awk:                 Other Versions.      (line  76)
+* AWKNUM internal type:                  Internals.           (line  19)
+* AWKPATH environment variable <1>:      PC Using.            (line  11)
+* AWKPATH environment variable:          AWKPATH Variable.    (line   6)
+* awkprof.out file:                      Profiling.           (line  10)
+* awksed.awk program:                    Simple Sed.          (line  25)
+* awkvars.out file:                      Options.             (line  95)
+* backslash (\) <1>:                     Regexp Operators.    (line  18)
+* backslash (\) <2>:                     Quoting.             (line  27)
+* backslash (\) <3>:                     Comments.            (line  50)
+* backslash (\):                         Read Terminal.       (line  25)
+* backslash (\), \" escape sequence:     Escape Sequences.    (line  76)
 * backslash (\), \' operator (gawk):     GNU Regexp Operators.
-                                                            (line  2503)
-* backslash (\), \/ escape sequence:     Escape Sequences.  (line  2101)
+                                                              (line  48)
+* backslash (\), \/ escape sequence:     Escape Sequences.    (line  69)
 * backslash (\), \< operator (gawk):     GNU Regexp Operators.
-                                                            (line  2477)
+                                                              (line  22)
 * backslash (\), \> operator (gawk):     GNU Regexp Operators.
-                                                            (line  2481)
+                                                              (line  26)
 * backslash (\), \` operator (gawk):     GNU Regexp Operators.
-                                                            (line  2501)
-* backslash (\), \a escape sequence:     Escape Sequences.  (line  2066)
-* backslash (\), \b escape sequence:     Escape Sequences.  (line  2070)
+                                                              (line  46)
+* backslash (\), \a escape sequence:     Escape Sequences.    (line  34)
+* backslash (\), \b escape sequence:     Escape Sequences.    (line  38)
 * backslash (\), \B operator (gawk):     GNU Regexp Operators.
-                                                            (line  2490)
-* backslash (\), \f escape sequence:     Escape Sequences.  (line  2073)
-* backslash (\), \n escape sequence:     Escape Sequences.  (line  2076)
-* backslash (\), \NNN escape sequence:   Escape Sequences.  (line  2088)
-* backslash (\), \r escape sequence:     Escape Sequences.  (line  2079)
-* backslash (\), \t escape sequence:     Escape Sequences.  (line  2082)
-* backslash (\), \v escape sequence:     Escape Sequences.  (line  2085)
+                                                              (line  35)
+* backslash (\), \f escape sequence:     Escape Sequences.    (line  41)
+* backslash (\), \n escape sequence:     Escape Sequences.    (line  44)
+* backslash (\), \NNN escape sequence:   Escape Sequences.    (line  56)
+* backslash (\), \r escape sequence:     Escape Sequences.    (line  47)
+* backslash (\), \t escape sequence:     Escape Sequences.    (line  50)
+* backslash (\), \v escape sequence:     Escape Sequences.    (line  53)
 * backslash (\), \W operator (gawk):     GNU Regexp Operators.
-                                                            (line  2473)
+                                                              (line  18)
 * backslash (\), \w operator (gawk):     GNU Regexp Operators.
-                                                            (line  2468)
-* backslash (\), \x escape sequence:     Escape Sequences.  (line  2093)
+                                                              (line  13)
+* backslash (\), \x escape sequence:     Escape Sequences.    (line  61)
 * backslash (\), \y operator (gawk):     GNU Regexp Operators.
-                                                            (line  2485)
+                                                              (line  30)
 * backslash (\), as field separators:    Command Line Field Separator.
-                                                            (line  3448)
-* backslash (\), continuing lines and <1>: Egrep Program.   (line 14737)
-* backslash (\), continuing lines and:   Statements/Lines.  (line  1783)
+                                                              (line  27)
+* backslash (\), continuing lines and <1>: Egrep Program.     (line 218)
+* backslash (\), continuing lines and:   Statements/Lines.    (line  19)
 * backslash (\), continuing lines and, comments and: Statements/Lines.
-                                                            (line  1838)
+                                                              (line  75)
 * backslash (\), continuing lines and, in csh <1>: Statements/Lines.
-                                                            (line  1807)
-* backslash (\), continuing lines and, in csh: More Complex.
-                                                            (line  1708)
-* backslash (\), gsub/gensub/sub functions and: Gory Details.
-                                                            (line  9642)
-* backslash (\), in character lists:     Character Lists.   (line  2364)
-* backslash (\), in escape sequences:    Escape Sequences.  (line  2038)
+                                                              (line  44)
+* backslash (\), continuing lines and, in csh: More Complex.  (line  15)
+* backslash (\), gsub/gensub/sub functions and: Gory Details. (line   6)
+* backslash (\), in character lists:     Character Lists.     (line  17)
+* backslash (\), in escape sequences:    Escape Sequences.    (line   6)
 * backslash (\), in escape sequences, POSIX and: Escape Sequences.
-                                                            (line  2145)
-* backslash (\), regexp constants:       Computed Regexps.  (line  2677)
-* BBS-list file:                         Sample Data Files. (line  1461)
-* Beebe, Nelson:                         Acknowledgments.   (line   995)
-* Beebe, Nelson H.F.:                    Other Versions.    (line 18465)
-* BEGIN pattern <1>:                     BEGIN/END.         (line  6980)
-* BEGIN pattern <2>:                     Field Separators.  (line  3300)
-* BEGIN pattern:                         Records.           (line  2839)
+                                                              (line 113)
+* backslash (\), regexp constants:       Computed Regexps.    (line  28)
+* BBS-list file:                         Sample Data Files.   (line   6)
+* Beebe, Nelson:                         Acknowledgments.     (line  53)
+* Beebe, Nelson H.F.:                    Other Versions.      (line  88)
+* BEGIN pattern <1>:                     BEGIN/END.           (line   6)
+* BEGIN pattern <2>:                     Field Separators.    (line  43)
+* BEGIN pattern:                         Records.             (line  29)
 * BEGIN pattern, assert user-defined function and: Assert Function.
-                                                            (line 12891)
-* BEGIN pattern, Boolean patterns and:   Expression Patterns.
-                                                            (line  6900)
-* BEGIN pattern, exit statement and:     Exit Statement.    (line  7743)
-* BEGIN pattern, getline and:            Getline Notes.     (line  4198)
-* BEGIN pattern, headings, adding:       Print Examples.    (line  4350)
+                                                              (line  82)
+* BEGIN pattern, Boolean patterns and:   Expression Patterns. (line  73)
+* BEGIN pattern, exit statement and:     Exit Statement.      (line  12)
+* BEGIN pattern, getline and:            Getline Notes.       (line  19)
+* BEGIN pattern, headings, adding:       Print Examples.      (line  43)
 * BEGIN pattern, next/nextfile statements and <1>: Next Statement.
-                                                            (line  7668)
+                                                              (line  39)
 * BEGIN pattern, next/nextfile statements and: I/O And BEGIN/END.
-                                                            (line  7088)
+                                                              (line  36)
 * BEGIN pattern, OFS/ORS variables, assigning values to: Output Separators.
-                                                            (line  4407)
-* BEGIN pattern, operators and:          Using BEGIN/END.   (line  7010)
-* BEGIN pattern, pgawk program:          Profiling.         (line 11802)
-* BEGIN pattern, print statement and:    I/O And BEGIN/END. (line  7068)
-* BEGIN pattern, pwcat program:          Passwd Functions.  (line 13862)
-* BEGIN pattern, running awk programs and: Cut Program.     (line 14331)
-* BEGIN pattern, TEXTDOMAIN variable and: Programmer i18n.  (line 11103)
-* beginfile user-defined function:       Filetrans Function.
-                                                            (line 13265)
-* Bell Laboratories awk extensions:      BTL.               (line 16809)
-* Benzinger, Michael:                    Contributors.      (line 17135)
-* BeOS:                                  BeOS Installation. (line 17602)
-* Berry, Karl:                           Acknowledgments.   (line   972)
-* binary input/output:                   User-modified.     (line  7817)
-* bindtextdomain function (C library):   Explaining gettext.
-                                                            (line 10962)
-* bindtextdomain function (gawk) <1>:    Programmer i18n.   (line 11090)
-* bindtextdomain function (gawk):        I18N Functions.    (line 10456)
+                                                              (line  20)
+* BEGIN pattern, operators and:          Using BEGIN/END.     (line  17)
+* BEGIN pattern, pgawk program:          Profiling.           (line  69)
+* BEGIN pattern, print statement and:    I/O And BEGIN/END.   (line  16)
+* BEGIN pattern, pwcat program:          Passwd Functions.    (line 125)
+* BEGIN pattern, running awk programs and: Cut Program.       (line  66)
+* BEGIN pattern, TEXTDOMAIN variable and: Programmer i18n.    (line  58)
+* beginfile user-defined function:       Filetrans Function.  (line  60)
+* Bell Laboratories awk extensions:      BTL.                 (line   6)
+* Benzinger, Michael:                    Contributors.        (line  86)
+* BeOS:                                  BeOS Installation.   (line   6)
+* Berry, Karl:                           Acknowledgments.     (line  30)
+* binary input/output:                   User-modified.       (line  10)
+* bindtextdomain function (C library):   Explaining gettext.  (line  47)
+* bindtextdomain function (gawk) <1>:    Programmer i18n.     (line  45)
+* bindtextdomain function (gawk):        I18N Functions.      (line  26)
 * bindtextdomain function (gawk), portability and: I18N Portability.
-                                                            (line 11306)
-* BINMODE variable <1>:                  PC Using.          (line 17887)
-* BINMODE variable:                      User-modified.     (line  7817)
-* bits2str user-defined function:        Bitwise Functions. (line 10368)
-* bitwise, complement:                   Bitwise Functions. (line 10333)
-* bitwise, operations:                   Bitwise Functions. (line 10314)
-* bitwise, shift:                        Bitwise Functions. (line 10340)
-* body, in actions:                      Statements.        (line  7228)
-* body, in loops:                        While Statement.   (line  7307)
-* Boolean expressions:                   Boolean Ops.       (line  6463)
-* Boolean expressions, as patterns:      Expression Patterns.
-                                                            (line  6868)
-* Boolean operators, See Boolean expressions: Boolean Ops.  (line  6463)
-* Bourne shell, quoting rules for:       Quoting.           (line  1357)
-* braces ({}), actions and:              Action Overview.   (line  7178)
-* braces ({}), pgawk program:            Profiling.         (line 11873)
-* braces ({}), statements, grouping:     Statements.        (line  7228)
-* bracket expressions, See character lists: Regexp Operators.
-                                                            (line  2230)
-* break statement:                       Break Statement.   (line  7525)
-* Brennan, Michael <1>:                  Other Versions.    (line 18383)
-* Brennan, Michael <2>:                  Simple Sed.        (line 16189)
-* Brennan, Michael <3>:                  Two-way I/O.       (line 11522)
-* Brennan, Michael:                      Delete.            (line  8630)
-* Broder, Alan J.:                       Contributors.      (line 17126)
-* Brown, Martin <1>:                     Bugs.              (line 18364)
-* Brown, Martin <2>:                     Contributors.      (line 17121)
-* Brown, Martin:                         Acknowledgments.   (line   995)
-* BSD portals:                           Portal Files.      (line 11725)
-* BSD-based operating systems:           Glossary.          (line 20404)
-* Buening, Andreas <1>:                  Contributors.      (line 17130)
-* Buening, Andreas:                      Acknowledgments.   (line   995)
-* buffering, input/output <1>:           Two-way I/O.       (line 11587)
-* buffering, input/output:               I/O Functions.     (line  9936)
-* buffering, interactive vs. noninteractive: I/O Functions. (line  9904)
-* buffers, flushing:                     I/O Functions.     (line  9838)
+                                                              (line  32)
+* BINMODE variable <1>:                  PC Using.            (line  40)
+* BINMODE variable:                      User-modified.       (line  10)
+* bits2str user-defined function:        Bitwise Functions.   (line  60)
+* bitwise, complement:                   Bitwise Functions.   (line  25)
+* bitwise, operations:                   Bitwise Functions.   (line   6)
+* bitwise, shift:                        Bitwise Functions.   (line  32)
+* body, in actions:                      Statements.          (line  10)
+* body, in loops:                        While Statement.     (line  14)
+* Boolean expressions:                   Boolean Ops.         (line   6)
+* Boolean expressions, as patterns:      Expression Patterns. (line  41)
+* Boolean operators, See Boolean expressions: Boolean Ops.    (line   6)
+* Bourne shell, quoting rules for:       Quoting.             (line  14)
+* braces ({}), actions and:              Action Overview.     (line  19)
+* braces ({}), pgawk program:            Profiling.           (line 140)
+* braces ({}), statements, grouping:     Statements.          (line  10)
+* bracket expressions, See character lists: Regexp Operators. (line  55)
+* break statement:                       Break Statement.     (line   6)
+* Brennan, Michael <1>:                  Other Versions.      (line   6)
+* Brennan, Michael <2>:                  Simple Sed.          (line  25)
+* Brennan, Michael <3>:                  Two-way I/O.         (line   6)
+* Brennan, Michael:                      Delete.              (line  51)
+* Broder, Alan J.:                       Contributors.        (line  77)
+* Brown, Martin <1>:                     Bugs.                (line  57)
+* Brown, Martin <2>:                     Contributors.        (line  72)
+* Brown, Martin:                         Acknowledgments.     (line  53)
+* BSD portals:                           Portal Files.        (line   6)
+* BSD-based operating systems:           Glossary.            (line 582)
+* Buening, Andreas <1>:                  Contributors.        (line  81)
+* Buening, Andreas:                      Acknowledgments.     (line  53)
+* buffering, input/output <1>:           Two-way I/O.         (line  71)
+* buffering, input/output:               I/O Functions.       (line 127)
+* buffering, interactive vs. noninteractive: I/O Functions.   (line  95)
+* buffers, flushing:                     I/O Functions.       (line  29)
 * buffers, operators for:                GNU Regexp Operators.
-                                                            (line  2495)
-* bug reports, email address, bug-gawk@gnu.org: Bugs.       (line 18335)
-* bug-gawk@gnu.org bug reporting address: Bugs.             (line 18335)
-* built-in functions:                    Functions.         (line  8964)
-* built-in functions, evaluation order:  Calling Built-in.  (line  9031)
-* built-in variables:                    Built-in Variables.
-                                                            (line  7787)
-* built-in variables, -v option, setting with: Options.     (line 12044)
-* built-in variables, conveying information: Auto-set.      (line  7967)
-* built-in variables, user-modifiable:   User-modified.     (line  7813)
-* call by reference:                     Function Caveats.  (line 10716)
-* call by value:                         Function Caveats.  (line 10687)
+                                                              (line  40)
+* bug reports, email address, bug-gawk@gnu.org: Bugs.         (line  27)
+* bug-gawk@gnu.org bug reporting address: Bugs.               (line  27)
+* built-in functions:                    Functions.           (line   6)
+* built-in functions, evaluation order:  Calling Built-in.    (line  30)
+* built-in variables:                    Built-in Variables.  (line   6)
+* built-in variables, -v option, setting with: Options.       (line  38)
+* built-in variables, conveying information: Auto-set.        (line   6)
+* built-in variables, user-modifiable:   User-modified.       (line   6)
+* call by reference:                     Function Caveats.    (line  55)
+* call by value:                         Function Caveats.    (line  26)
 * caret (^) <1>:                         GNU Regexp Operators.
-                                                            (line  2506)
-* caret (^):                             Regexp Operators.  (line  2197)
-* caret (^), ^ operator <1>:             Options.           (line 12191)
-* caret (^), ^ operator:                 Precedence.        (line  6695)
-* caret (^), ^= operator <1>:            Options.           (line 12191)
-* caret (^), ^= operator <2>:            Precedence.        (line  6742)
-* caret (^), ^= operator:                Assignment Ops.    (line  6111)
-* caret (^), in character lists:         Character Lists.   (line  2364)
-* case keyword:                          Switch Statement.  (line  7464)
-* case sensitivity, array indices and:   Array Intro.       (line  8398)
-* case sensitivity, converting case:     String Functions.  (line  9611)
-* case sensitivity, example programs:    Library Functions. (line 12506)
-* case sensitivity, gawk:                Case-sensitivity.  (line  2569)
-* case sensitivity, regexps and <1>:     User-modified.     (line  7875)
-* case sensitivity, regexps and:         Case-sensitivity.  (line  2549)
-* case sensitivity, string comparisons and: User-modified.  (line  7875)
-* CGI, awk scripts for:                  Options.           (line 12117)
-* character encodings:                   Ordinal Functions. (line 13014)
-* character lists <1>:                   Character Lists.   (line  2353)
-* character lists:                       Regexp Operators.  (line  2230)
-* character lists, character classes:    Character Lists.   (line  2377)
-* character lists, collating elements:   Character Lists.   (line  2430)
-* character lists, collating symbols:    Character Lists.   (line  2437)
-* character lists, complemented:         Regexp Operators.  (line  2237)
-* character lists, equivalence classes:  Character Lists.   (line  2443)
-* character lists, non-ASCII:            Character Lists.   (line  2430)
-* character lists, range expressions:    Character Lists.   (line  2353)
-* character sets:                        Ordinal Functions. (line 13014)
-* character sets (machine character encodings): Glossary.   (line 19963)
-* character sets, See Also character lists: Regexp Operators.
-                                                            (line  2230)
-* characters, counting:                  Wc Program.        (line 15264)
-* characters, transliterating:           Translate Program. (line 15601)
-* characters, values of as numbers:      Ordinal Functions. (line 12976)
-* Chassell, Robert J.:                   Acknowledgments.   (line   972)
-* chdir function, implementing in gawk:  Sample Library.    (line 19054)
-* chem utility:                          Glossary.          (line 19971)
-* chr user-defined function:             Ordinal Functions. (line 12986)
+                                                              (line  51)
+* caret (^):                             Regexp Operators.    (line  22)
+* caret (^), ^ operator <1>:             Options.             (line 192)
+* caret (^), ^ operator:                 Precedence.          (line  49)
+* caret (^), ^= operator <1>:            Options.             (line 192)
+* caret (^), ^= operator <2>:            Precedence.          (line  96)
+* caret (^), ^= operator:                Assignment Ops.      (line 129)
+* caret (^), in character lists:         Character Lists.     (line  17)
+* case keyword:                          Switch Statement.    (line   6)
+* case sensitivity, array indices and:   Array Intro.         (line  87)
+* case sensitivity, converting case:     String Functions.    (line 453)
+* case sensitivity, example programs:    Library Functions.   (line  43)
+* case sensitivity, gawk:                Case-sensitivity.    (line  26)
+* case sensitivity, regexps and <1>:     User-modified.       (line  68)
+* case sensitivity, regexps and:         Case-sensitivity.    (line   6)
+* case sensitivity, string comparisons and: User-modified.    (line  68)
+* CGI, awk scripts for:                  Options.             (line 111)
+* character encodings:                   Ordinal Functions.   (line  44)
+* character lists <1>:                   Character Lists.     (line   6)
+* character lists:                       Regexp Operators.    (line  55)
+* character lists, character classes:    Character Lists.     (line  30)
+* character lists, collating elements:   Character Lists.     (line  71)
+* character lists, collating symbols:    Character Lists.     (line  78)
+* character lists, complemented:         Regexp Operators.    (line  62)
+* character lists, equivalence classes:  Character Lists.     (line  84)
+* character lists, non-ASCII:            Character Lists.     (line  71)
+* character lists, range expressions:    Character Lists.     (line   6)
+* character sets:                        Ordinal Functions.   (line  44)
+* character sets (machine character encodings): Glossary.     (line 138)
+* character sets, See Also character lists: Regexp Operators. (line  55)
+* characters, counting:                  Wc Program.          (line   6)
+* characters, transliterating:           Translate Program.   (line   6)
+* characters, values of as numbers:      Ordinal Functions.   (line   6)
+* Chassell, Robert J.:                   Acknowledgments.     (line  30)
+* chdir function, implementing in gawk:  Sample Library.      (line   6)
+* chem utility:                          Glossary.            (line 146)
+* chr user-defined function:             Ordinal Functions.   (line  16)
 * Cliff random numbers:                  Cliff Random Function.
-                                                            (line 12945)
+                                                              (line   6)
 * cliff_rand user-defined function:      Cliff Random Function.
-                                                            (line 12950)
-* close function <1>:                    I/O Functions.     (line  9819)
+                                                              (line  11)
+* close function <1>:                    I/O Functions.       (line  10)
 * close function <2>:                    Close Files And Pipes.
-                                                            (line  5211)
-* close function <3>:                    Getline/Pipe.      (line  4069)
+                                                              (line  18)
+* close function <3>:                    Getline/Pipe.        (line  24)
 * close function:                        Getline/Variable/File.
-                                                            (line  4036)
+                                                              (line  30)
 * close function, return values:         Close Files And Pipes.
-                                                            (line  5323)
-* close function, two-way pipes and:     Two-way I/O.       (line 11594)
-* Close, Diane <1>:                      Contributors.      (line 17071)
-* Close, Diane:                          Manual History.    (line   898)
-* close_func input method:               Internals.         (line 18964)
-* collating elements:                    Character Lists.   (line  2430)
-* collating symbols:                     Character Lists.   (line  2437)
-* columns, aligning:                     Print Examples.    (line  4377)
-* columns, cutting:                      Cut Program.       (line 14271)
-* comma (,), in range patterns:          Ranges.            (line  6913)
-* command line, arguments <1>:           Other Arguments.   (line 12305)
-* command line, arguments <2>:           ARGC and ARGV.     (line  8180)
-* command line, arguments:               Auto-set.          (line  7972)
-* command line, formats:                 Running gawk.      (line  1090)
+                                                              (line 130)
+* close function, two-way pipes and:     Two-way I/O.         (line  78)
+* Close, Diane <1>:                      Contributors.        (line  21)
+* Close, Diane:                          Manual History.      (line  40)
+* close_func input method:               Internals.           (line 178)
+* collating elements:                    Character Lists.     (line  71)
+* collating symbols:                     Character Lists.     (line  78)
+* columns, aligning:                     Print Examples.      (line  70)
+* columns, cutting:                      Cut Program.         (line   6)
+* comma (,), in range patterns:          Ranges.              (line   6)
+* command line, arguments <1>:           Other Arguments.     (line   6)
+* command line, arguments <2>:           ARGC and ARGV.       (line   6)
+* command line, arguments:               Auto-set.            (line  11)
+* command line, formats:                 Running gawk.        (line  12)
 * command line, FS on, setting:          Command Line Field Separator.
-                                                            (line  3427)
-* command line, invoking awk from:       Command Line.      (line 11988)
-* command line, options <1>:             Options.           (line 12012)
+                                                              (line   6)
+* command line, invoking awk from:       Command Line.        (line   6)
+* command line, options <1>:             Options.             (line   6)
 * command line, options <2>:             Command Line Field Separator.
-                                                            (line  3427)
-* command line, options:                 Long.              (line  1202)
-* command line, options, end of:         Options.           (line 12068)
-* command line, variables, assigning on: Assignment Options.
-                                                            (line  5671)
-* command-line options, processing:      Getopt Function.   (line 13460)
-* command-line options, string extraction: String Extraction.
-                                                            (line 11177)
-* commenting:                            Comments.          (line  1296)
-* commenting, backslash continuation and: Statements/Lines. (line  1838)
-* comp.lang.awk newsgroup:               Bugs.              (line 18344)
+                                                              (line   6)
+* command line, options:                 Long.                (line  12)
+* command line, options, end of:         Options.             (line  62)
+* command line, variables, assigning on: Assignment Options.  (line   6)
+* command-line options, processing:      Getopt Function.     (line   6)
+* command-line options, string extraction: String Extraction. (line   6)
+* commenting:                            Comments.            (line   6)
+* commenting, backslash continuation and: Statements/Lines.   (line  75)
+* comp.lang.awk newsgroup:               Bugs.                (line  37)
 * comparison expressions:                Typing and Comparison.
-                                                            (line  6277)
-* comparison expressions, as patterns:   Expression Patterns.
-                                                            (line  6841)
-* comparison expressions, string vs. regexp: Typing and Comparison.
-                                                            (line  6419)
-* compatibility mode (gawk), extensions: POSIX/GNU.         (line 16852)
-* compatibility mode (gawk), file names: Special Caveats.   (line  5167)
+                                                              (line   9)
+* comparison expressions, as patterns:   Expression Patterns. (line  14)
+* comparison expressions, string vs. regexp: Comparison Operators.
+                                                              (line  79)
+* compatibility mode (gawk), extensions: POSIX/GNU.           (line   6)
+* compatibility mode (gawk), file names: Special Caveats.     (line   9)
 * compatibility mode (gawk), hexadecimal numbers: Nondecimal-numbers.
-                                                            (line  5511)
+                                                              (line  60)
 * compatibility mode (gawk), octal numbers: Nondecimal-numbers.
-                                                            (line  5511)
-* compatibility mode (gawk), specifying: Options.           (line 12085)
-* compiled programs <1>:                 Glossary.          (line 19981)
-* compiled programs:                     Basic High Level.  (line 19551)
-* compl function (gawk):                 Bitwise Functions. (line 10351)
-* complement, bitwise:                   Bitwise Functions. (line 10333)
-* compound statements, control statements and: Statements.  (line  7228)
-* concatenating:                         Concatenation.     (line  5911)
-* conditional expressions:               Conditional Exp.   (line  6553)
+                                                              (line  60)
+* compatibility mode (gawk), specifying: Options.             (line  79)
+* compiled programs <1>:                 Glossary.            (line 156)
+* compiled programs:                     Basic High Level.    (line  14)
+* compl function (gawk):                 Bitwise Functions.   (line  43)
+* complement, bitwise:                   Bitwise Functions.   (line  25)
+* compound statements, control statements and: Statements.    (line  10)
+* concatenating:                         Concatenation.       (line   9)
+* conditional expressions:               Conditional Exp.     (line   6)
+* configuration option, --disable-directories-fatal: Additional Configuration Options.
+                                                              (line  37)
 * configuration option, --disable-lint:  Additional Configuration Options.
-                                                            (line 17477)
+                                                              (line  17)
 * configuration option, --disable-nls:   Additional Configuration Options.
-                                                            (line 17492)
+                                                              (line  32)
 * configuration option, --enable-portals: Additional Configuration Options.
-                                                            (line 17469)
+                                                              (line   9)
 * configuration option, --enable-switch: Additional Configuration Options.
-                                                            (line 17473)
+                                                              (line  13)
 * configuration options, gawk:           Additional Configuration Options.
-                                                            (line 17466)
-* constants, nondecimal:                 Nondecimal Data.   (line 11480)
-* constants, types of:                   Constants.         (line  5405)
-* continue statement:                    Continue Statement.
-                                                            (line  7582)
-* control statements:                    Statements.        (line  7224)
-* converting, case:                      String Functions.  (line  9611)
-* converting, dates to timestamps:       Time Functions.    (line 10050)
+                                                              (line   6)
+* constants, nondecimal:                 Nondecimal Data.     (line   6)
+* constants, types of:                   Constants.           (line   6)
+* continue statement:                    Continue Statement.  (line   6)
+* control statements:                    Statements.          (line   6)
+* converting, case:                      String Functions.    (line 453)
+* converting, dates to timestamps:       Time Functions.      (line  72)
 * converting, during subscripting:       Numeric Array Subscripts.
-                                                            (line  8681)
-* converting, numbers:                   Conversion.        (line  5719)
-* converting, numbers, to strings:       Bitwise Functions. (line 10407)
-* converting, strings to numbers:        Conversion.        (line  5719)
-* CONVFMT variable <1>:                  User-modified.     (line  7833)
-* CONVFMT variable:                      Conversion.        (line  5742)
+                                                              (line  31)
+* converting, numbers:                   Conversion.          (line   6)
+* converting, numbers, to strings:       Bitwise Functions.   (line  99)
+* converting, strings to numbers:        Conversion.          (line   6)
+* CONVFMT variable <1>:                  User-modified.       (line  26)
+* CONVFMT variable:                      Conversion.          (line  29)
 * CONVFMT variable, array subscripts and: Numeric Array Subscripts.
-                                                            (line  8656)
-* coprocesses <1>:                       Two-way I/O.       (line 11560)
-* coprocesses:                           Redirection.       (line  4944)
+                                                              (line   6)
+* coprocesses <1>:                       Two-way I/O.         (line  44)
+* coprocesses:                           Redirection.         (line  99)
 * coprocesses, closing:                  Close Files And Pipes.
-                                                            (line  5199)
-* coprocesses, getline from:             Getline/Coprocess. (line  4137)
-* cos function:                          Numeric Functions. (line  9079)
-* counting:                              Wc Program.        (line 15264)
-* csh utility:                           Statements/Lines.  (line  1807)
-* csh utility, backslash continuation and: More Complex.    (line  1708)
-* csh utility, POSIXLY_CORRECT environment variable: Options.
-                                                            (line 12286)
-* csh utility, |& operator, comparison with: Two-way I/O.   (line 11560)
-* ctime user-defined function:           Function Example.  (line 10649)
-* currency symbols, localization:        Explaining gettext.
-                                                            (line 11014)
+                                                              (line   6)
+* coprocesses, getline from:             Getline/Coprocess.   (line   6)
+* cos function:                          Numeric Functions.   (line  34)
+* counting:                              Wc Program.          (line   6)
+* csh utility:                           Statements/Lines.    (line  44)
+* csh utility, backslash continuation and: More Complex.      (line  15)
+* csh utility, POSIXLY_CORRECT environment variable: Options. (line 295)
+* csh utility, |& operator, comparison with: Two-way I/O.     (line  44)
+* ctime user-defined function:           Function Example.    (line  72)
+* currency symbols, localization:        Explaining gettext.  (line  99)
 * custom.h file:                         Configuration Philosophy.
-                                                            (line 17530)
-* cut utility:                           Cut Program.       (line 14271)
-* cut.awk program:                       Cut Program.       (line 14309)
-* d.c., See dark corner:                 Conventions.       (line   850)
-* dark corner <1>:                       Glossary.          (line 20013)
-* dark corner <2>:                       Truth Values.      (line  6264)
-* dark corner <3>:                       Assignment Ops.    (line  6137)
-* dark corner <4>:                       Format Modifiers.  (line  4667)
-* dark corner:                           Conventions.       (line   850)
+                                                              (line  29)
+* cut utility:                           Cut Program.         (line   6)
+* cut.awk program:                       Cut Program.         (line  44)
+* d.c., See dark corner:                 Conventions.         (line  37)
+* dark corner <1>:                       Glossary.            (line 188)
+* dark corner <2>:                       Truth Values.        (line  24)
+* dark corner <3>:                       Assignment Ops.      (line 148)
+* dark corner <4>:                       Format Modifiers.    (line  59)
+* dark corner:                           Conventions.         (line  37)
 * dark corner, array subscripts:         Uninitialized Subscripts.
-                                                            (line  8743)
-* dark corner, break statement:          Break Statement.   (line  7566)
+                                                              (line  42)
+* dark corner, break statement:          Break Statement.     (line  47)
 * dark corner, close function:           Close Files And Pipes.
-                                                            (line  5323)
-* dark corner, command-line arguments:   Assignment Options.
-                                                            (line  5708)
-* dark corner, continue statement:       Continue Statement.
-                                                            (line  7619)
-* dark corner, CONVFMT variable:         Conversion.        (line  5753)
-* dark corner, escape sequences:         Other Arguments.   (line 12330)
+                                                              (line 130)
+* dark corner, command-line arguments:   Assignment Options.  (line  43)
+* dark corner, continue statement:       Continue Statement.  (line  43)
+* dark corner, CONVFMT variable:         Conversion.          (line  40)
+* dark corner, escape sequences:         Other Arguments.     (line  31)
 * dark corner, escape sequences, for metacharacters: Escape Sequences.
-                                                            (line  2168)
-* dark corner, exit statement:           Exit Statement.    (line  7760)
+                                                              (line 136)
+* dark corner, exit statement:           Exit Statement.      (line  29)
 * dark corner, field separators:         Field Splitting Summary.
-                                                            (line  3555)
-* dark corner, FILENAME variable <1>:    Auto-set.          (line  8049)
-* dark corner, FILENAME variable:        Getline Notes.     (line  4198)
-* dark corner, FNR/NR variables:         Auto-set.          (line  8148)
-* dark corner, format-control characters: Control Letters.  (line  4601)
+                                                              (line  47)
+* dark corner, FILENAME variable <1>:    Auto-set.            (line  88)
+* dark corner, FILENAME variable:        Getline Notes.       (line  19)
+* dark corner, FNR/NR variables:         Auto-set.            (line 187)
+* dark corner, format-control characters: Control Letters.    (line  80)
 * dark corner, FS as null string:        Single Character Fields.
-                                                            (line  3415)
-* dark corner, input files:              Records.           (line  2908)
-* dark corner, invoking awk:             Command Line.      (line 11998)
-* dark corner, multiline records:        Multiple Line.     (line  3734)
-* dark corner, NF variable, decrementing: Changing Fields.  (line  3231)
-* dark corner, OFMT variable:            OFMT.              (line  4455)
+                                                              (line  20)
+* dark corner, input files:              Records.             (line  98)
+* dark corner, invoking awk:             Command Line.        (line  16)
+* dark corner, multiline records:        Multiple Line.       (line  35)
+* dark corner, NF variable, decrementing: Changing Fields.    (line 107)
+* dark corner, OFMT variable:            OFMT.                (line  27)
 * dark corner, regexp constants:         Using Constant Regexps.
-                                                            (line  5544)
+                                                              (line   6)
 * dark corner, regexp constants, /= operator and: Assignment Ops.
-                                                            (line  6137)
+                                                              (line 148)
 * dark corner, regexp constants, as arguments to user-defined functions: Using Constant Regexps.
-                                                            (line  5582)
-* dark corner, split function:           String Functions.  (line  9378)
-* dark corner, strings, storing:         Records.           (line  2995)
-* data, fixed-width:                     Constant Size.     (line  3605)
-* data-driven languages:                 Basic High Level.  (line 19620)
-* database, group, reading:              Group Functions.   (line 13968)
-* database, users, reading:              Passwd Functions.  (line 13743)
-* date utility, GNU:                     Time Functions.    (line  9998)
-* date utility, POSIX:                   Time Functions.    (line 10245)
-* dates, converting to timestamps:       Time Functions.    (line 10050)
+                                                              (line  44)
+* dark corner, split function:           String Functions.    (line 220)
+* dark corner, strings, storing:         Records.             (line 186)
+* data, fixed-width:                     Constant Size.       (line   9)
+* data-driven languages:                 Basic High Level.    (line  83)
+* database, group, reading:              Group Functions.     (line   6)
+* database, users, reading:              Passwd Functions.    (line   6)
+* date utility, GNU:                     Time Functions.      (line  17)
+* date utility, POSIX:                   Time Functions.      (line 259)
+* dates, converting to timestamps:       Time Functions.      (line  72)
 * dates, information related to, localization: Explaining gettext.
-                                                            (line 11026)
-* Davies, Stephen <1>:                   Bugs.              (line 18369)
-* Davies, Stephen:                       Contributors.      (line 17118)
-* dcgettext function (gawk) <1>:         Programmer i18n.   (line 11064)
-* dcgettext function (gawk):             I18N Functions.    (line 10442)
+                                                              (line 111)
+* Davies, Stephen <1>:                   Bugs.                (line  62)
+* Davies, Stephen:                       Contributors.        (line  68)
+* dcgettext function (gawk) <1>:         Programmer i18n.     (line  19)
+* dcgettext function (gawk):             I18N Functions.      (line  12)
 * dcgettext function (gawk), portability and: I18N Portability.
-                                                            (line 11306)
-* dcngettext function (gawk) <1>:        Programmer i18n.   (line 11080)
-* dcngettext function (gawk):            I18N Functions.    (line 10448)
+                                                              (line  32)
+* dcngettext function (gawk) <1>:        Programmer i18n.     (line  35)
+* dcngettext function (gawk):            I18N Functions.      (line  18)
 * dcngettext function (gawk), portability and: I18N Portability.
-                                                            (line 11306)
-* deadlocks:                             Two-way I/O.       (line 11587)
-* debugging gawk:                        Known Bugs.        (line 12454)
-* debugging gawk, bug reports:           Bugs.              (line 18317)
-* decrement operators:                   Increment Ops.     (line  6189)
-* default keyword:                       Switch Statement.  (line  7464)
-* Deifik, Scott <1>:                     Bugs.              (line 18365)
-* Deifik, Scott <2>:                     Contributors.      (line 17102)
-* Deifik, Scott:                         Acknowledgments.   (line   995)
-* delete statement:                      Delete.            (line  8585)
-* deleting elements in arrays:           Delete.            (line  8585)
-* deleting entire arrays:                Delete.            (line  8618)
-* differences between gawk and awk:      String Functions.  (line  9246)
+                                                              (line  32)
+* deadlocks:                             Two-way I/O.         (line  71)
+* debugging gawk:                        Known Bugs.          (line   6)
+* debugging gawk, bug reports:           Bugs.                (line   9)
+* decimal point character, locale specific: Options.          (line 200)
+* decrement operators:                   Increment Ops.       (line  35)
+* default keyword:                       Switch Statement.    (line   6)
+* Deifik, Scott <1>:                     Bugs.                (line  58)
+* Deifik, Scott <2>:                     Contributors.        (line  52)
+* Deifik, Scott:                         Acknowledgments.     (line  53)
+* delete statement:                      Delete.              (line   6)
+* deleting elements in arrays:           Delete.              (line   6)
+* deleting entire arrays:                Delete.              (line  39)
+* differences between gawk and awk:      String Functions.    (line  88)
 * differences in awk and gawk, ARGC/ARGV variables: ARGC and ARGV.
-                                                            (line  8259)
-* differences in awk and gawk, ARGIND variable: Auto-set.   (line  8001)
+                                                              (line  85)
+* differences in awk and gawk, ARGIND variable: Auto-set.     (line  40)
 * differences in awk and gawk, array elements, deleting: Delete.
-                                                            (line  8618)
+                                                              (line  39)
 * differences in awk and gawk, AWKPATH environment variable: AWKPATH Variable.
-                                                            (line 12361)
+                                                              (line   6)
 * differences in awk and gawk, BEGIN/END patterns: I/O And BEGIN/END.
-                                                            (line  7068)
+                                                              (line  16)
 * differences in awk and gawk, BINMODE variable <1>: PC Using.
-                                                            (line 17887)
+                                                              (line  40)
 * differences in awk and gawk, BINMODE variable: User-modified.
-                                                            (line  7828)
+                                                              (line  21)
 * differences in awk and gawk, close function: Close Files And Pipes.
-                                                            (line  5274)
-* differences in awk and gawk, ERRNO variable: Auto-set.    (line  8033)
-* differences in awk and gawk, error messages: Special FD.  (line  5028)
+                                                              (line  81)
+* differences in awk and gawk, ERRNO variable: Auto-set.      (line  72)
+* differences in awk and gawk, error messages: Special FD.    (line  15)
 * differences in awk and gawk, FIELDWIDTHS variable: User-modified.
-                                                            (line  7840)
+                                                              (line  33)
 * differences in awk and gawk, function arguments (gawk): Calling Built-in.
-                                                            (line  9017)
-* differences in awk and gawk, getline command: Getline.    (line  3856)
+                                                              (line  16)
+* differences in awk and gawk, getline command: Getline.      (line  19)
 * differences in awk and gawk, IGNORECASE variable: User-modified.
-                                                            (line  7875)
+                                                              (line  68)
 * differences in awk and gawk, implementation limitations <1>: Redirection.
-                                                            (line  4973)
+                                                              (line 132)
 * differences in awk and gawk, implementation limitations: Getline Notes.
-                                                            (line  4193)
+                                                              (line  14)
 * differences in awk and gawk, input/output operators <1>: Redirection.
-                                                            (line  4944)
+                                                              (line  99)
 * differences in awk and gawk, input/output operators: Getline/Coprocess.
-                                                            (line  4137)
+                                                              (line   6)
 * differences in awk and gawk, line continuations: Conditional Exp.
-                                                            (line  6581)
-* differences in awk and gawk, LINT variable: User-modified.
-                                                            (line  7890)
+                                                              (line  34)
+* differences in awk and gawk, LINT variable: User-modified.  (line  83)
 * differences in awk and gawk, match function: String Functions.
-                                                            (line  9309)
+                                                              (line 151)
 * differences in awk and gawk, next/nextfile statements: Nextfile Statement.
-                                                            (line  7684)
+                                                              (line   6)
 * differences in awk and gawk, print/printf statements: Format Modifiers.
-                                                            (line  4621)
-* differences in awk and gawk, PROCINFO array: Auto-set.    (line  8080)
-* differences in awk and gawk, record separators: Records.  (line  2921)
+                                                              (line  13)
+* differences in awk and gawk, PROCINFO array: Auto-set.      (line 119)
+* differences in awk and gawk, record separators: Records.    (line 112)
 * differences in awk and gawk, regexp constants: Using Constant Regexps.
-                                                            (line  5582)
+                                                              (line  44)
 * differences in awk and gawk, regular expressions: Case-sensitivity.
-                                                            (line  2569)
-* differences in awk and gawk, RS/RT variables: Records.    (line  2971)
-* differences in awk and gawk, RT variable: Auto-set.       (line  8137)
+                                                              (line  26)
+* differences in awk and gawk, RS/RT variables: Records.      (line 162)
+* differences in awk and gawk, RT variable: Auto-set.         (line 176)
 * differences in awk and gawk, single-character fields: Single Character Fields.
-                                                            (line  3401)
+                                                              (line   6)
 * differences in awk and gawk, split function: String Functions.
-                                                            (line  9367)
-* differences in awk and gawk, strings:  Scalar Constants.  (line  5439)
-* differences in awk and gawk, strings, storing: Records.   (line  2991)
+                                                              (line 209)
+* differences in awk and gawk, strings:  Scalar Constants.    (line  20)
+* differences in awk and gawk, strings, storing: Records.     (line 182)
 * differences in awk and gawk, strtonum function (gawk): String Functions.
-                                                            (line  9405)
+                                                              (line 247)
 * differences in awk and gawk, TEXTDOMAIN variable: User-modified.
-                                                            (line  7945)
+                                                              (line 138)
 * differences in awk and gawk, trunc-mod operation: Arithmetic Ops.
-                                                            (line  5883)
-* directories, changing:                 Sample Library.    (line 19054)
-* directories, searching <1>:            Igawk Program.     (line 16601)
-* directories, searching:                AWKPATH Variable.  (line 12361)
-* division:                              Arithmetic Ops.    (line  5861)
-* do-while statement <1>:                Do Statement.      (line  7346)
-* do-while statement:                    Regexp Usage.      (line  1989)
-* documentation, of awk programs:        Library Names.     (line 12541)
-* documentation, online:                 Manual History.    (line   870)
-* documents, searching:                  Dupword Program.   (line 15429)
-* dollar sign ($):                       Regexp Operators.  (line  2210)
-* dollar sign ($), $ field operator <1>: Precedence.        (line  6689)
-* dollar sign ($), $ field operator:     Fields.            (line  3027)
+                                                              (line  66)
+* directories, changing:                 Sample Library.      (line   6)
+* directories, searching <1>:            Igawk Program.       (line 358)
+* directories, searching:                AWKPATH Variable.    (line   6)
+* division:                              Arithmetic Ops.      (line  44)
+* do-while statement <1>:                Do Statement.        (line   6)
+* do-while statement:                    Regexp Usage.        (line  19)
+* documentation, of awk programs:        Library Names.       (line   6)
+* documentation, online:                 Manual History.      (line  11)
+* documents, searching:                  Dupword Program.     (line   6)
+* dollar sign ($):                       Regexp Operators.    (line  35)
+* dollar sign ($), $ field operator <1>: Precedence.          (line  43)
+* dollar sign ($), $ field operator:     Fields.              (line  19)
 * dollar sign ($), incrementing fields and arrays: Increment Ops.
-                                                            (line  6184)
-* double quote (") <1>:                  Quoting.           (line  1376)
-* double quote ("):                      Read Terminal.     (line  1165)
-* double quote ("), regexp constants:    Computed Regexps.  (line  2677)
-* double-precision floating-point:       Basic Data Typing. (line 19666)
-* Drepper, Ulrich:                       Acknowledgments.   (line   991)
-* dupnode internal function:             Internals.         (line 18883)
-* dupword.awk program:                   Dupword Program.   (line 15454)
-* EBCDIC:                                Ordinal Functions. (line 13014)
-* egrep utility <1>:                     Egrep Program.     (line 14525)
-* egrep utility:                         Character Lists.   (line  2371)
-* egrep.awk program:                     Egrep Program.     (line 14573)
+                                                              (line  30)
+* double quote (") <1>:                  Quoting.             (line  33)
+* double quote ("):                      Read Terminal.       (line  25)
+* double quote ("), regexp constants:    Computed Regexps.    (line  28)
+* double-precision floating-point:       Basic Data Typing.   (line  33)
+* Drepper, Ulrich:                       Acknowledgments.     (line  49)
+* dupnode internal function:             Internals.           (line  97)
+* dupword.awk program:                   Dupword Program.     (line  31)
+* EBCDIC:                                Ordinal Functions.   (line  44)
+* egrep utility <1>:                     Egrep Program.       (line   6)
+* egrep utility:                         Character Lists.     (line  24)
+* egrep.awk program:                     Egrep Program.       (line  54)
 * elements in arrays:                    Reference to Elements.
-                                                            (line  8413)
-* elements in arrays, assigning:         Assigning Elements.
-                                                            (line  8460)
-* elements in arrays, deleting:          Delete.            (line  8585)
-* elements in arrays, order of:          Scanning an Array. (line  8571)
-* elements in arrays, scanning:          Scanning an Array. (line  8530)
-* email address for bug reports, bug-gawk@gnu.org: Bugs.    (line 18335)
-* EMISTERED:                             TCP/IP Networking. (line 11658)
-* empty pattern:                         Empty.             (line  7101)
+                                                              (line   6)
+* elements in arrays, assigning:         Assigning Elements.  (line   6)
+* elements in arrays, deleting:          Delete.              (line   6)
+* elements in arrays, order of:          Scanning an Array.   (line  47)
+* elements in arrays, scanning:          Scanning an Array.   (line   6)
+* email address for bug reports, bug-gawk@gnu.org: Bugs.      (line  27)
+* EMISTERED:                             TCP/IP Networking.   (line   6)
+* empty pattern:                         Empty.               (line   6)
 * empty strings, See null strings:       Regexp Field Splitting.
-                                                            (line  3379)
-* END pattern:                           BEGIN/END.         (line  6980)
+                                                              (line  43)
+* END pattern:                           BEGIN/END.           (line   6)
 * END pattern, assert user-defined function and: Assert Function.
-                                                            (line 12883)
-* END pattern, backslash continuation and: Egrep Program.   (line 14737)
-* END pattern, Boolean patterns and:     Expression Patterns.
-                                                            (line  6900)
-* END pattern, exit statement and:       Exit Statement.    (line  7743)
+                                                              (line  74)
+* END pattern, backslash continuation and: Egrep Program.     (line 218)
+* END pattern, Boolean patterns and:     Expression Patterns. (line  73)
+* END pattern, exit statement and:       Exit Statement.      (line  12)
 * END pattern, next/nextfile statements and <1>: Next Statement.
-                                                            (line  7668)
+                                                              (line  39)
 * END pattern, next/nextfile statements and: I/O And BEGIN/END.
-                                                            (line  7088)
-* END pattern, operators and:            Using BEGIN/END.   (line  7010)
-* END pattern, pgawk program:            Profiling.         (line 11802)
-* END pattern, print statement and:      I/O And BEGIN/END. (line  7068)
-* endfile user-defined function:         Filetrans Function.
-                                                            (line 13265)
-* endgrent function (C library):         Group Functions.   (line 14175)
-* endgrent user-defined function:        Group Functions.   (line 14178)
-* endpwent function (C library):         Passwd Functions.  (line 13929)
-* endpwent user-defined function:        Passwd Functions.  (line 13932)
-* ENVIRON variable <1>:                  Internals.         (line 18951)
-* ENVIRON variable:                      Auto-set.          (line  8021)
-* environment variables:                 Auto-set.          (line  8021)
-* epoch, definition of:                  Glossary.          (line 20055)
-* equals sign (=), = operator:           Assignment Ops.    (line  5989)
-* equals sign (=), == operator <1>:      Precedence.        (line  6711)
-* equals sign (=), == operator:          Typing and Comparison.
-                                                            (line  6342)
-* EREs (Extended Regular Expressions):   Character Lists.   (line  2371)
-* ERRNO variable <1>:                    Internals.         (line 18938)
-* ERRNO variable <2>:                    Auto-set.          (line  8033)
-* ERRNO variable:                        Getline.           (line  3856)
-* error handling:                        Special FD.        (line  5028)
-* error handling, ERRNO variable and:    Auto-set.          (line  8033)
-* error output:                          Special FD.        (line  5019)
-* escape processing, gsub/gensub/sub functions: Gory Details.
-                                                            (line  9642)
-* escape sequences:                      Escape Sequences.  (line  2038)
-* escape sequences, unrecognized:        Options.           (line 12179)
-* evaluation order:                      Increment Ops.     (line  6215)
-* evaluation order, concatenation:       Concatenation.     (line  5943)
-* evaluation order, functions:           Calling Built-in.  (line  9031)
-* examining fields:                      Fields.            (line  3014)
-* exclamation point (!), ! operator <1>: Egrep Program.     (line 14679)
-* exclamation point (!), ! operator <2>: Precedence.        (line  6698)
-* exclamation point (!), ! operator:     Boolean Ops.       (line  6524)
-* exclamation point (!), != operator <1>: Precedence.       (line  6711)
-* exclamation point (!), != operator:    Typing and Comparison.
-                                                            (line  6342)
+                                                              (line  36)
+* END pattern, operators and:            Using BEGIN/END.     (line  17)
+* END pattern, pgawk program:            Profiling.           (line  69)
+* END pattern, print statement and:      I/O And BEGIN/END.   (line  16)
+* endfile user-defined function:         Filetrans Function.  (line  60)
+* endgrent function (C library):         Group Functions.     (line 213)
+* endgrent user-defined function:        Group Functions.     (line 216)
+* endpwent function (C library):         Passwd Functions.    (line 192)
+* endpwent user-defined function:        Passwd Functions.    (line 195)
+* ENVIRON variable <1>:                  Internals.           (line 165)
+* ENVIRON variable:                      Auto-set.            (line  60)
+* environment variables:                 Auto-set.            (line  60)
+* epoch, definition of:                  Glossary.            (line 230)
+* equals sign (=), = operator:           Assignment Ops.      (line   6)
+* equals sign (=), == operator <1>:      Precedence.          (line  65)
+* equals sign (=), == operator:          Comparison Operators.
+                                                              (line  11)
+* EREs (Extended Regular Expressions):   Character Lists.     (line  24)
+* ERRNO variable <1>:                    Internals.           (line 152)
+* ERRNO variable <2>:                    Auto-set.            (line  72)
+* ERRNO variable:                        Getline.             (line  19)
+* error handling:                        Special FD.          (line  15)
+* error handling, ERRNO variable and:    Auto-set.            (line  72)
+* error output:                          Special FD.          (line   6)
+* escape processing, gsub/gensub/sub functions: Gory Details. (line   6)
+* escape sequences:                      Escape Sequences.    (line   6)
+* escape sequences, unrecognized:        Options.             (line 180)
+* evaluation order:                      Increment Ops.       (line  61)
+* evaluation order, concatenation:       Concatenation.       (line  42)
+* evaluation order, functions:           Calling Built-in.    (line  30)
+* examining fields:                      Fields.              (line   6)
+* exclamation point (!), ! operator <1>: Egrep Program.       (line 160)
+* exclamation point (!), ! operator <2>: Precedence.          (line  52)
+* exclamation point (!), ! operator:     Boolean Ops.         (line  67)
+* exclamation point (!), != operator <1>: Precedence.         (line  65)
+* exclamation point (!), != operator:    Comparison Operators.
+                                                              (line  11)
 * exclamation point (!), !~ operator <1>: Expression Patterns.
-                                                            (line  6851)
-* exclamation point (!), !~ operator <2>: Precedence.       (line  6727)
-* exclamation point (!), !~ operator <3>: Typing and Comparison.
-                                                            (line  6342)
-* exclamation point (!), !~ operator <4>: Regexp Constants. (line  5532)
-* exclamation point (!), !~ operator <5>: Computed Regexps. (line  2656)
-* exclamation point (!), !~ operator <6>: Case-sensitivity. (line  2569)
-* exclamation point (!), !~ operator:    Regexp Usage.      (line  1989)
-* exit statement:                        Exit Statement.    (line  7737)
-* exp function:                          Numeric Functions. (line  9067)
-* expand utility:                        Very Simple.       (line  1594)
-* expressions:                           Expressions.       (line  5362)
-* expressions, as patterns:              Expression Patterns.
-                                                            (line  6833)
-* expressions, assignment:               Assignment Ops.    (line  5989)
-* expressions, Boolean:                  Boolean Ops.       (line  6463)
+                                                              (line  24)
+* exclamation point (!), !~ operator <2>: Precedence.         (line  81)
+* exclamation point (!), !~ operator <3>: Comparison Operators.
+                                                              (line  11)
+* exclamation point (!), !~ operator <4>: Regexp Constants.   (line   6)
+* exclamation point (!), !~ operator <5>: Computed Regexps.   (line   6)
+* exclamation point (!), !~ operator <6>: Case-sensitivity.   (line  26)
+* exclamation point (!), !~ operator:    Regexp Usage.        (line  19)
+* exit statement:                        Exit Statement.      (line   6)
+* exp function:                          Numeric Functions.   (line  22)
+* expand utility:                        Very Simple.         (line  69)
+* expressions:                           Expressions.         (line   6)
+* expressions, as patterns:              Expression Patterns. (line   6)
+* expressions, assignment:               Assignment Ops.      (line   6)
+* expressions, Boolean:                  Boolean Ops.         (line   6)
 * expressions, comparison:               Typing and Comparison.
-                                                            (line  6277)
-* expressions, conditional:              Conditional Exp.   (line  6553)
+                                                              (line   9)
+* expressions, conditional:              Conditional Exp.     (line   6)
 * expressions, matching, See comparison expressions: Typing and Comparison.
-                                                            (line  6277)
-* expressions, selecting:                Conditional Exp.   (line  6553)
-* Extended Regular Expressions (EREs):   Character Lists.   (line  2371)
+                                                              (line   9)
+* expressions, selecting:                Conditional Exp.     (line   6)
+* Extended Regular Expressions (EREs):   Character Lists.     (line  24)
 * extension function (gawk):             Using Internal File Ops.
-                                                            (line 19373)
-* extensions, Bell Laboratories awk:     BTL.               (line 16809)
-* extensions, in gawk, not in POSIX awk: POSIX/GNU.         (line 16852)
-* extensions, mawk:                      Other Versions.    (line 18423)
-* extract.awk program:                   Extract Program.   (line 16050)
+                                                              (line  15)
+* extensions, Bell Laboratories awk:     BTL.                 (line   6)
+* extensions, in gawk, not in POSIX awk: POSIX/GNU.           (line   6)
+* extensions, mawk:                      Other Versions.      (line  46)
+* extract.awk program:                   Extract Program.     (line  77)
 * extraction, of marked strings (internationalization): String Extraction.
-                                                            (line 11177)
-* false, logical:                        Truth Values.      (line  6246)
+                                                              (line   6)
+* false, logical:                        Truth Values.        (line   6)
 * FDL (Free Documentation License):      GNU Free Documentation License.
-                                                            (line 20789)
-* features, adding to gawk:              Adding Code.       (line 18547)
-* features, advanced, See advanced features: Obsolete.      (line 12421)
-* features, deprecated:                  Obsolete.          (line 12421)
-* features, undocumented:                Undocumented.      (line 12443)
-* Fenlason, Jay <1>:                     Contributors.      (line 17069)
-* Fenlason, Jay:                         History.           (line   653)
-* fflush function:                       I/O Functions.     (line  9834)
-* fflush function, unsupported:          Options.           (line 12199)
-* field numbers:                         Nonconstant Fields.
-                                                            (line  3085)
-* field operator $:                      Fields.            (line  3027)
-* field operators, dollar sign as:       Fields.            (line  3027)
-* field separators <1>:                  User-modified.     (line  7850)
-* field separators:                      Field Separators.  (line  3271)
-* field separators, choice of:           Field Separators.  (line  3306)
-* field separators, FIELDWIDTHS variable and: User-modified.
-                                                            (line  7840)
-* field separators, in multiline records: Multiple Line.    (line  3740)
+                                                              (line   6)
+* features, adding to gawk:              Adding Code.         (line   6)
+* features, advanced, See advanced features: Obsolete.        (line   6)
+* features, deprecated:                  Obsolete.            (line   6)
+* features, undocumented:                Undocumented.        (line   6)
+* Fenlason, Jay <1>:                     Contributors.        (line  19)
+* Fenlason, Jay:                         History.             (line  30)
+* fflush function:                       I/O Functions.       (line  25)
+* fflush function, unsupported:          Options.             (line 203)
+* field numbers:                         Nonconstant Fields.  (line   6)
+* field operator $:                      Fields.              (line  19)
+* field operators, dollar sign as:       Fields.              (line  19)
+* field separators <1>:                  User-modified.       (line  43)
+* field separators:                      Field Separators.    (line  13)
+* field separators, choice of:           Field Separators.    (line  49)
+* field separators, FIELDWIDTHS variable and: User-modified.  (line  33)
+* field separators, in multiline records: Multiple Line.      (line  41)
 * field separators, on command line:     Command Line Field Separator.
-                                                            (line  3427)
+                                                              (line   6)
 * field separators, POSIX and <1>:       Field Splitting Summary.
-                                                            (line  3549)
-* field separators, POSIX and:           Fields.            (line  3014)
+                                                              (line  41)
+* field separators, POSIX and:           Fields.              (line   6)
 * field separators, regular expressions as <1>: Regexp Field Splitting.
-                                                            (line  3343)
-* field separators, regular expressions as: Field Separators.
-                                                            (line  3306)
-* field separators, See Also OFS:        Changing Fields.   (line  3188)
-* field separators, spaces as:           Cut Program.       (line 14371)
-* fields <1>:                            Basic High Level.  (line 19608)
-* fields <2>:                            Fields.            (line  3014)
-* fields:                                Reading Files.     (line  2788)
-* fields, adding:                        Changing Fields.   (line  3177)
-* fields, changing contents of:          Changing Fields.   (line  3130)
-* fields, cutting:                       Cut Program.       (line 14271)
-* fields, examining:                     Fields.            (line  3014)
-* fields, number of:                     Fields.            (line  3041)
-* fields, numbers:                       Nonconstant Fields.
-                                                            (line  3085)
-* fields, printing:                      Print Examples.    (line  4329)
-* fields, separating:                    Field Separators.  (line  3271)
+                                                              (line   6)
+* field separators, regular expressions as: Field Separators. (line  49)
+* field separators, See Also OFS:        Changing Fields.     (line  64)
+* field separators, spaces as:           Cut Program.         (line 106)
+* fields <1>:                            Basic High Level.    (line  71)
+* fields <2>:                            Fields.              (line   6)
+* fields:                                Reading Files.       (line  14)
+* fields, adding:                        Changing Fields.     (line  53)
+* fields, changing contents of:          Changing Fields.     (line   6)
+* fields, cutting:                       Cut Program.         (line   6)
+* fields, examining:                     Fields.              (line   6)
+* fields, number of:                     Fields.              (line  33)
+* fields, numbers:                       Nonconstant Fields.  (line   6)
+* fields, printing:                      Print Examples.      (line  21)
+* fields, separating:                    Field Separators.    (line  13)
 * fields, single-character:              Single Character Fields.
-                                                            (line  3401)
-* FIELDWIDTHS variable <1>:              User-modified.     (line  7840)
-* FIELDWIDTHS variable:                  Constant Size.     (line  3618)
-* file descriptors:                      Special FD.        (line  5019)
-* file names, distinguishing:            Auto-set.          (line  8013)
-* file names, in compatibility mode:     Special Caveats.   (line  5167)
-* file names, standard streams in gawk:  Special FD.        (line  5054)
-* FILENAME variable <1>:                 Auto-set.          (line  8049)
-* FILENAME variable:                     Reading Files.     (line  2780)
-* FILENAME variable, getline, setting with: Getline Notes.  (line  4198)
-* filenames, assignments as:             Ignoring Assigns.  (line 13418)
-* files, .mo:                            Explaining gettext.
-                                                            (line 10954)
-* files, .mo, converting from .po:       I18N Example.      (line 11400)
-* files, .mo, specifying directory of <1>: Programmer i18n. (line 11090)
-* files, .mo, specifying directory of:   Explaining gettext.
-                                                            (line 10966)
-* files, .po <1>:                        Translator i18n.   (line 11156)
-* files, .po:                            Explaining gettext.
-                                                            (line 10951)
-* files, .po, converting to .mo:         I18N Example.      (line 11400)
-* files, /dev/... special files:         Special FD.        (line  5054)
-* files, /inet/ (gawk):                  TCP/IP Networking. (line 11658)
-* files, /p (gawk):                      Portal Files.      (line 11725)
-* files, as single records:              Records.           (line  3000)
-* files, awk programs in:                Long.              (line  1196)
-* files, awkprof.out:                    Profiling.         (line 11744)
-* files, awkvars.out:                    Options.           (line 12101)
-* files, closing:                        I/O Functions.     (line  9819)
-* files, descriptors, See file descriptors: Special FD.     (line  5019)
-* files, for process information:        Special Process.   (line  5086)
-* files, group:                          Group Functions.   (line 13968)
-* files, information about, retrieving:  Sample Library.    (line 19054)
-* files, initialization and cleanup:     Filetrans Function.
-                                                            (line 13211)
-* files, input, See input files:         Read Terminal.     (line  1157)
-* files, log, timestamps in:             Time Functions.    (line  9987)
+                                                              (line   6)
+* FIELDWIDTHS variable <1>:              User-modified.       (line  33)
+* FIELDWIDTHS variable:                  Constant Size.       (line  22)
+* file descriptors:                      Special FD.          (line   6)
+* file names, distinguishing:            Auto-set.            (line  52)
+* file names, in compatibility mode:     Special Caveats.     (line   9)
+* file names, standard streams in gawk:  Special FD.          (line  41)
+* FILENAME variable <1>:                 Auto-set.            (line  88)
+* FILENAME variable:                     Reading Files.       (line   6)
+* FILENAME variable, getline, setting with: Getline Notes.    (line  19)
+* filenames, assignments as:             Ignoring Assigns.    (line   6)
+* files, .mo:                            Explaining gettext.  (line  39)
+* files, .mo, converting from .po:       I18N Example.        (line  62)
+* files, .mo, specifying directory of <1>: Programmer i18n.   (line  45)
+* files, .mo, specifying directory of:   Explaining gettext.  (line  51)
+* files, .po <1>:                        Translator i18n.     (line   6)
+* files, .po:                            Explaining gettext.  (line  36)
+* files, .po, converting to .mo:         I18N Example.        (line  62)
+* files, /dev/... special files:         Special FD.          (line  41)
+* files, /inet/ (gawk):                  TCP/IP Networking.   (line   6)
+* files, /p (gawk):                      Portal Files.        (line   6)
+* files, as single records:              Records.             (line 191)
+* files, awk programs in:                Long.                (line   6)
+* files, awkprof.out:                    Profiling.           (line  10)
+* files, awkvars.out:                    Options.             (line  95)
+* files, closing:                        I/O Functions.       (line  10)
+* files, descriptors, See file descriptors: Special FD.       (line   6)
+* files, for process information:        Special Process.     (line   6)
+* files, group:                          Group Functions.     (line   6)
+* files, information about, retrieving:  Sample Library.      (line   6)
+* files, initialization and cleanup:     Filetrans Function.  (line   6)
+* files, input, See input files:         Read Terminal.       (line  17)
+* files, log, timestamps in:             Time Functions.      (line   6)
 * files, managing:                       Data File Management.
-                                                            (line 13194)
-* files, managing, data file boundaries: Filetrans Function.
-                                                            (line 13211)
-* files, message object:                 Explaining gettext.
-                                                            (line 10954)
+                                                              (line   6)
+* files, managing, data file boundaries: Filetrans Function.  (line   6)
+* files, message object:                 Explaining gettext.  (line  39)
 * files, message object, converting from portable object files: I18N Example.
-                                                            (line 11400)
+                                                              (line  62)
 * files, message object, specifying directory of <1>: Programmer i18n.
-                                                            (line 11090)
+                                                              (line  45)
 * files, message object, specifying directory of: Explaining gettext.
-                                                            (line 10966)
-* files, multiple passes over:           Other Arguments.   (line 12348)
-* files, multiple, duplicating output into: Tee Program.    (line 14964)
+                                                              (line  51)
+* files, multiple passes over:           Other Arguments.     (line  49)
+* files, multiple, duplicating output into: Tee Program.      (line   6)
 * files, output, See output files:       Close Files And Pipes.
-                                                            (line  5199)
-* files, password:                       Passwd Functions.  (line 13753)
-* files, portable object <1>:            Translator i18n.   (line 11156)
-* files, portable object:                Explaining gettext.
-                                                            (line 10951)
+                                                              (line   6)
+* files, password:                       Passwd Functions.    (line  16)
+* files, portable object <1>:            Translator i18n.     (line   6)
+* files, portable object:                Explaining gettext.  (line  36)
 * files, portable object, converting to message object files: I18N Example.
-                                                            (line 11400)
-* files, portable object, generating:    Options.           (line 12136)
-* files, portal:                         Portal Files.      (line 11725)
-* files, processing, ARGIND variable and: Auto-set.         (line  8008)
-* files, reading:                        Rewind Function.   (line 13292)
-* files, reading, multiline records:     Multiple Line.     (line  3705)
-* files, searching for regular expressions: Egrep Program.  (line 14525)
-* files, skipping:                       File Checking.     (line 13334)
-* files, source, search path for:        Igawk Program.     (line 16601)
-* files, splitting:                      Split Program.     (line 14862)
-* files, Texinfo, extracting programs from: Extract Program.
-                                                            (line 15979)
-* Fish, Fred <1>:                        Bugs.              (line 18364)
-* Fish, Fred:                            Contributors.      (line 17100)
-* fixed-width data:                      Constant Size.     (line  3605)
-* flag variables <1>:                    Tee Program.       (line 14978)
-* flag variables:                        Boolean Ops.       (line  6524)
-* floating-point:                        Floating Point Issues.
-                                                            (line 19776)
-* floating-point, numbers:               Basic Data Typing. (line 19654)
-* floating-point, numbers, AWKNUM internal type: Internals. (line 18805)
-* FNR variable <1>:                      Auto-set.          (line  8059)
-* FNR variable:                          Records.           (line  2817)
-* FNR variable, changing:                Auto-set.          (line  8148)
-* for statement:                         For Statement.     (line  7382)
-* for statement, in arrays:              Scanning an Array. (line  8544)
-* force_number internal function:        Internals.         (line 18813)
-* force_string internal function:        Internals.         (line 18818)
+                                                              (line  62)
+* files, portable object, generating:    Options.             (line 130)
+* files, portal:                         Portal Files.        (line   6)
+* files, processing, ARGIND variable and: Auto-set.           (line  47)
+* files, reading:                        Rewind Function.     (line   6)
+* files, reading, multiline records:     Multiple Line.       (line   6)
+* files, searching for regular expressions: Egrep Program.    (line   6)
+* files, skipping:                       File Checking.       (line   6)
+* files, source, search path for:        Igawk Program.       (line 358)
+* files, splitting:                      Split Program.       (line   6)
+* files, Texinfo, extracting programs from: Extract Program.  (line   6)
+* Fish, Fred <1>:                        Bugs.                (line  57)
+* Fish, Fred:                            Contributors.        (line  50)
+* fixed-width data:                      Constant Size.       (line   9)
+* flag variables <1>:                    Tee Program.         (line  20)
+* flag variables:                        Boolean Ops.         (line  67)
+* floating-point:                        Unexpected Results.  (line   6)
+* floating-point, numbers:               Basic Data Typing.   (line  21)
+* floating-point, numbers, AWKNUM internal type: Internals.   (line  19)
+* FNR variable <1>:                      Auto-set.            (line  98)
+* FNR variable:                          Records.             (line   6)
+* FNR variable, changing:                Auto-set.            (line 187)
+* for statement:                         For Statement.       (line   6)
+* for statement, in arrays:              Scanning an Array.   (line  20)
+* force_number internal function:        Internals.           (line  27)
+* force_string internal function:        Internals.           (line  32)
 * format specifiers, mixing regular with positional specifiers: Printf Ordering.
-                                                            (line 11254)
-* format specifiers, printf statement:   Control Letters.   (line  4527)
+                                                              (line  57)
+* format specifiers, printf statement:   Control Letters.     (line   6)
 * format specifiers, strftime function (gawk): Time Functions.
-                                                            (line 10063)
-* format strings:                        Basic Printf.      (line  4495)
-* formats, numeric output:               OFMT.              (line  4434)
-* formatting output:                     Printf.            (line  4465)
-* forward slash (/):                     Regexp.            (line  1949)
-* forward slash (/), / operator:         Precedence.        (line  6701)
-* forward slash (/), /= operator <1>:    Precedence.        (line  6742)
-* forward slash (/), /= operator:        Assignment Ops.    (line  6111)
+                                                              (line  85)
+* format strings:                        Basic Printf.        (line  15)
+* formats, numeric output:               OFMT.                (line   6)
+* formatting output:                     Printf.              (line   6)
+* forward slash (/):                     Regexp.              (line  10)
+* forward slash (/), / operator:         Precedence.          (line  55)
+* forward slash (/), /= operator <1>:    Precedence.          (line  96)
+* forward slash (/), /= operator:        Assignment Ops.      (line 129)
 * forward slash (/), /= operator, vs. /=.../ regexp constant: Assignment Ops.
-                                                            (line  6137)
-* forward slash (/), patterns and:       Expression Patterns.
-                                                            (line  6851)
+                                                              (line 148)
+* forward slash (/), patterns and:       Expression Patterns. (line  24)
 * Free Documentation License (FDL):      GNU Free Documentation License.
-                                                            (line 20789)
-* Free Software Foundation (FSF) <1>:    Glossary.          (line 20109)
-* Free Software Foundation (FSF) <2>:    Getting.           (line 17193)
-* Free Software Foundation (FSF):        Manual History.    (line   865)
-* free_temp internal macro:              Internals.         (line 18888)
-* FreeBSD:                               Glossary.          (line 20404)
-* FS variable <1>:                       User-modified.     (line  7850)
-* FS variable:                           Field Separators.  (line  3271)
-* FS variable, --field-separator option and: Options.       (line 12027)
+                                                              (line   6)
+* Free Software Foundation (FSF) <1>:    Glossary.            (line 284)
+* Free Software Foundation (FSF) <2>:    Getting.             (line  10)
+* Free Software Foundation (FSF):        Manual History.      (line   6)
+* free_temp internal macro:              Internals.           (line 102)
+* FreeBSD:                               Glossary.            (line 582)
+* FS variable <1>:                       User-modified.       (line  43)
+* FS variable:                           Field Separators.    (line  13)
+* FS variable, --field-separator option and: Options.         (line  21)
 * FS variable, as null string:           Single Character Fields.
-                                                            (line  3415)
-* FS variable, as TAB character:         Options.           (line 12195)
-* FS variable, changing value of <1>:    Known Bugs.        (line 12454)
-* FS variable, changing value of:        Field Separators.  (line  3290)
-* FS variable, running awk programs and: Cut Program.       (line 14331)
+                                                              (line  20)
+* FS variable, as TAB character:         Options.             (line 196)
+* FS variable, changing value of <1>:    Known Bugs.          (line   6)
+* FS variable, changing value of:        Field Separators.    (line  33)
+* FS variable, running awk programs and: Cut Program.         (line  66)
 * FS variable, setting from command line: Command Line Field Separator.
-                                                            (line  3427)
-* FSF (Free Software Foundation) <1>:    Glossary.          (line 20109)
-* FSF (Free Software Foundation) <2>:    Getting.           (line 17193)
-* FSF (Free Software Foundation):        Manual History.    (line   865)
-* function calls:                        Function Calls.    (line  6593)
-* functions, arrays as parameters to:    Function Caveats.  (line 10716)
-* functions, built-in <1>:               Functions.         (line  8964)
-* functions, built-in:                   Function Calls.    (line  6597)
-* functions, built-in, adding to gawk:   Dynamic Extensions.
-                                                            (line 18765)
-* functions, built-in, evaluation order: Calling Built-in.  (line  9031)
-* functions, defining:                   Definition Syntax. (line 10492)
-* functions, library:                    Library Functions. (line 12469)
-* functions, library, assertions:        Assert Function.   (line 12815)
-* functions, library, associative arrays and: Library Names.
-                                                            (line 12592)
-* functions, library, C library:         Getopt Function.   (line 13460)
+                                                              (line   6)
+* FSF (Free Software Foundation) <1>:    Glossary.            (line 284)
+* FSF (Free Software Foundation) <2>:    Getting.             (line  10)
+* FSF (Free Software Foundation):        Manual History.      (line   6)
+* function calls:                        Function Calls.      (line   6)
+* functions, arrays as parameters to:    Function Caveats.    (line  55)
+* functions, built-in <1>:               Functions.           (line   6)
+* functions, built-in:                   Function Calls.      (line  10)
+* functions, built-in, adding to gawk:   Dynamic Extensions.  (line  10)
+* functions, built-in, evaluation order: Calling Built-in.    (line  30)
+* functions, defining:                   Definition Syntax.   (line   6)
+* functions, library:                    Library Functions.   (line   6)
+* functions, library, assertions:        Assert Function.     (line   6)
+* functions, library, associative arrays and: Library Names.  (line  57)
+* functions, library, C library:         Getopt Function.     (line   6)
 * functions, library, character values as numbers: Ordinal Functions.
-                                                            (line 12976)
+                                                              (line   6)
 * functions, library, Cliff random numbers: Cliff Random Function.
-                                                            (line 12945)
-* functions, library, command-line options: Getopt Function.
-                                                            (line 13460)
+                                                              (line   6)
+* functions, library, command-line options: Getopt Function.  (line   6)
 * functions, library, example program for using: Igawk Program.
-                                                            (line 16250)
+                                                              (line   6)
 * functions, library, group database, reading: Group Functions.
-                                                            (line 13968)
+                                                              (line   6)
 * functions, library, managing data files: Data File Management.
-                                                            (line 13194)
+                                                              (line   6)
 * functions, library, managing time:     Gettimeofday Function.
-                                                            (line 13112)
+                                                              (line   6)
 * functions, library, merging arrays into strings: Join Function.
-                                                            (line 13067)
-* functions, library, nextfile statement: Nextfile Function.
-                                                            (line 12645)
-* functions, library, rounding numbers:  Round Function.    (line 12900)
+                                                              (line   6)
+* functions, library, nextfile statement: Nextfile Function.  (line   6)
+* functions, library, rounding numbers:  Round Function.      (line   6)
 * functions, library, user database, reading: Passwd Functions.
-                                                            (line 13743)
-* functions, names of <1>:               Definition Syntax. (line 10506)
-* functions, names of:                   Arrays.            (line  8287)
-* functions, recursive:                  Definition Syntax. (line 10554)
-* functions, return values, setting:     Internals.         (line 18932)
-* functions, string-translation:         I18N Functions.    (line 10436)
-* functions, undefined:                  Function Caveats.  (line 10740)
-* functions, user-defined:               User-defined.      (line 10472)
-* functions, user-defined, calling:      Function Caveats.  (line 10667)
-* functions, user-defined, counts:       Profiling.         (line 11868)
-* functions, user-defined, library of:   Library Functions. (line 12469)
+                                                              (line   6)
+* functions, names of <1>:               Definition Syntax.   (line  20)
+* functions, names of:                   Arrays.              (line  17)
+* functions, recursive:                  Definition Syntax.   (line  68)
+* functions, return values, setting:     Internals.           (line 146)
+* functions, string-translation:         I18N Functions.      (line   6)
+* functions, undefined:                  Function Caveats.    (line  79)
+* functions, user-defined:               User-defined.        (line   6)
+* functions, user-defined, calling:      Function Caveats.    (line   6)
+* functions, user-defined, counts:       Profiling.           (line 135)
+* functions, user-defined, library of:   Library Functions.   (line   6)
 * functions, user-defined, next/nextfile statements and <1>: Nextfile Statement.
-                                                            (line  7717)
+                                                              (line  39)
 * functions, user-defined, next/nextfile statements and: Next Statement.
-                                                            (line  7668)
-* G-d:                                   Acknowledgments.   (line  1012)
-* Garfinkle, Scott:                      Contributors.      (line 17087)
-* gawk, awk and <1>:                     This Manual.       (line   718)
-* gawk, awk and:                         Preface.           (line   569)
-* gawk, bitwise operations in:           Bitwise Functions. (line 10347)
-* gawk, break statement in:              Break Statement.   (line  7566)
-* gawk, built-in variables and:          Built-in Variables.
-                                                            (line  7795)
-* gawk, character classes and:           Character Lists.   (line  2451)
-* gawk, coding style in:                 Adding Code.       (line 18573)
+                                                              (line  39)
+* G-d:                                   Acknowledgments.     (line  70)
+* Garfinkle, Scott:                      Contributors.        (line  37)
+* gawk, awk and <1>:                     This Manual.         (line  13)
+* gawk, awk and:                         Preface.             (line  22)
+* gawk, bitwise operations in:           Bitwise Functions.   (line  39)
+* gawk, break statement in:              Break Statement.     (line  47)
+* gawk, built-in variables and:          Built-in Variables.  (line  14)
+* gawk, character classes and:           Character Lists.     (line  92)
+* gawk, coding style in:                 Adding Code.         (line  32)
 * gawk, command-line options:            GNU Regexp Operators.
-                                                            (line  2517)
-* gawk, comparison operators and:        Typing and Comparison.
-                                                            (line  6390)
+                                                              (line  62)
+* gawk, comparison operators and:        Comparison Operators.
+                                                              (line  50)
 * gawk, configuring:                     Configuration Philosophy.
-                                                            (line 17507)
+                                                              (line   6)
 * gawk, configuring, options:            Additional Configuration Options.
-                                                            (line 17466)
-* gawk, continue statement in:           Continue Statement.
-                                                            (line  7619)
-* gawk, debugging:                       Known Bugs.        (line 12454)
+                                                              (line   6)
+* gawk, continue statement in:           Continue Statement.  (line  43)
+* gawk, debugging:                       Known Bugs.          (line   6)
 * gawk, distribution:                    Distribution contents.
-                                                            (line 17253)
-* gawk, escape sequences:                Escape Sequences.  (line  2157)
-* gawk, extensions, disabling:           Options.           (line 12175)
-* gawk, features, adding:                Adding Code.       (line 18547)
-* gawk, features, advanced:              Advanced Features. (line 11449)
-* gawk, fflush function in:              I/O Functions.     (line  9854)
-* gawk, field separators and:            User-modified.     (line  7870)
-* gawk, FIELDWIDTHS variable in:         User-modified.     (line  7846)
-* gawk, file names in:                   Special Files.     (line  5002)
-* gawk, format-control characters:       Control Letters.   (line  4601)
-* gawk, function arguments and:          Calling Built-in.  (line  9017)
-* gawk, functions, adding:               Dynamic Extensions.
-                                                            (line 18765)
-* gawk, hexadecimal numbers and:         Nondecimal-numbers.
-                                                            (line  5493)
-* gawk, IGNORECASE variable in:          User-modified.     (line  7886)
-* gawk, implementation issues:           Notes.             (line 18484)
-* gawk, implementation issues, debugging: Compatibility Mode.
-                                                            (line 18503)
+                                                              (line   6)
+* gawk, escape sequences:                Escape Sequences.    (line 125)
+* gawk, extensions, disabling:           Options.             (line 176)
+* gawk, features, adding:                Adding Code.         (line   6)
+* gawk, features, advanced:              Advanced Features.   (line   6)
+* gawk, fflush function in:              I/O Functions.       (line  45)
+* gawk, field separators and:            User-modified.       (line  63)
+* gawk, FIELDWIDTHS variable in:         User-modified.       (line  39)
+* gawk, file names in:                   Special Files.       (line   6)
+* gawk, format-control characters:       Control Letters.     (line  80)
+* gawk, function arguments and:          Calling Built-in.    (line  16)
+* gawk, functions, adding:               Dynamic Extensions.  (line  10)
+* gawk, hexadecimal numbers and:         Nondecimal-numbers.  (line  42)
+* gawk, IGNORECASE variable in:          User-modified.       (line  79)
+* gawk, implementation issues:           Notes.               (line   6)
+* gawk, implementation issues, debugging: Compatibility Mode. (line   6)
 * gawk, implementation issues, downward compatibility: Compatibility Mode.
-                                                            (line 18503)
-* gawk, implementation issues, limits:   Getline Notes.     (line  4193)
-* gawk, implementation issues, pipes:    Redirection.       (line  4973)
-* gawk, installing:                      Installation.      (line 17151)
-* gawk, internals:                       Internals.         (line 18792)
+                                                              (line   6)
+* gawk, implementation issues, limits:   Getline Notes.       (line  14)
+* gawk, implementation issues, pipes:    Redirection.         (line 132)
+* gawk, installing:                      Installation.        (line   6)
+* gawk, internals:                       Internals.           (line   6)
 * gawk, internationalization and, See internationalization: Internationalization.
-                                                            (line 10883)
-* gawk, interpreter, adding code to <1>: Future Extensions. (line 19505)
+                                                              (line  13)
+* gawk, interpreter, adding code to <1>: Future Extensions.   (line  87)
 * gawk, interpreter, adding code to:     Using Internal File Ops.
-                                                            (line 19364)
-* gawk, interval expressions and:        Regexp Operators.  (line  2313)
-* gawk, line continuation in:            Conditional Exp.   (line  6581)
-* gawk, LINT variable in:                User-modified.     (line  7899)
-* gawk, list of contributors to:         Contributors.      (line 17056)
-* gawk, MS-DOS version of:               PC Using.          (line 17858)
-* gawk, newlines in:                     Statements/Lines.  (line  1776)
-* gawk, next file statement in:          Nextfile Statement.
-                                                            (line  7724)
-* gawk, nextfile statement in <1>:       Nextfile Function. (line 12645)
-* gawk, nextfile statement in:           Nextfile Statement.
-                                                            (line  7724)
-* gawk, octal numbers and:               Nondecimal-numbers.
-                                                            (line  5493)
-* gawk, OS/2 version of:                 PC Using.          (line 17858)
+                                                              (line   6)
+* gawk, interval expressions and:        Regexp Operators.    (line 138)
+* gawk, line continuation in:            Conditional Exp.     (line  34)
+* gawk, LINT variable in:                User-modified.       (line  92)
+* gawk, list of contributors to:         Contributors.        (line   6)
+* gawk, MS-DOS version of:               PC Using.            (line  11)
+* gawk, newlines in:                     Statements/Lines.    (line  12)
+* gawk, next file statement in:          Nextfile Statement.  (line  46)
+* gawk, nextfile statement in <1>:       Nextfile Function.   (line   6)
+* gawk, nextfile statement in:           Nextfile Statement.  (line  46)
+* gawk, octal numbers and:               Nondecimal-numbers.  (line  42)
+* gawk, OS/2 version of:                 PC Using.            (line  11)
 * gawk, regexp constants and:            Using Constant Regexps.
-                                                            (line  5566)
+                                                              (line  28)
 * gawk, regular expressions, case sensitivity: Case-sensitivity.
-                                                            (line  2569)
+                                                              (line  26)
 * gawk, regular expressions, operators:  GNU Regexp Operators.
-                                                            (line  2461)
-* gawk, regular expressions, precedence: Regexp Operators.  (line  2329)
-* gawk, See Also awk:                    Preface.           (line   582)
-* gawk, source code, obtaining:          Getting.           (line 17189)
-* gawk, splitting fields and:            Constant Size.     (line  3682)
-* gawk, string-translation functions:    I18N Functions.    (line 10436)
-* gawk, timestamps:                      Time Functions.    (line  9987)
-* gawk, uses for:                        Preface.           (line   582)
-* gawk, versions of, information about, printing: Options.  (line 12235)
+                                                              (line   6)
+* gawk, regular expressions, precedence: Regexp Operators.    (line 154)
+* gawk, See Also awk:                    Preface.             (line  35)
+* gawk, source code, obtaining:          Getting.             (line   6)
+* gawk, splitting fields and:            Constant Size.       (line  87)
+* gawk, string-translation functions:    I18N Functions.      (line   6)
+* gawk, timestamps:                      Time Functions.      (line   6)
+* gawk, uses for:                        Preface.             (line  35)
+* gawk, versions of, information about, printing: Options.    (line 244)
 * gawk, word-boundary operator:          GNU Regexp Operators.
-                                                            (line  2510)
-* General Public License (GPL):          Glossary.          (line 20118)
-* General Public License, See GPL:       Manual History.    (line   870)
-* gensub function (gawk) <1>:            String Functions.  (line  9519)
+                                                              (line  55)
+* General Public License (GPL):          Glossary.            (line 293)
+* General Public License, See GPL:       Manual History.      (line  11)
+* gensub function (gawk) <1>:            String Functions.    (line 361)
 * gensub function (gawk):                Using Constant Regexps.
-                                                            (line  5582)
-* gensub function (gawk), escape processing: Gory Details.  (line  9642)
-* get_actual_argument internal function: Internals.         (line 18912)
-* get_argument internal function:        Internals.         (line 18907)
-* get_array_argument internal macro:     Internals.         (line 18927)
-* get_curfunc_arg_count internal function: Internals.       (line 18823)
-* get_record input method:               Internals.         (line 18964)
-* get_scalar_argument internal macro:    Internals.         (line 18922)
-* getgrent function (C library):         Group Functions.   (line 13968)
-* getgrent user-defined function:        Group Functions.   (line 13968)
-* getgrgid function (C library):         Group Functions.   (line 14142)
-* getgrgid user-defined function:        Group Functions.   (line 14145)
-* getgrnam function (C library):         Group Functions.   (line 14130)
-* getgrnam user-defined function:        Group Functions.   (line 14134)
-* getgruser function (C library):        Group Functions.   (line 14153)
-* getgruser function, user-defined:      Group Functions.   (line 14156)
-* getline command:                       Reading Files.     (line  2794)
+                                                              (line  44)
+* gensub function (gawk), escape processing: Gory Details.    (line   6)
+* get_actual_argument internal function: Internals.           (line 126)
+* get_argument internal function:        Internals.           (line 121)
+* get_array_argument internal macro:     Internals.           (line 141)
+* get_curfunc_arg_count internal function: Internals.         (line  37)
+* get_record input method:               Internals.           (line 178)
+* get_scalar_argument internal macro:    Internals.           (line 136)
+* getgrent function (C library):         Group Functions.     (line   6)
+* getgrent user-defined function:        Group Functions.     (line   6)
+* getgrgid function (C library):         Group Functions.     (line 180)
+* getgrgid user-defined function:        Group Functions.     (line 183)
+* getgrnam function (C library):         Group Functions.     (line 168)
+* getgrnam user-defined function:        Group Functions.     (line 172)
+* getgruser function (C library):        Group Functions.     (line 191)
+* getgruser function, user-defined:      Group Functions.     (line 194)
+* getline command:                       Reading Files.       (line  20)
 * getline command, _gr_init user-defined function: Group Functions.
-                                                            (line 14042)
-* getline command, _pw_init function:    Passwd Functions.  (line 13873)
+                                                              (line  80)
+* getline command, _pw_init function:    Passwd Functions.    (line 136)
 * getline command, coprocesses, using from <1>: Close Files And Pipes.
-                                                            (line  5199)
+                                                              (line   6)
 * getline command, coprocesses, using from: Getline/Coprocess.
-                                                            (line  4137)
-* getline command, deadlock and:         Two-way I/O.       (line 11587)
-* getline command, explicit input with:  Getline.           (line  3843)
-* getline command, FILENAME variable and: Getline Notes.    (line  4198)
-* getline command, return values:        Getline.           (line  3856)
-* getline command, variants:             Getline Summary.   (line  4219)
-* getopt function (C library):           Getopt Function.   (line 13469)
-* getopt user-defined function:          Getopt Function.   (line 13559)
-* getpwent function (C library):         Passwd Functions.  (line 13753)
-* getpwent user-defined function:        Passwd Functions.  (line 13753)
-* getpwnam function (C library):         Passwd Functions.  (line 13893)
-* getpwnam user-defined function:        Passwd Functions.  (line 13897)
-* getpwuid function (C library):         Passwd Functions.  (line 13905)
-* getpwuid user-defined function:        Passwd Functions.  (line 13909)
-* getservbyname function (C library):    TCP/IP Networking. (line 11686)
-* gettext function (C library):          Explaining gettext.
-                                                            (line 10975)
-* gettext library:                       Explaining gettext.
-                                                            (line 10921)
-* gettext library, locale categories:    Explaining gettext.
-                                                            (line 10993)
+                                                              (line   6)
+* getline command, deadlock and:         Two-way I/O.         (line  71)
+* getline command, explicit input with:  Getline.             (line   6)
+* getline command, FILENAME variable and: Getline Notes.      (line  19)
+* getline command, return values:        Getline.             (line  19)
+* getline command, variants:             Getline Summary.     (line   6)
+* getopt function (C library):           Getopt Function.     (line  15)
+* getopt user-defined function:          Getopt Function.     (line 106)
+* getpwent function (C library):         Passwd Functions.    (line  16)
+* getpwent user-defined function:        Passwd Functions.    (line  16)
+* getpwnam function (C library):         Passwd Functions.    (line 156)
+* getpwnam user-defined function:        Passwd Functions.    (line 160)
+* getpwuid function (C library):         Passwd Functions.    (line 168)
+* getpwuid user-defined function:        Passwd Functions.    (line 172)
+* getservbyname function (C library):    TCP/IP Networking.   (line  34)
+* gettext function (C library):          Explaining gettext.  (line  60)
+* gettext library:                       Explaining gettext.  (line   6)
+* gettext library, locale categories:    Explaining gettext.  (line  78)
 * gettimeofday user-defined function:    Gettimeofday Function.
-                                                            (line 13122)
-* GNITS mailing list:                    Acknowledgments.   (line   991)
-* GNU awk, See gawk:                     Preface.           (line   595)
+                                                              (line  16)
+* GNITS mailing list:                    Acknowledgments.     (line  49)
+* GNU awk, See gawk:                     Preface.             (line  48)
 * GNU Free Documentation License:        GNU Free Documentation License.
-                                                            (line 20789)
-* GNU General Public License:            Glossary.          (line 20118)
-* GNU Lesser General Public License:     Glossary.          (line 20195)
-* GNU long options <1>:                  Options.           (line 12012)
-* GNU long options:                      Command Line.      (line 11995)
-* GNU long options, printing list of:    Options.           (line 12145)
-* GNU Project <1>:                       Glossary.          (line 20127)
-* GNU Project:                           Manual History.    (line   870)
-* GNU/Linux <1>:                         Glossary.          (line 20404)
-* GNU/Linux <2>:                         Atari Compiling.   (line 18198)
-* GNU/Linux <3>:                         I18N Example.      (line 11393)
-* GNU/Linux:                             Manual History.    (line   886)
-* GPL (General Public License) <1>:      Glossary.          (line 20118)
-* GPL (General Public License):          Manual History.    (line   870)
-* GPL (General Public License), printing: Options.          (line 12093)
-* grcat program:                         Group Functions.   (line 13977)
-* Grigera, Juan <1>:                     Bugs.              (line 18366)
-* Grigera, Juan:                         Contributors.      (line 17104)
-* group database, reading:               Group Functions.   (line 13968)
-* group file:                            Group Functions.   (line 13968)
-* groups, information about:             Group Functions.   (line 13968)
-* gsub function <1>:                     String Functions.  (line  9503)
+                                                              (line   6)
+* GNU General Public License:            Glossary.            (line 293)
+* GNU Lesser General Public License:     Glossary.            (line 373)
+* GNU long options <1>:                  Options.             (line   6)
+* GNU long options:                      Command Line.        (line  13)
+* GNU long options, printing list of:    Options.             (line 139)
+* GNU Project <1>:                       Glossary.            (line 302)
+* GNU Project:                           Manual History.      (line  11)
+* GNU/Linux <1>:                         Glossary.            (line 582)
+* GNU/Linux <2>:                         Atari Compiling.     (line  16)
+* GNU/Linux <3>:                         I18N Example.        (line  55)
+* GNU/Linux:                             Manual History.      (line  28)
+* GPL (General Public License) <1>:      Glossary.            (line 293)
+* GPL (General Public License):          Manual History.      (line  11)
+* GPL (General Public License), printing: Options.            (line  87)
+* grcat program:                         Group Functions.     (line  15)
+* Grigera, Juan <1>:                     Bugs.                (line  59)
+* Grigera, Juan:                         Contributors.        (line  54)
+* group database, reading:               Group Functions.     (line   6)
+* group file:                            Group Functions.     (line   6)
+* groups, information about:             Group Functions.     (line   6)
+* gsub function <1>:                     String Functions.    (line 345)
 * gsub function:                         Using Constant Regexps.
-                                                            (line  5582)
-* gsub function, arguments of:           String Functions.  (line  9483)
-* gsub function, escape processing:      Gory Details.      (line  9642)
-* Hankerson, Darrel <1>:                 Bugs.              (line 18365)
-* Hankerson, Darrel <2>:                 Contributors.      (line 17106)
-* Hankerson, Darrel:                     Acknowledgments.   (line   995)
-* Hartholz, Elaine:                      Acknowledgments.   (line   977)
-* Hartholz, Marshall:                    Acknowledgments.   (line   977)
-* Hasegawa, Isamu <1>:                   Contributors.      (line 17132)
-* Hasegawa, Isamu:                       Acknowledgments.   (line   995)
-* hexadecimal numbers:                   Nondecimal-numbers.
-                                                            (line  5457)
-* hexadecimal values, enabling interpretation of: Options.  (line 12167)
-* histsort.awk program:                  History Sorting.   (line 15953)
-* Hughes, Phil:                          Acknowledgments.   (line   982)
-* HUP signal:                            Profiling.         (line 11943)
-* hyphen (-), - operator:                Precedence.        (line  6698)
-* hyphen (-), -- (decrement/increment) operators: Precedence.
-                                                            (line  6692)
-* hyphen (-), -- operator:               Increment Ops.     (line  6202)
-* hyphen (-), -= operator <1>:           Precedence.        (line  6742)
-* hyphen (-), -= operator:               Assignment Ops.    (line  6111)
-* hyphen (-), filenames beginning with:  Options.           (line 12073)
-* hyphen (-), in character lists:        Character Lists.   (line  2364)
-* id utility:                            Id Program.        (line 14755)
-* id.awk program:                        Id Program.        (line 14779)
-* if statement <1>:                      If Statement.      (line  7260)
-* if statement:                          Regexp Usage.      (line  1989)
-* if statement, actions, changing:       Ranges.            (line  6932)
-* igawk.sh program:                      Igawk Program.     (line 16362)
-* IGNORECASE variable <1>:               User-modified.     (line  7875)
-* IGNORECASE variable:                   Case-sensitivity.  (line  2569)
-* IGNORECASE variable, array sorting and: Array Sorting.    (line  8953)
-* IGNORECASE variable, array subscripts and: Array Intro.   (line  8398)
+                                                              (line  44)
+* gsub function, arguments of:           String Functions.    (line 325)
+* gsub function, escape processing:      Gory Details.        (line   6)
+* Hankerson, Darrel <1>:                 Bugs.                (line  58)
+* Hankerson, Darrel <2>:                 Contributors.        (line  56)
+* Hankerson, Darrel:                     Acknowledgments.     (line  53)
+* Hartholz, Elaine:                      Acknowledgments.     (line  35)
+* Hartholz, Marshall:                    Acknowledgments.     (line  35)
+* Hasegawa, Isamu <1>:                   Contributors.        (line  83)
+* Hasegawa, Isamu:                       Acknowledgments.     (line  53)
+* hexadecimal numbers:                   Nondecimal-numbers.  (line   6)
+* hexadecimal values, enabling interpretation of: Options.    (line 168)
+* histsort.awk program:                  History Sorting.     (line  25)
+* Hughes, Phil:                          Acknowledgments.     (line  40)
+* HUP signal:                            Profiling.           (line 207)
+* hyphen (-), - operator:                Precedence.          (line  52)
+* hyphen (-), -- (decrement/increment) operators: Precedence. (line  46)
+* hyphen (-), -- operator:               Increment Ops.       (line  48)
+* hyphen (-), -= operator <1>:           Precedence.          (line  96)
+* hyphen (-), -= operator:               Assignment Ops.      (line 129)
+* hyphen (-), filenames beginning with:  Options.             (line  67)
+* hyphen (-), in character lists:        Character Lists.     (line  17)
+* id utility:                            Id Program.          (line   6)
+* id.awk program:                        Id Program.          (line  30)
+* if statement <1>:                      If Statement.        (line   6)
+* if statement:                          Regexp Usage.        (line  19)
+* if statement, actions, changing:       Ranges.              (line  25)
+* igawk.sh program:                      Igawk Program.       (line 118)
+* IGNORECASE variable <1>:               User-modified.       (line  68)
+* IGNORECASE variable:                   Case-sensitivity.    (line  26)
+* IGNORECASE variable, array sorting and: Array Sorting.      (line  86)
+* IGNORECASE variable, array subscripts and: Array Intro.     (line  87)
 * IGNORECASE variable, in example programs: Library Functions.
-                                                            (line 12506)
-* implementation issues, gawk:           Notes.             (line 18484)
-* implementation issues, gawk, debugging: Compatibility Mode.
-                                                            (line 18503)
-* implementation issues, gawk, limits <1>: Redirection.     (line  4973)
-* implementation issues, gawk, limits:   Getline Notes.     (line  4193)
-* in operator <1>:                       Id Program.        (line 14842)
-* in operator <2>:                       For Statement.     (line  7449)
-* in operator <3>:                       Precedence.        (line  6730)
-* in operator:                           Typing and Comparison.
-                                                            (line  6342)
-* in operator, arrays and <1>:           Scanning an Array. (line  8541)
+                                                              (line  43)
+* implementation issues, gawk:           Notes.               (line   6)
+* implementation issues, gawk, debugging: Compatibility Mode. (line   6)
+* implementation issues, gawk, limits <1>: Redirection.       (line 132)
+* implementation issues, gawk, limits:   Getline Notes.       (line  14)
+* in operator <1>:                       Id Program.          (line  93)
+* in operator <2>:                       For Statement.       (line  74)
+* in operator <3>:                       Precedence.          (line  84)
+* in operator:                           Comparison Operators.
+                                                              (line  11)
+* in operator, arrays and <1>:           Scanning an Array.   (line  17)
 * in operator, arrays and:               Reference to Elements.
-                                                            (line  8432)
-* increment operators:                   Increment Ops.     (line  6160)
-* index function:                        String Functions.  (line  9218)
-* indexing arrays:                       Array Intro.       (line  8356)
-* initialization, automatic:             More Complex.      (line  1731)
-* input files:                           Reading Files.     (line  2780)
+                                                              (line  25)
+* increment operators:                   Increment Ops.       (line   6)
+* index function:                        String Functions.    (line  60)
+* indexing arrays:                       Array Intro.         (line  45)
+* initialization, automatic:             More Complex.        (line  38)
+* input files:                           Reading Files.       (line   6)
 * input files, closing:                  Close Files And Pipes.
-                                                            (line  5199)
-* input files, counting elements in:     Wc Program.        (line 15264)
-* input files, examples:                 Sample Data Files. (line  1461)
-* input files, reading:                  Reading Files.     (line  2780)
-* input files, running awk without:      Read Terminal.     (line  1146)
-* input files, skipping:                 Nextfile Function. (line 12645)
-* input files, variable assignments and: Other Arguments.   (line 12318)
-* input pipeline:                        Getline/Pipe.      (line  4051)
-* input redirection:                     Getline/File.      (line  3979)
-* input, data, nondecimal:               Nondecimal Data.   (line 11480)
-* input, explicit:                       Getline.           (line  3843)
-* input, files, See input files:         Multiple Line.     (line  3705)
-* input, multiline records:              Multiple Line.     (line  3705)
-* input, splitting into records:         Records.           (line  2817)
-* input, standard <1>:                   Special FD.        (line  5019)
-* input, standard:                       Read Terminal.     (line  1146)
-* input/output, binary:                  User-modified.     (line  7817)
-* input/output, from BEGIN and END:      I/O And BEGIN/END. (line  7058)
-* input/output, two-way:                 Two-way I/O.       (line 11560)
-* insomnia, cure for:                    Alarm Program.     (line 15477)
-* installation, amiga:                   Amiga Installation.
-                                                            (line 17569)
-* installation, atari:                   Atari Installation.
-                                                            (line 18161)
-* installation, beos:                    BeOS Installation. (line 17602)
-* installation, tandem:                  Tandem Installation.
-                                                            (line 18278)
-* installation, vms:                     VMS Installation.  (line 17981)
-* installing gawk:                       Installation.      (line 17151)
-* int function:                          Numeric Functions. (line  9056)
-* INT signal (MS-DOS):                   Profiling.         (line 11946)
-* integers:                              Basic Data Typing. (line 19654)
-* integers, unsigned:                    Basic Data Typing. (line 19661)
-* interacting with other programs:       I/O Functions.     (line  9872)
-* internationalization <1>:              I18N and L10N.     (line 10906)
-* internationalization:                  I18N Functions.    (line 10436)
+                                                              (line   6)
+* input files, counting elements in:     Wc Program.          (line   6)
+* input files, examples:                 Sample Data Files.   (line   6)
+* input files, reading:                  Reading Files.       (line   6)
+* input files, running awk without:      Read Terminal.       (line   6)
+* input files, skipping:                 Nextfile Function.   (line   6)
+* input files, variable assignments and: Other Arguments.     (line  19)
+* input pipeline:                        Getline/Pipe.        (line   6)
+* input redirection:                     Getline/File.        (line   6)
+* input, data, nondecimal:               Nondecimal Data.     (line   6)
+* input, explicit:                       Getline.             (line   6)
+* input, files, See input files:         Multiple Line.       (line   6)
+* input, multiline records:              Multiple Line.       (line   6)
+* input, splitting into records:         Records.             (line   6)
+* input, standard <1>:                   Special FD.          (line   6)
+* input, standard:                       Read Terminal.       (line   6)
+* input/output, binary:                  User-modified.       (line  10)
+* input/output, from BEGIN and END:      I/O And BEGIN/END.   (line   6)
+* input/output, two-way:                 Two-way I/O.         (line  44)
+* insomnia, cure for:                    Alarm Program.       (line   6)
+* installation, amiga:                   Amiga Installation.  (line   6)
+* installation, atari:                   Atari Installation.  (line   9)
+* installation, beos:                    BeOS Installation.   (line   6)
+* installation, tandem:                  Tandem Installation. (line   6)
+* installation, vms:                     VMS Installation.    (line   6)
+* installing gawk:                       Installation.        (line   6)
+* int function:                          Numeric Functions.   (line  11)
+* INT signal (MS-DOS):                   Profiling.           (line 210)
+* integers:                              Basic Data Typing.   (line  21)
+* integers, unsigned:                    Basic Data Typing.   (line  28)
+* interacting with other programs:       I/O Functions.       (line  63)
+* internationalization <1>:              I18N and L10N.       (line   6)
+* internationalization:                  I18N Functions.      (line   6)
 * internationalization, localization <1>: Internationalization.
-                                                            (line 10883)
-* internationalization, localization:    User-modified.     (line  7945)
+                                                              (line  13)
+* internationalization, localization:    User-modified.       (line 138)
 * internationalization, localization, character classes: Character Lists.
-                                                            (line  2451)
+                                                              (line  92)
 * internationalization, localization, gawk and: Internationalization.
-                                                            (line 10883)
+                                                              (line  13)
 * internationalization, localization, locale categories: Explaining gettext.
-                                                            (line 10993)
+                                                              (line  78)
 * internationalization, localization, marked strings: Programmer i18n.
-                                                            (line 11059)
+                                                              (line  14)
 * internationalization, localization, portability and: I18N Portability.
-                                                            (line 11280)
-* internationalizing a program:          Explaining gettext.
-                                                            (line 10921)
-* interpreted programs <1>:              Glossary.          (line 20167)
-* interpreted programs:                  Basic High Level.  (line 19551)
-* interval expressions:                  Regexp Operators.  (line  2290)
-* inventory-shipped file:                Sample Data Files. (line  1487)
-* IOBUF internal structure:              Internals.         (line 18964)
-* iop_alloc internal function:           Internals.         (line 18964)
-* ISO:                                   Glossary.          (line 20178)
-* ISO 8859-1:                            Glossary.          (line 19963)
-* ISO Latin-1:                           Glossary.          (line 19963)
-* Jacobs, Andrew:                        Passwd Functions.  (line 13813)
-* Jaegermann, Michal <1>:                Contributors.      (line 17095)
-* Jaegermann, Michal:                    Acknowledgments.   (line   995)
-* Jedi knights:                          Undocumented.      (line 12443)
-* join user-defined function:            Join Function.     (line 13079)
-* Kahrs, Ju"rgen <1>:                    Contributors.      (line 17114)
-* Kahrs, Ju"rgen:                        Acknowledgments.   (line   995)
-* Kenobi, Obi-Wan:                       Undocumented.      (line 12443)
-* Kernighan, Brian <1>:                  Basic Data Typing. (line 19704)
-* Kernighan, Brian <2>:                  Other Versions.    (line 18390)
-* Kernighan, Brian <3>:                  Contributors.      (line 17062)
-* Kernighan, Brian <4>:                  BTL.               (line 16809)
-* Kernighan, Brian <5>:                  Concatenation.     (line  5908)
-* Kernighan, Brian <6>:                  Acknowledgments.   (line  1002)
-* Kernighan, Brian <7>:                  Conventions.       (line   846)
-* Kernighan, Brian:                      History.           (line   640)
-* kill command, dynamic profiling:       Profiling.         (line 11921)
-* Knights, jedi:                         Undocumented.      (line 12443)
-* Kwok, Conrad:                          Contributors.      (line 17087)
-* labels.awk program:                    Labels Program.    (line 15765)
-* languages, data-driven:                Basic High Level.  (line 19620)
-* LC_ALL locale category:                Explaining gettext.
-                                                            (line 11031)
-* LC_COLLATE locale category:            Explaining gettext.
-                                                            (line 11004)
-* LC_CTYPE locale category:              Explaining gettext.
-                                                            (line 11008)
-* LC_MESSAGES locale category:           Explaining gettext.
-                                                            (line 10998)
+                                                              (line   6)
+* internationalizing a program:          Explaining gettext.  (line   6)
+* interpreted programs <1>:              Glossary.            (line 342)
+* interpreted programs:                  Basic High Level.    (line  14)
+* interval expressions:                  Regexp Operators.    (line 115)
+* inventory-shipped file:                Sample Data Files.   (line  32)
+* IOBUF internal structure:              Internals.           (line 178)
+* iop_alloc internal function:           Internals.           (line 178)
+* ISO:                                   Glossary.            (line 353)
+* ISO 8859-1:                            Glossary.            (line 138)
+* ISO Latin-1:                           Glossary.            (line 138)
+* Jacobs, Andrew:                        Passwd Functions.    (line  76)
+* Jaegermann, Michal <1>:                Contributors.        (line  45)
+* Jaegermann, Michal:                    Acknowledgments.     (line  53)
+* Java implementation of awk:            Other Versions.      (line 105)
+* jawk:                                  Other Versions.      (line 105)
+* Jedi knights:                          Undocumented.        (line   6)
+* join user-defined function:            Join Function.       (line  18)
+* Kahrs, Ju"rgen <1>:                    Contributors.        (line  64)
+* Kahrs, Ju"rgen:                        Acknowledgments.     (line  53)
+* Kenobi, Obi-Wan:                       Undocumented.        (line   6)
+* Kernighan, Brian <1>:                  Basic Data Typing.   (line  71)
+* Kernighan, Brian <2>:                  Other Versions.      (line  13)
+* Kernighan, Brian <3>:                  Contributors.        (line  12)
+* Kernighan, Brian <4>:                  BTL.                 (line   6)
+* Kernighan, Brian <5>:                  Concatenation.       (line   6)
+* Kernighan, Brian <6>:                  Acknowledgments.     (line  60)
+* Kernighan, Brian <7>:                  Conventions.         (line  33)
+* Kernighan, Brian:                      History.             (line  17)
+* kill command, dynamic profiling:       Profiling.           (line 185)
+* Knights, jedi:                         Undocumented.        (line   6)
+* Kwok, Conrad:                          Contributors.        (line  37)
+* labels.awk program:                    Labels Program.      (line  48)
+* languages, data-driven:                Basic High Level.    (line  83)
+* LC_ALL locale category:                Explaining gettext.  (line 116)
+* LC_COLLATE locale category:            Explaining gettext.  (line  89)
+* LC_CTYPE locale category:              Explaining gettext.  (line  93)
+* LC_MESSAGES locale category:           Explaining gettext.  (line  83)
 * LC_MESSAGES locale category, bindtextdomain function (gawk): Programmer i18n.
-                                                            (line 11131)
-* LC_MONETARY locale category:           Explaining gettext.
-                                                            (line 11014)
-* LC_NUMERIC locale category:            Explaining gettext.
-                                                            (line 11018)
-* LC_RESPONSE locale category:           Explaining gettext.
-                                                            (line 11022)
-* LC_TIME locale category:               Explaining gettext.
-                                                            (line 11026)
-* left angle bracket (<), < operator <1>: Precedence.       (line  6711)
-* left angle bracket (<), < operator:    Typing and Comparison.
-                                                            (line  6342)
-* left angle bracket (<), < operator (I/O): Getline/File.   (line  3979)
-* left angle bracket (<), <= operator <1>: Precedence.      (line  6711)
-* left angle bracket (<), <= operator:   Typing and Comparison.
-                                                            (line  6342)
-* left shift, bitwise:                   Bitwise Functions. (line 10340)
-* leftmost longest match:                Multiple Line.     (line  3725)
-* length function:                       String Functions.  (line  9229)
-* Lesser General Public License (LGPL):  Glossary.          (line 20195)
-* LGPL (Lesser General Public License):  Glossary.          (line 20195)
-* libraries of awk functions:            Library Functions. (line 12469)
-* libraries of awk functions, assertions: Assert Function.  (line 12815)
+                                                              (line  86)
+* LC_MONETARY locale category:           Explaining gettext.  (line  99)
+* LC_NUMERIC locale category:            Explaining gettext.  (line 103)
+* LC_RESPONSE locale category:           Explaining gettext.  (line 107)
+* LC_TIME locale category:               Explaining gettext.  (line 111)
+* left angle bracket (<), < operator <1>: Precedence.         (line  65)
+* left angle bracket (<), < operator:    Comparison Operators.
+                                                              (line  11)
+* left angle bracket (<), < operator (I/O): Getline/File.     (line   6)
+* left angle bracket (<), <= operator <1>: Precedence.        (line  65)
+* left angle bracket (<), <= operator:   Comparison Operators.
+                                                              (line  11)
+* left shift, bitwise:                   Bitwise Functions.   (line  32)
+* leftmost longest match:                Multiple Line.       (line  26)
+* length function:                       String Functions.    (line  71)
+* Lesser General Public License (LGPL):  Glossary.            (line 373)
+* LGPL (Lesser General Public License):  Glossary.            (line 373)
+* libraries of awk functions:            Library Functions.   (line   6)
+* libraries of awk functions, assertions: Assert Function.    (line   6)
 * libraries of awk functions, associative arrays and: Library Names.
-                                                            (line 12592)
+                                                              (line  57)
 * libraries of awk functions, character values as numbers: Ordinal Functions.
-                                                            (line 12976)
+                                                              (line   6)
 * libraries of awk functions, command-line options: Getopt Function.
-                                                            (line 13460)
+                                                              (line   6)
 * libraries of awk functions, example program for using: Igawk Program.
-                                                            (line 16250)
+                                                              (line   6)
 * libraries of awk functions, group database, reading: Group Functions.
-                                                            (line 13968)
+                                                              (line   6)
 * libraries of awk functions, managing, data files: Data File Management.
-                                                            (line 13194)
+                                                              (line   6)
 * libraries of awk functions, managing, time: Gettimeofday Function.
-                                                            (line 13112)
+                                                              (line   6)
 * libraries of awk functions, merging arrays into strings: Join Function.
-                                                            (line 13067)
+                                                              (line   6)
 * libraries of awk functions, nextfile statement: Nextfile Function.
-                                                            (line 12645)
+                                                              (line   6)
 * libraries of awk functions, rounding numbers: Round Function.
-                                                            (line 12900)
+                                                              (line   6)
 * libraries of awk functions, user database, reading: Passwd Functions.
-                                                            (line 13743)
-* line breaks:                           Statements/Lines.  (line  1770)
-* line continuations:                    Boolean Ops.       (line  6519)
-* line continuations, gawk:              Conditional Exp.   (line  6581)
-* line continuations, in print statement: Print Examples.   (line  4383)
-* line continuations, with C shell:      More Complex.      (line  1723)
-* lines, blank, printing:                Print.             (line  4300)
-* lines, counting:                       Wc Program.        (line 15264)
-* lines, duplicate, removing:            History Sorting.   (line 15934)
-* lines, matching ranges of:             Ranges.            (line  6913)
-* lines, skipping between markers:       Ranges.            (line  6950)
-* lint checking:                         User-modified.     (line  7890)
-* lint checking, array elements:         Delete.            (line  8613)
+                                                              (line   6)
+* line breaks:                           Statements/Lines.    (line   6)
+* line continuations:                    Boolean Ops.         (line  62)
+* line continuations, gawk:              Conditional Exp.     (line  34)
+* line continuations, in print statement: Print Examples.     (line  76)
+* line continuations, with C shell:      More Complex.        (line  30)
+* lines, blank, printing:                Print.               (line  22)
+* lines, counting:                       Wc Program.          (line   6)
+* lines, duplicate, removing:            History Sorting.     (line   6)
+* lines, matching ranges of:             Ranges.              (line   6)
+* lines, skipping between markers:       Ranges.              (line  43)
+* lint checking:                         User-modified.       (line  83)
+* lint checking, array elements:         Delete.              (line  34)
 * lint checking, array subscripts:       Uninitialized Subscripts.
-                                                            (line  8743)
-* lint checking, empty programs:         Command Line.      (line 11998)
-* lint checking, issuing warnings:       Options.           (line 12150)
+                                                              (line  42)
+* lint checking, empty programs:         Command Line.        (line  16)
+* lint checking, issuing warnings:       Options.             (line 144)
 * lint checking, POSIXLY_CORRECT environment variable: Options.
-                                                            (line 12273)
-* lint checking, undefined functions:    Function Caveats.  (line 10757)
-* LINT variable:                         User-modified.     (line  7890)
-* Linux <1>:                             Glossary.          (line 20404)
-* Linux <2>:                             Atari Compiling.   (line 18198)
-* Linux <3>:                             I18N Example.      (line 11393)
-* Linux:                                 Manual History.    (line   886)
-* locale categories:                     Explaining gettext.
-                                                            (line 10993)
-* localization:                          I18N and L10N.     (line 10906)
+                                                              (line 282)
+* lint checking, undefined functions:    Function Caveats.    (line  96)
+* LINT variable:                         User-modified.       (line  83)
+* Linux <1>:                             Glossary.            (line 582)
+* Linux <2>:                             Atari Compiling.     (line  16)
+* Linux <3>:                             I18N Example.        (line  55)
+* Linux:                                 Manual History.      (line  28)
+* locale categories:                     Explaining gettext.  (line  78)
+* locale decimal point character:        Options.             (line 200)
+* locale, definition of:                 Locales.             (line   6)
+* localization:                          I18N and L10N.       (line   6)
 * localization, See internationalization, localization: I18N and L10N.
-                                                            (line 10906)
-* log files, timestamps in:              Time Functions.    (line  9987)
-* log function:                          Numeric Functions. (line  9072)
-* logical false/true:                    Truth Values.      (line  6246)
-* logical operators, See Boolean expressions: Boolean Ops.  (line  6463)
-* login information:                     Passwd Functions.  (line 13753)
-* long options:                          Command Line.      (line 11995)
-* loops:                                 While Statement.   (line  7299)
-* loops, continue statements and:        For Statement.     (line  7438)
-* loops, count for header:               Profiling.         (line 11862)
-* loops, exiting:                        Break Statement.   (line  7525)
-* loops, See Also while statement:       While Statement.   (line  7299)
-* Lost In Space:                         Dynamic Extensions.
-                                                            (line 18761)
-* ls utility:                            More Complex.      (line  1708)
-* lshift function (gawk):                Bitwise Functions. (line 10353)
-* lvalues/rvalues:                       Assignment Ops.    (line  6014)
-* mailing labels, printing:              Labels Program.    (line 15723)
-* mailing list, GNITS:                   Acknowledgments.   (line   991)
-* make_builtin internal function:        Internals.         (line 18893)
-* make_number internal function:         Internals.         (line 18868)
-* make_string internal function:         Internals.         (line 18863)
-* mark parity:                           Ordinal Functions. (line 13014)
+                                                              (line   6)
+* log files, timestamps in:              Time Functions.      (line   6)
+* log function:                          Numeric Functions.   (line  27)
+* logical false/true:                    Truth Values.        (line   6)
+* logical operators, See Boolean expressions: Boolean Ops.    (line   6)
+* login information:                     Passwd Functions.    (line  16)
+* long options:                          Command Line.        (line  13)
+* loops:                                 While Statement.     (line   6)
+* loops, continue statements and:        For Statement.       (line  63)
+* loops, count for header:               Profiling.           (line 129)
+* loops, exiting:                        Break Statement.     (line   6)
+* loops, See Also while statement:       While Statement.     (line   6)
+* Lost In Space:                         Dynamic Extensions.  (line   6)
+* ls utility:                            More Complex.        (line  15)
+* lshift function (gawk):                Bitwise Functions.   (line  45)
+* lvalues/rvalues:                       Assignment Ops.      (line  32)
+* mailing labels, printing:              Labels Program.      (line   6)
+* mailing list, GNITS:                   Acknowledgments.     (line  49)
+* make_builtin internal function:        Internals.           (line 107)
+* make_number internal function:         Internals.           (line  82)
+* make_string internal function:         Internals.           (line  77)
+* mark parity:                           Ordinal Functions.   (line  44)
 * marked string extraction (internationalization): String Extraction.
-                                                            (line 11177)
-* marked strings, extracting:            String Extraction. (line 11177)
-* Marx, Groucho:                         Increment Ops.     (line  6215)
-* match function:                        String Functions.  (line  9256)
-* match function, RSTART/RLENGTH variables: String Functions.
-                                                            (line  9273)
+                                                              (line   6)
+* marked strings, extracting:            String Extraction.   (line   6)
+* Marx, Groucho:                         Increment Ops.       (line  61)
+* match function:                        String Functions.    (line  98)
+* match function, RSTART/RLENGTH variables: String Functions. (line 115)
 * matching, expressions, See comparison expressions: Typing and Comparison.
-                                                            (line  6277)
-* matching, leftmost longest:            Multiple Line.     (line  3725)
-* matching, null strings:                Gory Details.      (line  9796)
-* mawk program:                          Other Versions.    (line 18410)
-* McPhee, Patrick:                       Contributors.      (line 17138)
-* memory, releasing:                     Internals.         (line 18888)
-* memory, setting limits:                Options.           (line 12051)
-* message object files:                  Explaining gettext.
-                                                            (line 10954)
+                                                              (line   9)
+* matching, leftmost longest:            Multiple Line.       (line  26)
+* matching, null strings:                Gory Details.        (line 160)
+* mawk program:                          Other Versions.      (line  33)
+* McPhee, Patrick:                       Contributors.        (line  89)
+* memory, releasing:                     Internals.           (line 102)
+* memory, setting limits:                Options.             (line  45)
+* message object files:                  Explaining gettext.  (line  39)
 * message object files, converting from portable object files: I18N Example.
-                                                            (line 11400)
+                                                              (line  62)
 * message object files, specifying directory of <1>: Programmer i18n.
-                                                            (line 11090)
+                                                              (line  45)
 * message object files, specifying directory of: Explaining gettext.
-                                                            (line 10966)
-* metacharacters, escape sequences for:  Escape Sequences.  (line  2164)
-* mktime function (gawk):                Time Functions.    (line 10011)
-* modifiers, in format specifiers:       Format Modifiers.  (line  4614)
-* monetary information, localization:    Explaining gettext.
-                                                            (line 11014)
-* msgfmt utility:                        I18N Example.      (line 11400)
-* names, arrays/variables <1>:           Library Names.     (line 12541)
-* names, arrays/variables:               Arrays.            (line  8287)
-* names, functions <1>:                  Library Names.     (line 12541)
-* names, functions:                      Definition Syntax. (line 10506)
-* namespace issues <1>:                  Library Names.     (line 12541)
-* namespace issues:                      Arrays.            (line  8287)
-* namespace issues, functions:           Definition Syntax. (line 10506)
-* nawk utility:                          Names.             (line   688)
-* negative zero:                         Floating Point Issues.
-                                                            (line 19798)
-* NetBSD:                                Glossary.          (line 20404)
-* networks, programming:                 TCP/IP Networking. (line 11658)
-* networks, support for:                 Special Network.   (line  5145)
-* newlines <1>:                          Options.           (line 12182)
-* newlines <2>:                          Boolean Ops.       (line  6524)
-* newlines:                              Statements/Lines.  (line  1770)
-* newlines, as field separators:         Field Separators.  (line  3320)
-* newlines, as record separators:        Records.           (line  2831)
-* newlines, in dynamic regexps:          Computed Regexps.  (line  2708)
-* newlines, in regexp constants:         Computed Regexps.  (line  2718)
-* newlines, printing:                    Print Examples.    (line  4320)
-* newlines, separating statements in actions <1>: Statements.
-                                                            (line  7228)
+                                                              (line  51)
+* metacharacters, escape sequences for:  Escape Sequences.    (line 132)
+* mktime function (gawk):                Time Functions.      (line  30)
+* modifiers, in format specifiers:       Format Modifiers.    (line   6)
+* monetary information, localization:    Explaining gettext.  (line  99)
+* msgfmt utility:                        I18N Example.        (line  62)
+* names, arrays/variables <1>:           Library Names.       (line   6)
+* names, arrays/variables:               Arrays.              (line  17)
+* names, functions <1>:                  Library Names.       (line   6)
+* names, functions:                      Definition Syntax.   (line  20)
+* namespace issues <1>:                  Library Names.       (line   6)
+* namespace issues:                      Arrays.              (line  17)
+* namespace issues, functions:           Definition Syntax.   (line  20)
+* nawk utility:                          Names.               (line  17)
+* negative zero:                         Unexpected Results.  (line  28)
+* NetBSD:                                Glossary.            (line 582)
+* networks, programming:                 TCP/IP Networking.   (line   6)
+* networks, support for:                 Special Network.     (line   6)
+* newlines <1>:                          Options.             (line 183)
+* newlines <2>:                          Boolean Ops.         (line  67)
+* newlines:                              Statements/Lines.    (line   6)
+* newlines, as field separators:         Field Separators.    (line  63)
+* newlines, as record separators:        Records.             (line  20)
+* newlines, in dynamic regexps:          Computed Regexps.    (line  59)
+* newlines, in regexp constants:         Computed Regexps.    (line  69)
+* newlines, printing:                    Print Examples.      (line  12)
+* newlines, separating statements in actions <1>: Statements. (line  10)
 * newlines, separating statements in actions: Action Overview.
-                                                            (line  7178)
-* next file statement:                   POSIX/GNU.         (line 17001)
-* next file statement, deprecated:       Obsolete.          (line 12426)
-* next file statement, in gawk:          Nextfile Statement.
-                                                            (line  7724)
-* next statement <1>:                    Next Statement.    (line  7635)
-* next statement:                        Boolean Ops.       (line  6541)
-* next statement, BEGIN/END patterns and: I/O And BEGIN/END.
-                                                            (line  7088)
-* next statement, user-defined functions and: Next Statement.
-                                                            (line  7668)
-* nextfile statement:                    Nextfile Statement.
-                                                            (line  7684)
+                                                              (line  19)
+* next file statement:                   POSIX/GNU.           (line 155)
+* next file statement, deprecated:       Obsolete.            (line  11)
+* next file statement, in gawk:          Nextfile Statement.  (line  46)
+* next statement <1>:                    Next Statement.      (line   6)
+* next statement:                        Boolean Ops.         (line  85)
+* next statement, BEGIN/END patterns and: I/O And BEGIN/END.  (line  36)
+* next statement, user-defined functions and: Next Statement. (line  39)
+* nextfile statement:                    Nextfile Statement.  (line   6)
 * nextfile statement, BEGIN/END patterns and: I/O And BEGIN/END.
-                                                            (line  7088)
-* nextfile statement, implementing:      Nextfile Function. (line 12645)
-* nextfile statement, in gawk:           Nextfile Statement.
-                                                            (line  7724)
-* nextfile statement, next file statement and: Obsolete.    (line 12426)
+                                                              (line  36)
+* nextfile statement, implementing:      Nextfile Function.   (line   6)
+* nextfile statement, in gawk:           Nextfile Statement.  (line  46)
+* nextfile statement, next file statement and: Obsolete.      (line  11)
 * nextfile statement, user-defined functions and: Nextfile Statement.
-                                                            (line  7717)
-* nextfile user-defined function:        Nextfile Function. (line 12677)
-* NF variable <1>:                       Auto-set.          (line  8064)
-* NF variable:                           Fields.            (line  3041)
-* NF variable, decrementing:             Changing Fields.   (line  3231)
-* noassign.awk program:                  Ignoring Assigns.  (line 13427)
-* NODE internal type:                    Internals.         (line 18809)
-* nodes, duplicating:                    Internals.         (line 18883)
-* not Boolean-logic operator:            Boolean Ops.       (line  6463)
-* NR variable <1>:                       Auto-set.          (line  8075)
-* NR variable:                           Records.           (line  2817)
-* NR variable, changing:                 Auto-set.          (line  8148)
-* null strings <1>:                      Basic Data Typing. (line 19680)
-* null strings <2>:                      Truth Values.      (line  6246)
+                                                              (line  39)
+* nextfile user-defined function:        Nextfile Function.   (line  38)
+* NF variable <1>:                       Auto-set.            (line 103)
+* NF variable:                           Fields.              (line  33)
+* NF variable, decrementing:             Changing Fields.     (line 107)
+* noassign.awk program:                  Ignoring Assigns.    (line  15)
+* NODE internal type:                    Internals.           (line  23)
+* nodes, duplicating:                    Internals.           (line  97)
+* not Boolean-logic operator:            Boolean Ops.         (line   6)
+* NR variable <1>:                       Auto-set.            (line 114)
+* NR variable:                           Records.             (line   6)
+* NR variable, changing:                 Auto-set.            (line 187)
+* null strings <1>:                      Basic Data Typing.   (line  47)
+* null strings <2>:                      Truth Values.        (line   6)
 * null strings <3>:                      Regexp Field Splitting.
-                                                            (line  3379)
-* null strings:                          Records.           (line  2912)
-* null strings, array elements and:      Delete.            (line  8606)
+                                                              (line  43)
+* null strings:                          Records.             (line 102)
+* null strings, array elements and:      Delete.              (line  27)
 * null strings, as array subscripts:     Uninitialized Subscripts.
-                                                            (line  8743)
-* null strings, converting numbers to strings: Conversion.  (line  5734)
-* null strings, matching:                Gory Details.      (line  9796)
-* null strings, quoting and:             Quoting.           (line  1401)
+                                                              (line  42)
+* null strings, converting numbers to strings: Conversion.    (line  21)
+* null strings, matching:                Gory Details.        (line 160)
+* null strings, quoting and:             Quoting.             (line  58)
 * number sign (#), #! (executable scripts): Executable Scripts.
-                                                            (line  1233)
+                                                              (line   6)
 * number sign (#), #! (executable scripts), portability issues with: Executable Scripts.
-                                                            (line  1233)
-* number sign (#), commenting:           Comments.          (line  1296)
-* numbers:                               Internals.         (line 18868)
+                                                              (line   6)
+* number sign (#), commenting:           Comments.            (line   6)
+* numbers:                               Internals.           (line  82)
 * numbers, as array subscripts:          Numeric Array Subscripts.
-                                                            (line  8656)
-* numbers, as values of characters:      Ordinal Functions. (line 12976)
+                                                              (line   6)
+* numbers, as values of characters:      Ordinal Functions.   (line   6)
 * numbers, Cliff random:                 Cliff Random Function.
-                                                            (line 12945)
-* numbers, converting:                   Conversion.        (line  5719)
-* numbers, converting, to strings <1>:   Bitwise Functions. (line 10407)
-* numbers, converting, to strings:       User-modified.     (line  7833)
-* numbers, floating-point:               Basic Data Typing. (line 19654)
-* numbers, floating-point, AWKNUM internal type: Internals. (line 18805)
-* numbers, hexadecimal:                  Nondecimal-numbers.
-                                                            (line  5457)
-* numbers, NODE internal type:           Internals.         (line 18809)
-* numbers, octal:                        Nondecimal-numbers.
-                                                            (line  5457)
-* numbers, random:                       Numeric Functions. (line  9115)
-* numbers, rounding:                     Round Function.    (line 12900)
-* numeric, constants:                    Scalar Constants.  (line  5425)
-* numeric, output format:                OFMT.              (line  4434)
-* numeric, strings:                      Typing and Comparison.
-                                                            (line  6281)
-* numeric, values:                       Internals.         (line 18813)
-* oawk utility:                          Names.             (line   688)
-* obsolete features:                     Obsolete.          (line 12421)
-* octal numbers:                         Nondecimal-numbers.
-                                                            (line  5457)
-* octal values, enabling interpretation of: Options.        (line 12167)
-* OFMT variable <1>:                     User-modified.     (line  7907)
-* OFMT variable <2>:                     Conversion.        (line  5767)
-* OFMT variable:                         OFMT.              (line  4443)
-* OFMT variable, POSIX awk and:          OFMT.              (line  4455)
-* OFS variable <1>:                      User-modified.     (line  7916)
-* OFS variable <2>:                      Output Separators. (line  4393)
-* OFS variable:                          Changing Fields.   (line  3188)
-* OpenBSD:                               Glossary.          (line 20404)
-* operating systems, BSD-based <1>:      Portal Files.      (line 11725)
-* operating systems, BSD-based:          Manual History.    (line   886)
-* operating systems, PC, gawk on:        PC Using.          (line 17853)
+                                                              (line   6)
+* numbers, converting:                   Conversion.          (line   6)
+* numbers, converting, to strings <1>:   Bitwise Functions.   (line  99)
+* numbers, converting, to strings:       User-modified.       (line  26)
+* numbers, floating-point:               Basic Data Typing.   (line  21)
+* numbers, floating-point, AWKNUM internal type: Internals.   (line  19)
+* numbers, hexadecimal:                  Nondecimal-numbers.  (line   6)
+* numbers, NODE internal type:           Internals.           (line  23)
+* numbers, octal:                        Nondecimal-numbers.  (line   6)
+* numbers, random:                       Numeric Functions.   (line  70)
+* numbers, rounding:                     Round Function.      (line   6)
+* numeric, constants:                    Scalar Constants.    (line   6)
+* numeric, output format:                OFMT.                (line   6)
+* numeric, strings:                      Variable Typing.     (line   6)
+* numeric, values:                       Internals.           (line  27)
+* oawk utility:                          Names.               (line  17)
+* obsolete features:                     Obsolete.            (line   6)
+* octal numbers:                         Nondecimal-numbers.  (line   6)
+* octal values, enabling interpretation of: Options.          (line 168)
+* OFMT variable <1>:                     User-modified.       (line 100)
+* OFMT variable <2>:                     Conversion.          (line  54)
+* OFMT variable:                         OFMT.                (line  15)
+* OFMT variable, POSIX awk and:          OFMT.                (line  27)
+* OFS variable <1>:                      User-modified.       (line 109)
+* OFS variable <2>:                      Output Separators.   (line   6)
+* OFS variable:                          Changing Fields.     (line  64)
+* OpenBSD:                               Glossary.            (line 582)
+* OpenSolaris:                           Other Versions.      (line  96)
+* operating systems, BSD-based <1>:      Portal Files.        (line   6)
+* operating systems, BSD-based:          Manual History.      (line  28)
+* operating systems, PC, gawk on:        PC Using.            (line   6)
 * operating systems, PC, gawk on, installing: PC Installation.
-                                                            (line 17634)
-* operating systems, porting gawk to:    New Ports.         (line 18680)
+                                                              (line   6)
+* operating systems, porting gawk to:    New Ports.           (line   6)
 * operating systems, See Also GNU/Linux, PC operating systems, Unix: Installation.
-                                                            (line 17151)
-* operations, bitwise:                   Bitwise Functions. (line 10314)
-* operators, arithmetic:                 Arithmetic Ops.    (line  5823)
-* operators, assignment:                 Assignment Ops.    (line  5989)
-* operators, assignment, evaluation order: Assignment Ops.  (line  6093)
-* operators, Boolean, See Boolean expressions: Boolean Ops. (line  6463)
-* operators, decrement/increment:        Increment Ops.     (line  6160)
+                                                              (line   6)
+* operations, bitwise:                   Bitwise Functions.   (line   6)
+* operators, arithmetic:                 Arithmetic Ops.      (line   6)
+* operators, assignment:                 Assignment Ops.      (line   6)
+* operators, assignment, evaluation order: Assignment Ops.    (line 111)
+* operators, Boolean, See Boolean expressions: Boolean Ops.   (line   6)
+* operators, decrement/increment:        Increment Ops.       (line   6)
 * operators, GNU-specific:               GNU Regexp Operators.
-                                                            (line  2461)
-* operators, input/output <1>:           Precedence.        (line  6711)
-* operators, input/output <2>:           Redirection.       (line  4864)
-* operators, input/output <3>:           Getline/Coprocess. (line  4137)
-* operators, input/output <4>:           Getline/Pipe.      (line  4051)
-* operators, input/output:               Getline/File.      (line  3979)
-* operators, logical, See Boolean expressions: Boolean Ops. (line  6463)
-* operators, precedence <1>:             Precedence.        (line  6657)
-* operators, precedence:                 Increment Ops.     (line  6215)
+                                                              (line   6)
+* operators, input/output <1>:           Precedence.          (line  65)
+* operators, input/output <2>:           Redirection.         (line  19)
+* operators, input/output <3>:           Getline/Coprocess.   (line   6)
+* operators, input/output <4>:           Getline/Pipe.        (line   6)
+* operators, input/output:               Getline/File.        (line   6)
+* operators, logical, See Boolean expressions: Boolean Ops.   (line   6)
+* operators, precedence <1>:             Precedence.          (line   6)
+* operators, precedence:                 Increment Ops.       (line  61)
 * operators, relational, See operators, comparison: Typing and Comparison.
-                                                            (line  6277)
-* operators, short-circuit:              Boolean Ops.       (line  6514)
-* operators, string:                     Concatenation.     (line  5911)
-* operators, string-matching:            Regexp Usage.      (line  1989)
+                                                              (line   9)
+* operators, short-circuit:              Boolean Ops.         (line  57)
+* operators, string:                     Concatenation.       (line   9)
+* operators, string-matching:            Regexp Usage.        (line  19)
 * operators, string-matching, for buffers: GNU Regexp Operators.
-                                                            (line  2495)
+                                                              (line  40)
 * operators, word-boundary (gawk):       GNU Regexp Operators.
-                                                            (line  2510)
-* options, command-line <1>:             Options.           (line 12012)
+                                                              (line  55)
+* options, command-line <1>:             Options.             (line   6)
 * options, command-line <2>:             Command Line Field Separator.
-                                                            (line  3427)
-* options, command-line:                 Long.              (line  1202)
-* options, command-line, end of:         Options.           (line 12068)
-* options, command-line, invoking awk:   Command Line.      (line 11988)
-* options, command-line, processing:     Getopt Function.   (line 13460)
-* options, deprecated:                   Obsolete.          (line 12421)
-* options, long <1>:                     Options.           (line 12012)
-* options, long:                         Command Line.      (line 11995)
-* options, printing list of:             Options.           (line 12145)
-* OR bitwise operation:                  Bitwise Functions. (line 10314)
-* or Boolean-logic operator:             Boolean Ops.       (line  6463)
-* or function (gawk):                    Bitwise Functions. (line 10347)
-* ord user-defined function:             Ordinal Functions. (line 12986)
-* order of evaluation, concatenation:    Concatenation.     (line  5943)
-* ORS variable <1>:                      User-modified.     (line  7921)
-* ORS variable:                          Output Separators. (line  4407)
-* output field separator, See OFS variable: Changing Fields.
-                                                            (line  3188)
+                                                              (line   6)
+* options, command-line:                 Long.                (line  12)
+* options, command-line, end of:         Options.             (line  62)
+* options, command-line, invoking awk:   Command Line.        (line   6)
+* options, command-line, processing:     Getopt Function.     (line   6)
+* options, deprecated:                   Obsolete.            (line   6)
+* options, long <1>:                     Options.             (line   6)
+* options, long:                         Command Line.        (line  13)
+* options, printing list of:             Options.             (line 139)
+* OR bitwise operation:                  Bitwise Functions.   (line   6)
+* or Boolean-logic operator:             Boolean Ops.         (line   6)
+* or function (gawk):                    Bitwise Functions.   (line  39)
+* ord user-defined function:             Ordinal Functions.   (line  16)
+* order of evaluation, concatenation:    Concatenation.       (line  42)
+* ORS variable <1>:                      User-modified.       (line 114)
+* ORS variable:                          Output Separators.   (line  20)
+* output field separator, See OFS variable: Changing Fields.  (line  64)
 * output record separator, See ORS variable: Output Separators.
-                                                            (line  4407)
-* output redirection:                    Redirection.       (line  4851)
-* output, buffering:                     I/O Functions.     (line  9838)
-* output, duplicating into files:        Tee Program.       (line 14964)
+                                                              (line  20)
+* output redirection:                    Redirection.         (line   6)
+* output, buffering:                     I/O Functions.       (line  29)
+* output, duplicating into files:        Tee Program.         (line   6)
 * output, files, closing:                Close Files And Pipes.
-                                                            (line  5199)
-* output, format specifier, OFMT:        OFMT.              (line  4443)
-* output, formatted:                     Printf.            (line  4465)
-* output, pipes:                         Redirection.       (line  4899)
-* output, printing, See printing:        Printing.          (line  4249)
-* output, records:                       Output Separators. (line  4407)
-* output, standard:                      Special FD.        (line  5019)
-* P1003.2 POSIX standard:                Glossary.          (line 20248)
-* param_cnt internal variable:           Internals.         (line 18832)
-* parameters, number of:                 Internals.         (line 18832)
-* parentheses ():                        Regexp Operators.  (line  2253)
-* parentheses (), pgawk program:         Profiling.         (line 11877)
-* password file:                         Passwd Functions.  (line 13753)
+                                                              (line   6)
+* output, format specifier, OFMT:        OFMT.                (line  15)
+* output, formatted:                     Printf.              (line   6)
+* output, pipes:                         Redirection.         (line  54)
+* output, printing, See printing:        Printing.            (line   6)
+* output, records:                       Output Separators.   (line  20)
+* output, standard:                      Special FD.          (line   6)
+* P1003.2 POSIX standard:                Glossary.            (line 426)
+* param_cnt internal variable:           Internals.           (line  46)
+* parameters, number of:                 Internals.           (line  46)
+* parentheses ():                        Regexp Operators.    (line  78)
+* parentheses (), pgawk program:         Profiling.           (line 144)
+* password file:                         Passwd Functions.    (line  16)
 * patterns:                              Patterns and Actions.
-                                                            (line  6755)
-* patterns, comparison expressions as:   Expression Patterns.
-                                                            (line  6841)
-* patterns, counts:                      Profiling.         (line 11849)
-* patterns, default:                     Very Simple.       (line  1559)
-* patterns, empty:                       Empty.             (line  7101)
-* patterns, expressions as:              Regexp Patterns.   (line  6819)
-* patterns, ranges in:                   Ranges.            (line  6913)
-* patterns, regexp constants as:         Expression Patterns.
-                                                            (line  6863)
-* patterns, types of:                    Pattern Overview.  (line  6788)
-* pawk profiling Bell Labs awk:          Other Versions.    (line 18465)
-* PC operating systems, gawk on:         PC Using.          (line 17853)
-* PC operating systems, gawk on, installing: PC Installation.
-                                                            (line 17634)
-* percent sign (%), % operator:          Precedence.        (line  6701)
-* percent sign (%), %= operator <1>:     Precedence.        (line  6742)
-* percent sign (%), %= operator:         Assignment Ops.    (line  6111)
-* period (.):                            Regexp Operators.  (line  2218)
-* PERL:                                  Future Extensions. (line 19424)
-* Peters, Arno:                          Contributors.      (line 17123)
-* Peterson, Hal:                         Contributors.      (line 17090)
-* pgawk program:                         Profiling.         (line 11740)
-* pgawk program, awkprof.out file:       Profiling.         (line 11744)
-* pgawk program, dynamic profiling:      Profiling.         (line 11913)
+                                                              (line   6)
+* patterns, comparison expressions as:   Expression Patterns. (line  14)
+* patterns, counts:                      Profiling.           (line 116)
+* patterns, default:                     Very Simple.         (line  34)
+* patterns, empty:                       Empty.               (line   6)
+* patterns, expressions as:              Regexp Patterns.     (line   6)
+* patterns, ranges in:                   Ranges.              (line   6)
+* patterns, regexp constants as:         Expression Patterns. (line  36)
+* patterns, types of:                    Pattern Overview.    (line  14)
+* pawk profiling Bell Labs awk:          Other Versions.      (line  88)
+* PC operating systems, gawk on:         PC Using.            (line   6)
+* PC operating systems, gawk on, installing: PC Installation. (line   6)
+* percent sign (%), % operator:          Precedence.          (line  55)
+* percent sign (%), %= operator <1>:     Precedence.          (line  96)
+* percent sign (%), %= operator:         Assignment Ops.      (line 129)
+* period (.):                            Regexp Operators.    (line  43)
+* PERL:                                  Future Extensions.   (line   6)
+* Peters, Arno:                          Contributors.        (line  74)
+* Peterson, Hal:                         Contributors.        (line  40)
+* pgawk program:                         Profiling.           (line   6)
+* pgawk program, awkprof.out file:       Profiling.           (line  10)
+* pgawk program, dynamic profiling:      Profiling.           (line 177)
 * pipes, closing:                        Close Files And Pipes.
-                                                            (line  5199)
-* pipes, input:                          Getline/Pipe.      (line  4051)
-* pipes, output:                         Redirection.       (line  4899)
-* plus sign (+):                         Regexp Operators.  (line  2276)
-* plus sign (+), + operator:             Precedence.        (line  6698)
-* plus sign (+), ++ operator <1>:        Precedence.        (line  6692)
-* plus sign (+), ++ operator:            Increment Ops.     (line  6194)
-* plus sign (+), += operator <1>:        Precedence.        (line  6742)
-* plus sign (+), += operator:            Assignment Ops.    (line  6064)
+                                                              (line   6)
+* pipes, input:                          Getline/Pipe.        (line   6)
+* pipes, output:                         Redirection.         (line  54)
+* plus sign (+):                         Regexp Operators.    (line 101)
+* plus sign (+), + operator:             Precedence.          (line  52)
+* plus sign (+), ++ operator <1>:        Precedence.          (line  46)
+* plus sign (+), ++ operator:            Increment Ops.       (line  40)
+* plus sign (+), += operator <1>:        Precedence.          (line  96)
+* plus sign (+), += operator:            Assignment Ops.      (line  82)
 * plus sign (+), decrement/increment operators: Increment Ops.
-                                                            (line  6165)
-* portability:                           Escape Sequences.  (line  2126)
-* portability, #! (executable scripts):  Executable Scripts.
-                                                            (line  1261)
-* portability, ** operator and:          Arithmetic Ops.    (line  5898)
-* portability, **= operator and:         Assignment Ops.    (line  6131)
-* portability, ARGV variable:            Executable Scripts.
-                                                            (line  1270)
-* portability, backslash continuation and: Statements/Lines.
-                                                            (line  1793)
+                                                              (line  11)
+* portability:                           Escape Sequences.    (line  94)
+* portability, #! (executable scripts):  Executable Scripts.  (line  34)
+* portability, ** operator and:          Arithmetic Ops.      (line  81)
+* portability, **= operator and:         Assignment Ops.      (line 142)
+* portability, ARGV variable:            Executable Scripts.  (line  43)
+* portability, backslash continuation and: Statements/Lines.  (line  30)
 * portability, backslash in escape sequences: Escape Sequences.
-                                                            (line  2145)
+                                                              (line 113)
 * portability, close function and:       Close Files And Pipes.
-                                                            (line  5274)
-* portability, data files as single record: Records.        (line  2979)
-* portability, deleting array elements:  Delete.            (line  8630)
-* portability, example programs:         Library Functions. (line 12494)
-* portability, fflush function and:      I/O Functions.     (line  9838)
-* portability, functions, defining:      Definition Syntax. (line 10574)
-* portability, gawk:                     New Ports.         (line 18680)
-* portability, gettext library and:      Explaining gettext.
-                                                            (line 10925)
-* portability, internationalization and: I18N Portability.  (line 11280)
-* portability, length function:          String Functions.  (line  9238)
-* portability, new awk vs. old awk:      Conversion.        (line  5767)
+                                                              (line  81)
+* portability, data files as single record: Records.          (line 170)
+* portability, deleting array elements:  Delete.              (line  51)
+* portability, example programs:         Library Functions.   (line  31)
+* portability, fflush function and:      I/O Functions.       (line  29)
+* portability, functions, defining:      Definition Syntax.   (line  88)
+* portability, gawk:                     New Ports.           (line   6)
+* portability, gettext library and:      Explaining gettext.  (line  10)
+* portability, internationalization and: I18N Portability.    (line   6)
+* portability, length function:          String Functions.    (line  80)
+* portability, new awk vs. old awk:      Conversion.          (line  54)
 * portability, next statement in user-defined functions: Function Caveats.
-                                                            (line 10760)
-* portability, NF variable, decrementing: Changing Fields.  (line  3239)
-* portability, operators:                Increment Ops.     (line  6215)
-* portability, operators, not in POSIX awk: Precedence.     (line  6746)
-* portability, POSIXLY_CORRECT environment variable: Options.
-                                                            (line 12291)
-* portability, substr function:          String Functions.  (line  9601)
-* portable object files <1>:             Translator i18n.   (line 11156)
-* portable object files:                 Explaining gettext.
-                                                            (line 10951)
+                                                              (line  99)
+* portability, NF variable, decrementing: Changing Fields.    (line 115)
+* portability, operators:                Increment Ops.       (line  61)
+* portability, operators, not in POSIX awk: Precedence.       (line 100)
+* portability, POSIXLY_CORRECT environment variable: Options. (line 300)
+* portability, substr function:          String Functions.    (line 443)
+* portable object files <1>:             Translator i18n.     (line   6)
+* portable object files:                 Explaining gettext.  (line  36)
 * portable object files, converting to message object files: I18N Example.
-                                                            (line 11400)
-* portable object files, generating:     Options.           (line 12136)
-* portal files:                          Portal Files.      (line 11725)
-* porting gawk:                          New Ports.         (line 18680)
+                                                              (line  62)
+* portable object files, generating:     Options.             (line 130)
+* portal files:                          Portal Files.        (line   6)
+* porting gawk:                          New Ports.           (line   6)
 * positional specifiers, printf statement <1>: Printf Ordering.
-                                                            (line 11203)
-* positional specifiers, printf statement: Format Modifiers.
-                                                            (line  4621)
+                                                              (line   6)
+* positional specifiers, printf statement: Format Modifiers.  (line  13)
 * positional specifiers, printf statement, mixing with regular formats: Printf Ordering.
-                                                            (line 11254)
-* positive zero:                         Floating Point Issues.
-                                                            (line 19798)
-* POSIX awk <1>:                         Assignment Ops.    (line  6122)
-* POSIX awk:                             This Manual.       (line   718)
-* POSIX awk, **= operator and:           Assignment Ops.    (line  6131)
-* POSIX awk, < operator and:             Getline/File.      (line  3999)
-* POSIX awk, arithmetic operators and:   Arithmetic Ops.    (line  5853)
+                                                              (line  57)
+* positive zero:                         Unexpected Results.  (line  28)
+* POSIX awk <1>:                         Assignment Ops.      (line 136)
+* POSIX awk:                             This Manual.         (line  13)
+* POSIX awk, **= operator and:           Assignment Ops.      (line 142)
+* POSIX awk, < operator and:             Getline/File.        (line  26)
+* POSIX awk, arithmetic operators and:   Arithmetic Ops.      (line  36)
 * POSIX awk, backslashes in string constants: Escape Sequences.
-                                                            (line  2145)
-* POSIX awk, BEGIN/END patterns:         I/O And BEGIN/END. (line  7068)
-* POSIX awk, break statement and:        Break Statement.   (line  7566)
-* POSIX awk, changes in awk versions:    POSIX.             (line 16765)
-* POSIX awk, character lists and:        Character Lists.   (line  2371)
+                                                              (line 113)
+* POSIX awk, BEGIN/END patterns:         I/O And BEGIN/END.   (line  16)
+* POSIX awk, break statement and:        Break Statement.     (line  47)
+* POSIX awk, changes in awk versions:    POSIX.               (line   6)
+* POSIX awk, character lists and:        Character Lists.     (line  24)
 * POSIX awk, character lists and, character classes: Character Lists.
-                                                            (line  2377)
-* POSIX awk, continue statement and:     Continue Statement.
-                                                            (line  7619)
-* POSIX awk, CONVFMT variable and:       User-modified.     (line  7833)
-* POSIX awk, date utility and:           Time Functions.    (line 10245)
+                                                              (line  30)
+* POSIX awk, continue statement and:     Continue Statement.  (line  43)
+* POSIX awk, CONVFMT variable and:       User-modified.       (line  26)
+* POSIX awk, date utility and:           Time Functions.      (line 259)
 * POSIX awk, field separators and <1>:   Field Splitting Summary.
-                                                            (line  3549)
-* POSIX awk, field separators and:       Fields.            (line  3014)
-* POSIX awk, FS variable and:            User-modified.     (line  7859)
-* POSIX awk, function keyword in:        Definition Syntax. (line 10559)
-* POSIX awk, functions and, gsub/sub:    Gory Details.      (line  9689)
-* POSIX awk, functions and, length:      String Functions.  (line  9238)
-* POSIX awk, GNU long options and:       Options.           (line 12021)
-* POSIX awk, interval expressions in:    Regexp Operators.  (line  2309)
-* POSIX awk, next/nextfile statements and: Next Statement.  (line  7668)
-* POSIX awk, numeric strings and:        Typing and Comparison.
-                                                            (line  6281)
-* POSIX awk, OFMT variable and <1>:      Conversion.        (line  5767)
-* POSIX awk, OFMT variable and:          OFMT.              (line  4455)
-* POSIX awk, period (.), using:          Regexp Operators.  (line  2225)
-* POSIX awk, printf format strings and:  Format Modifiers.  (line  4767)
-* POSIX awk, regular expressions and:    Regexp Operators.  (line  2329)
-* POSIX awk, timestamps and:             Time Functions.    (line  9987)
-* POSIX awk, | I/O operator and:         Getline/Pipe.      (line  4097)
-* POSIX mode:                            Options.           (line 12175)
-* POSIX, awk and:                        Preface.           (line   569)
-* POSIX, gawk extensions not included in: POSIX/GNU.        (line 16852)
-* POSIX, programs, implementing in awk:  Clones.            (line 14243)
-* POSIXLY_CORRECT environment variable:  Options.           (line 12273)
-* precedence <1>:                        Precedence.        (line  6657)
-* precedence:                            Increment Ops.     (line  6215)
-* precedence, regexp operators:          Regexp Operators.  (line  2324)
-* print statement:                       Printing.          (line  4259)
-* print statement, BEGIN/END patterns and: I/O And BEGIN/END.
-                                                            (line  7068)
-* print statement, commas, omitting:     Print Examples.    (line  4338)
-* print statement, I/O operators in:     Precedence.        (line  6718)
-* print statement, line continuations and: Print Examples.  (line  4383)
-* print statement, OFMT variable and:    User-modified.     (line  7916)
+                                                              (line  41)
+* POSIX awk, field separators and:       Fields.              (line   6)
+* POSIX awk, FS variable and:            User-modified.       (line  52)
+* POSIX awk, function keyword in:        Definition Syntax.   (line  73)
+* POSIX awk, functions and, gsub/sub:    Gory Details.        (line  53)
+* POSIX awk, functions and, length:      String Functions.    (line  80)
+* POSIX awk, GNU long options and:       Options.             (line  15)
+* POSIX awk, interval expressions in:    Regexp Operators.    (line 134)
+* POSIX awk, next/nextfile statements and: Next Statement.    (line  39)
+* POSIX awk, numeric strings and:        Variable Typing.     (line   6)
+* POSIX awk, OFMT variable and <1>:      Conversion.          (line  54)
+* POSIX awk, OFMT variable and:          OFMT.                (line  27)
+* POSIX awk, period (.), using:          Regexp Operators.    (line  50)
+* POSIX awk, printf format strings and:  Format Modifiers.    (line 159)
+* POSIX awk, regular expressions and:    Regexp Operators.    (line 154)
+* POSIX awk, timestamps and:             Time Functions.      (line   6)
+* POSIX awk, | I/O operator and:         Getline/Pipe.        (line  52)
+* POSIX mode:                            Options.             (line 176)
+* POSIX, awk and:                        Preface.             (line  22)
+* POSIX, gawk extensions not included in: POSIX/GNU.          (line   6)
+* POSIX, programs, implementing in awk:  Clones.              (line   6)
+* POSIXLY_CORRECT environment variable:  Options.             (line 282)
+* precedence <1>:                        Precedence.          (line   6)
+* precedence:                            Increment Ops.       (line  61)
+* precedence, regexp operators:          Regexp Operators.    (line 149)
+* print statement:                       Printing.            (line  16)
+* print statement, BEGIN/END patterns and: I/O And BEGIN/END. (line  16)
+* print statement, commas, omitting:     Print Examples.      (line  31)
+* print statement, I/O operators in:     Precedence.          (line  72)
+* print statement, line continuations and: Print Examples.    (line  76)
+* print statement, OFMT variable and:    User-modified.       (line 109)
 * print statement, See Also redirection, of output: Redirection.
-                                                            (line  4859)
-* print statement, sprintf function and: Round Function.    (line 12900)
-* printf statement <1>:                  Printf.            (line  4465)
-* printf statement:                      Printing.          (line  4259)
-* printf statement, columns, aligning:   Print Examples.    (line  4377)
+                                                              (line  14)
+* print statement, sprintf function and: Round Function.      (line   6)
+* printf statement <1>:                  Printf.              (line   6)
+* printf statement:                      Printing.            (line  16)
+* printf statement, columns, aligning:   Print Examples.      (line  70)
 * printf statement, format-control characters: Control Letters.
-                                                            (line  4527)
-* printf statement, I/O operators in:    Precedence.        (line  6718)
-* printf statement, modifiers:           Format Modifiers.  (line  4614)
+                                                              (line   6)
+* printf statement, I/O operators in:    Precedence.          (line  72)
+* printf statement, modifiers:           Format Modifiers.    (line   6)
 * printf statement, positional specifiers <1>: Printf Ordering.
-                                                            (line 11203)
-* printf statement, positional specifiers: Format Modifiers.
-                                                            (line  4621)
+                                                              (line   6)
+* printf statement, positional specifiers: Format Modifiers.  (line  13)
 * printf statement, positional specifiers, mixing with regular formats: Printf Ordering.
-                                                            (line 11254)
+                                                              (line  57)
 * printf statement, See Also redirection, of output: Redirection.
-                                                            (line  4859)
-* printf statement, sprintf function and: Round Function.   (line 12900)
-* printf statement, syntax of:           Basic Printf.      (line  4486)
-* printing:                              Printing.          (line  4249)
-* printing, list of options:             Options.           (line 12145)
-* printing, mailing labels:              Labels Program.    (line 15723)
-* printing, unduplicated lines of text:  Uniq Program.      (line 15048)
-* printing, user information:            Id Program.        (line 14755)
-* private variables:                     Library Names.     (line 12546)
-* process information, files for:        Special Process.   (line  5086)
-* processes, two-way communications with: Two-way I/O.      (line 11539)
-* processing data:                       Basic High Level.  (line 19543)
-* PROCINFO array <1>:                    Group Functions.   (line 13968)
-* PROCINFO array <2>:                    Passwd Functions.  (line 13743)
-* PROCINFO array <3>:                    Auto-set.          (line  8080)
-* PROCINFO array:                        Special Caveats.   (line  5170)
-* PROCINFO variable:                     Internals.         (line 18951)
-* profiling awk programs:                Profiling.         (line 11740)
-* profiling awk programs, dynamically:   Profiling.         (line 11913)
-* profiling gawk, See pgawk program:     Profiling.         (line 11740)
-* program, definition of:                Getting Started.   (line  1047)
-* programmers, attractiveness of:        Two-way I/O.       (line 11522)
+                                                              (line  14)
+* printf statement, sprintf function and: Round Function.     (line   6)
+* printf statement, syntax of:           Basic Printf.        (line   6)
+* printing:                              Printing.            (line   6)
+* printing, list of options:             Options.             (line 139)
+* printing, mailing labels:              Labels Program.      (line   6)
+* printing, unduplicated lines of text:  Uniq Program.        (line   6)
+* printing, user information:            Id Program.          (line   6)
+* private variables:                     Library Names.       (line  11)
+* process information, files for:        Special Process.     (line   6)
+* processes, two-way communications with: Two-way I/O.        (line  23)
+* processing data:                       Basic High Level.    (line   6)
+* PROCINFO array <1>:                    Group Functions.     (line   6)
+* PROCINFO array <2>:                    Passwd Functions.    (line   6)
+* PROCINFO array <3>:                    Auto-set.            (line 119)
+* PROCINFO array:                        Special Caveats.     (line  12)
+* PROCINFO variable:                     Internals.           (line 165)
+* profiling awk programs:                Profiling.           (line   6)
+* profiling awk programs, dynamically:   Profiling.           (line 177)
+* profiling gawk, See pgawk program:     Profiling.           (line   6)
+* program, definition of:                Getting Started.     (line  21)
+* programmers, attractiveness of:        Two-way I/O.         (line   6)
 * programming conventions, --non-decimal-data option: Nondecimal Data.
-                                                            (line 11510)
-* programming conventions, ARGC/ARGV variables: Auto-set.   (line  7992)
-* programming conventions, exit statement: Exit Statement.  (line  7767)
+                                                              (line  36)
+* programming conventions, ARGC/ARGV variables: Auto-set.     (line  31)
+* programming conventions, exit statement: Exit Statement.    (line  36)
 * programming conventions, function parameters: Return Statement.
-                                                            (line 10803)
+                                                              (line  39)
 * programming conventions, functions, calling: Calling Built-in.
-                                                            (line  9011)
+                                                              (line  10)
 * programming conventions, functions, writing: Definition Syntax.
-                                                            (line 10536)
-* programming conventions, gawk internals: Internal File Ops.
-                                                            (line 19220)
+                                                              (line  50)
+* programming conventions, gawk internals: Internal File Ops. (line  33)
 * programming conventions, nextfile statement: Nextfile Function.
-                                                            (line 12659)
+                                                              (line  20)
 * programming conventions, private variable names: Library Names.
-                                                            (line 12558)
-* programming language, recipe for:      History.           (line   630)
+                                                              (line  23)
+* programming language, recipe for:      History.             (line   6)
 * programming languages, data-driven vs. procedural: Getting Started.
-                                                            (line  1038)
-* programming, basic steps:              Basic High Level.  (line 19556)
-* programming, concepts:                 Basic Concepts.    (line 19524)
-* pwcat program:                         Passwd Functions.  (line 13760)
+                                                              (line  12)
+* programming, basic steps:              Basic High Level.    (line  19)
+* programming, concepts:                 Basic Concepts.      (line   6)
+* pwcat program:                         Passwd Functions.    (line  23)
 * question mark (?) <1>:                 GNU Regexp Operators.
-                                                            (line  2506)
-* question mark (?):                     Regexp Operators.  (line  2285)
-* question mark (?), ?: operator:        Precedence.        (line  6739)
-* QUIT signal (MS-DOS):                  Profiling.         (line 11946)
-* quoting <1>:                           Comments.          (line  1317)
-* quoting <2>:                           Long.              (line  1216)
-* quoting:                               Read Terminal.     (line  1165)
-* quoting, rules for:                    Quoting.           (line  1349)
-* quoting, tricks for:                   Quoting.           (line  1410)
-* Rakitzis, Byron:                       History Sorting.   (line 15953)
-* rand function:                         Numeric Functions. (line  9085)
+                                                              (line  51)
+* question mark (?):                     Regexp Operators.    (line 110)
+* question mark (?), ?: operator:        Precedence.          (line  93)
+* QUIT signal (MS-DOS):                  Profiling.           (line 210)
+* quoting <1>:                           Comments.            (line  27)
+* quoting <2>:                           Long.                (line  26)
+* quoting:                               Read Terminal.       (line  25)
+* quoting, rules for:                    Quoting.             (line   6)
+* quoting, tricks for:                   Quoting.             (line  67)
+* Rakitzis, Byron:                       History Sorting.     (line  25)
+* rand function:                         Numeric Functions.   (line  40)
 * random numbers, Cliff:                 Cliff Random Function.
-                                                            (line 12945)
-* random numbers, rand/srand functions:  Numeric Functions. (line  9085)
-* random numbers, seed of:               Numeric Functions. (line  9115)
-* range expressions:                     Character Lists.   (line  2353)
-* range patterns:                        Ranges.            (line  6913)
-* Rankin, Pat <1>:                       Bugs.              (line 18371)
-* Rankin, Pat <2>:                       Contributors.      (line 17085)
-* Rankin, Pat <3>:                       Assignment Ops.    (line  6082)
-* Rankin, Pat:                           Acknowledgments.   (line   995)
-* raw sockets:                           TCP/IP Networking. (line 11682)
-* readable data files, checking:         File Checking.     (line 13334)
-* readable.awk program:                  File Checking.     (line 13339)
-* recipe for a programming language:     History.           (line   630)
-* record separators <1>:                 User-modified.     (line  7926)
-* record separators:                     Records.           (line  2825)
-* record separators, changing:           Records.           (line  2891)
-* record separators, regular expressions as: Records.       (line  2921)
-* record separators, with multiline records: Multiple Line. (line  3709)
-* records <1>:                           Basic High Level.  (line 19608)
-* records:                               Reading Files.     (line  2788)
-* records, multiline:                    Multiple Line.     (line  3705)
-* records, printing:                     Print.             (line  4300)
-* records, splitting input into:         Records.           (line  2817)
-* records, terminating:                  Records.           (line  2921)
-* records, treating files as:            Records.           (line  3000)
-* recursive functions:                   Definition Syntax. (line 10554)
-* redirection of input:                  Getline/File.      (line  3979)
-* redirection of output:                 Redirection.       (line  4851)
-* reference counting, sorting arrays:    Array Sorting.     (line  8946)
-* regexp constants <1>:                  Typing and Comparison.
-                                                            (line  6442)
-* regexp constants <2>:                  Regexp Constants.  (line  5532)
-* regexp constants:                      Regexp Usage.      (line  2028)
-* regexp constants, /=.../, /= operator and: Assignment Ops.
-                                                            (line  6137)
-* regexp constants, as patterns:         Expression Patterns.
-                                                            (line  6863)
+                                                              (line   6)
+* random numbers, rand/srand functions:  Numeric Functions.   (line  40)
+* random numbers, seed of:               Numeric Functions.   (line  70)
+* range expressions:                     Character Lists.     (line   6)
+* range patterns:                        Ranges.              (line   6)
+* Rankin, Pat <1>:                       Bugs.                (line  64)
+* Rankin, Pat <2>:                       Contributors.        (line  35)
+* Rankin, Pat <3>:                       Assignment Ops.      (line 100)
+* Rankin, Pat:                           Acknowledgments.     (line  53)
+* raw sockets:                           TCP/IP Networking.   (line  30)
+* readable data files, checking:         File Checking.       (line   6)
+* readable.awk program:                  File Checking.       (line  11)
+* recipe for a programming language:     History.             (line   6)
+* record separators <1>:                 User-modified.       (line 119)
+* record separators:                     Records.             (line  14)
+* record separators, changing:           Records.             (line  81)
+* record separators, regular expressions as: Records.         (line 112)
+* record separators, with multiline records: Multiple Line.   (line  10)
+* records <1>:                           Basic High Level.    (line  71)
+* records:                               Reading Files.       (line  14)
+* records, multiline:                    Multiple Line.       (line   6)
+* records, printing:                     Print.               (line  22)
+* records, splitting input into:         Records.             (line   6)
+* records, terminating:                  Records.             (line 112)
+* records, treating files as:            Records.             (line 191)
+* recursive functions:                   Definition Syntax.   (line  68)
+* redirection of input:                  Getline/File.        (line   6)
+* redirection of output:                 Redirection.         (line   6)
+* reference counting, sorting arrays:    Array Sorting.       (line  79)
+* regexp constants <1>:                  Comparison Operators.
+                                                              (line 102)
+* regexp constants <2>:                  Regexp Constants.    (line   6)
+* regexp constants:                      Regexp Usage.        (line  58)
+* regexp constants, /=.../, /= operator and: Assignment Ops.  (line 148)
+* regexp constants, as patterns:         Expression Patterns. (line  36)
 * regexp constants, in gawk:             Using Constant Regexps.
-                                                            (line  5566)
-* regexp constants, slashes vs. quotes:  Computed Regexps.  (line  2677)
-* regexp constants, vs. string constants: Computed Regexps. (line  2687)
-* regexp, See regular expressions:       Regexp.            (line  1945)
-* register_deferred_variable internal function: Internals.  (line 18951)
-* register_open_hook internal function:  Internals.         (line 18964)
-* regular expressions:                   Regexp.            (line  1945)
-* regular expressions as field separators: Field Separators.
-                                                            (line  3306)
-* regular expressions, anchors in:       Regexp Operators.  (line  2197)
+                                                              (line  28)
+* regexp constants, slashes vs. quotes:  Computed Regexps.    (line  28)
+* regexp constants, vs. string constants: Computed Regexps.   (line  38)
+* regexp, See regular expressions:       Regexp.              (line   6)
+* register_deferred_variable internal function: Internals.    (line 165)
+* register_open_hook internal function:  Internals.           (line 178)
+* regular expressions:                   Regexp.              (line   6)
+* regular expressions as field separators: Field Separators.  (line  49)
+* regular expressions, anchors in:       Regexp Operators.    (line  22)
 * regular expressions, as field separators: Regexp Field Splitting.
-                                                            (line  3343)
-* regular expressions, as patterns <1>:  Regexp Patterns.   (line  6819)
-* regular expressions, as patterns:      Regexp Usage.      (line  1976)
-* regular expressions, as record separators: Records.       (line  2921)
-* regular expressions, case sensitivity <1>: User-modified. (line  7875)
-* regular expressions, case sensitivity: Case-sensitivity.  (line  2549)
-* regular expressions, computed:         Computed Regexps.  (line  2656)
+                                                              (line   6)
+* regular expressions, as patterns <1>:  Regexp Patterns.     (line   6)
+* regular expressions, as patterns:      Regexp Usage.        (line   6)
+* regular expressions, as record separators: Records.         (line 112)
+* regular expressions, case sensitivity <1>: User-modified.   (line  68)
+* regular expressions, case sensitivity: Case-sensitivity.    (line   6)
+* regular expressions, computed:         Computed Regexps.    (line   6)
 * regular expressions, constants, See regexp constants: Regexp Usage.
-                                                            (line  2028)
-* regular expressions, dynamic:          Computed Regexps.  (line  2656)
+                                                              (line  58)
+* regular expressions, dynamic:          Computed Regexps.    (line   6)
 * regular expressions, dynamic, with embedded newlines: Computed Regexps.
-                                                            (line  2708)
+                                                              (line  59)
 * regular expressions, gawk, command-line options: GNU Regexp Operators.
-                                                            (line  2517)
-* regular expressions, interval expressions and: Options.   (line 12220)
+                                                              (line  62)
+* regular expressions, interval expressions and: Options.     (line 224)
 * regular expressions, leftmost longest match: Leftmost Longest.
-                                                            (line  2626)
-* regular expressions, operators <1>:    Regexp Operators.  (line  2181)
-* regular expressions, operators:        Regexp Usage.      (line  1989)
+                                                              (line   6)
+* regular expressions, operators <1>:    Regexp Operators.    (line   6)
+* regular expressions, operators:        Regexp Usage.        (line  19)
 * regular expressions, operators, for buffers: GNU Regexp Operators.
-                                                            (line  2495)
+                                                              (line  40)
 * regular expressions, operators, for words: GNU Regexp Operators.
-                                                            (line  2461)
+                                                              (line   6)
 * regular expressions, operators, gawk:  GNU Regexp Operators.
-                                                            (line  2461)
+                                                              (line   6)
 * regular expressions, operators, precedence of: Regexp Operators.
-                                                            (line  2324)
-* regular expressions, searching for:    Egrep Program.     (line 14525)
+                                                              (line 149)
+* regular expressions, searching for:    Egrep Program.       (line   6)
 * relational operators, See comparison operators: Typing and Comparison.
-                                                            (line  6277)
-* return statement, user-defined functions: Return Statement.
-                                                            (line 10770)
+                                                              (line   9)
+* return statement, user-defined functions: Return Statement. (line   6)
 * return values, close function:         Close Files And Pipes.
-                                                            (line  5323)
-* rev user-defined function:             Function Example.  (line 10629)
-* rewind user-defined function:          Rewind Function.   (line 13302)
-* right angle bracket (>), > operator <1>: Precedence.      (line  6711)
-* right angle bracket (>), > operator:   Typing and Comparison.
-                                                            (line  6342)
-* right angle bracket (>), > operator (I/O): Redirection.   (line  4864)
-* right angle bracket (>), >= operator <1>: Precedence.     (line  6711)
-* right angle bracket (>), >= operator:  Typing and Comparison.
-                                                            (line  6342)
-* right angle bracket (>), >> operator (I/O) <1>: Precedence.
-                                                            (line  6711)
-* right angle bracket (>), >> operator (I/O): Redirection.  (line  4892)
-* right shift, bitwise:                  Bitwise Functions. (line 10340)
-* Ritchie, Dennis:                       Basic Data Typing. (line 19704)
-* RLENGTH variable:                      Auto-set.          (line  8124)
-* RLENGTH variable, match function and:  String Functions.  (line  9273)
-* Robbins, Arnold <1>:                   Future Extensions. (line 19424)
-* Robbins, Arnold <2>:                   Bugs.              (line 18337)
-* Robbins, Arnold <3>:                   Contributors.      (line 17141)
-* Robbins, Arnold <4>:                   Alarm Program.     (line 15477)
-* Robbins, Arnold <5>:                   Passwd Functions.  (line 13813)
-* Robbins, Arnold <6>:                   Getline/Pipe.      (line  4081)
+                                                              (line 130)
+* rev user-defined function:             Function Example.    (line  52)
+* rewind user-defined function:          Rewind Function.     (line  16)
+* right angle bracket (>), > operator <1>: Precedence.        (line  65)
+* right angle bracket (>), > operator:   Comparison Operators.
+                                                              (line  11)
+* right angle bracket (>), > operator (I/O): Redirection.     (line  19)
+* right angle bracket (>), >= operator <1>: Precedence.       (line  65)
+* right angle bracket (>), >= operator:  Comparison Operators.
+                                                              (line  11)
+* right angle bracket (>), >> operator (I/O) <1>: Precedence. (line  65)
+* right angle bracket (>), >> operator (I/O): Redirection.    (line  47)
+* right shift, bitwise:                  Bitwise Functions.   (line  32)
+* Ritchie, Dennis:                       Basic Data Typing.   (line  71)
+* RLENGTH variable:                      Auto-set.            (line 163)
+* RLENGTH variable, match function and:  String Functions.    (line 115)
+* Robbins, Arnold <1>:                   Future Extensions.   (line   6)
+* Robbins, Arnold <2>:                   Bugs.                (line  29)
+* Robbins, Arnold <3>:                   Contributors.        (line  92)
+* Robbins, Arnold <4>:                   Alarm Program.       (line   6)
+* Robbins, Arnold <5>:                   Passwd Functions.    (line  76)
+* Robbins, Arnold <6>:                   Getline/Pipe.        (line  36)
 * Robbins, Arnold:                       Command Line Field Separator.
-                                                            (line  3501)
-* Robbins, Bill:                         Getline/Pipe.      (line  4081)
-* Robbins, Harry:                        Acknowledgments.   (line  1012)
-* Robbins, Jean:                         Acknowledgments.   (line  1012)
-* Robbins, Miriam <1>:                   Passwd Functions.  (line 13813)
-* Robbins, Miriam <2>:                   Getline/Pipe.      (line  4081)
-* Robbins, Miriam:                       Acknowledgments.   (line  1012)
-* Robinson, Will:                        Dynamic Extensions.
-                                                            (line 18761)
-* robot, the:                            Dynamic Extensions.
-                                                            (line 18761)
-* Rommel, Kai Uwe <1>:                   Contributors.      (line 17092)
-* Rommel, Kai Uwe:                       Acknowledgments.   (line   995)
-* round user-defined function:           Round Function.    (line 12910)
-* rounding:                              Round Function.    (line 12900)
-* rounding numbers:                      Round Function.    (line 12900)
-* RS variable <1>:                       User-modified.     (line  7926)
-* RS variable:                           Records.           (line  2831)
-* RS variable, multiline records and:    Multiple Line.     (line  3716)
-* rshift function (gawk):                Bitwise Functions. (line 10354)
-* RSTART variable:                       Auto-set.          (line  8130)
-* RSTART variable, match function and:   String Functions.  (line  9273)
-* RT variable <1>:                       Auto-set.          (line  8137)
-* RT variable <2>:                       Multiple Line.     (line  3828)
-* RT variable:                           Records.           (line  2921)
-* Rubin, Paul <1>:                       Contributors.      (line 17066)
-* Rubin, Paul:                           History.           (line   653)
-* rule, definition of:                   Getting Started.   (line  1047)
-* rvalues/lvalues:                       Assignment Ops.    (line  6014)
-* scalar values:                         Basic Data Typing. (line 19646)
-* Schreiber, Bert:                       Acknowledgments.   (line   977)
-* Schreiber, Rita:                       Acknowledgments.   (line   977)
-* search paths <1>:                      VMS Running.       (line 18102)
-* search paths:                          PC Using.          (line 17858)
-* search paths, for source files <1>:    VMS Running.       (line 18102)
-* search paths, for source files <2>:    Igawk Program.     (line 16601)
-* search paths, for source files:        AWKPATH Variable.  (line 12361)
-* searching:                             String Functions.  (line  9218)
-* searching, files for regular expressions: Egrep Program.  (line 14525)
-* searching, for words:                  Dupword Program.   (line 15429)
-* sed utility <1>:                       Glossary.          (line 19837)
-* sed utility <2>:                       Simple Sed.        (line 16170)
+                                                              (line  80)
+* Robbins, Bill:                         Getline/Pipe.        (line  36)
+* Robbins, Harry:                        Acknowledgments.     (line  70)
+* Robbins, Jean:                         Acknowledgments.     (line  70)
+* Robbins, Miriam <1>:                   Passwd Functions.    (line  76)
+* Robbins, Miriam <2>:                   Getline/Pipe.        (line  36)
+* Robbins, Miriam:                       Acknowledgments.     (line  70)
+* Robinson, Will:                        Dynamic Extensions.  (line   6)
+* robot, the:                            Dynamic Extensions.  (line   6)
+* Rommel, Kai Uwe <1>:                   Contributors.        (line  42)
+* Rommel, Kai Uwe:                       Acknowledgments.     (line  53)
+* round user-defined function:           Round Function.      (line  16)
+* rounding:                              Round Function.      (line   6)
+* rounding numbers:                      Round Function.      (line   6)
+* RS variable <1>:                       User-modified.       (line 119)
+* RS variable:                           Records.             (line  20)
+* RS variable, multiline records and:    Multiple Line.       (line  17)
+* rshift function (gawk):                Bitwise Functions.   (line  46)
+* RSTART variable:                       Auto-set.            (line 169)
+* RSTART variable, match function and:   String Functions.    (line 115)
+* RT variable <1>:                       Auto-set.            (line 176)
+* RT variable <2>:                       Multiple Line.       (line 129)
+* RT variable:                           Records.             (line 112)
+* Rubin, Paul <1>:                       Contributors.        (line  16)
+* Rubin, Paul:                           History.             (line  30)
+* rule, definition of:                   Getting Started.     (line  21)
+* rvalues/lvalues:                       Assignment Ops.      (line  32)
+* scalar values:                         Basic Data Typing.   (line  13)
+* Schreiber, Bert:                       Acknowledgments.     (line  35)
+* Schreiber, Rita:                       Acknowledgments.     (line  35)
+* search paths <1>:                      VMS Running.         (line  28)
+* search paths:                          PC Using.            (line  11)
+* search paths, for source files <1>:    VMS Running.         (line  28)
+* search paths, for source files <2>:    Igawk Program.       (line 358)
+* search paths, for source files:        AWKPATH Variable.    (line   6)
+* searching:                             String Functions.    (line  60)
+* searching, files for regular expressions: Egrep Program.    (line   6)
+* searching, for words:                  Dupword Program.     (line   6)
+* sed utility <1>:                       Glossary.            (line  12)
+* sed utility <2>:                       Simple Sed.          (line   6)
 * sed utility:                           Field Splitting Summary.
-                                                            (line  3555)
-* semicolon (;):                         Statements/Lines.  (line  1853)
-* semicolon (;), AWKPATH variable and:   PC Using.          (line 17858)
+                                                              (line  47)
+* semicolon (;):                         Statements/Lines.    (line  90)
+* semicolon (;), AWKPATH variable and:   PC Using.            (line  11)
 * semicolon (;), separating statements in actions <1>: Statements.
-                                                            (line  7228)
+                                                              (line  10)
 * semicolon (;), separating statements in actions: Action Overview.
-                                                            (line  7178)
-* separators, field:                     User-modified.     (line  7850)
-* separators, field, FIELDWIDTHS variable and: User-modified.
-                                                            (line  7840)
-* separators, field, POSIX and:          Fields.            (line  3014)
-* separators, for records:               Records.           (line  2825)
-* separators, for records, regular expressions as: Records. (line  2921)
-* separators, for statements in actions: Action Overview.   (line  7178)
-* separators, record:                    User-modified.     (line  7926)
-* separators, subscript:                 User-modified.     (line  7939)
-* set_value internal function:           Internals.         (line 18932)
-* shells, piping commands into:          Redirection.       (line  4981)
+                                                              (line  19)
+* separators, field:                     User-modified.       (line  43)
+* separators, field, FIELDWIDTHS variable and: User-modified. (line  33)
+* separators, field, POSIX and:          Fields.              (line   6)
+* separators, for records:               Records.             (line  14)
+* separators, for records, regular expressions as: Records.   (line 112)
+* separators, for statements in actions: Action Overview.     (line  19)
+* separators, record:                    User-modified.       (line 119)
+* separators, subscript:                 User-modified.       (line 132)
+* set_value internal function:           Internals.           (line 146)
+* shells, piping commands into:          Redirection.         (line 140)
 * shells, quoting:                       Using Shell Variables.
-                                                            (line  7120)
-* shells, quoting, rules for:            Quoting.           (line  1357)
-* shells, scripts:                       One-shot.          (line  1133)
+                                                              (line  12)
+* shells, quoting, rules for:            Quoting.             (line  14)
+* shells, scripts:                       One-shot.            (line  22)
 * shells, variables:                     Using Shell Variables.
-                                                            (line  7114)
-* shift, bitwise:                        Bitwise Functions. (line 10340)
-* short-circuit operators:               Boolean Ops.       (line  6514)
-* side effects <1>:                      Increment Ops.     (line  6165)
-* side effects:                          Concatenation.     (line  5943)
+                                                              (line   6)
+* shift, bitwise:                        Bitwise Functions.   (line  32)
+* short-circuit operators:               Boolean Ops.         (line  57)
+* side effects <1>:                      Increment Ops.       (line  11)
+* side effects:                          Concatenation.       (line  42)
 * side effects, array indexing:          Reference to Elements.
-                                                            (line  8437)
-* side effects, asort function:          Array Sorting.     (line  8894)
-* side effects, assignment expressions:  Assignment Ops.    (line  6005)
-* side effects, Boolean operators:       Boolean Ops.       (line  6487)
-* side effects, conditional expressions: Conditional Exp.   (line  6569)
-* side effects, decrement/increment operators: Increment Ops.
-                                                            (line  6165)
-* side effects, FILENAME variable:       Getline Notes.     (line  4198)
-* side effects, function calls:          Function Calls.    (line  6635)
-* side effects, statements:              Action Overview.   (line  7191)
-* signals, HUP/SIGHUP:                   Profiling.         (line 11943)
-* signals, INT/SIGINT (MS-DOS):          Profiling.         (line 11946)
-* signals, QUIT/SIGQUIT (MS-DOS):        Profiling.         (line 11946)
-* signals, USR1/SIGUSR1:                 Profiling.         (line 11921)
-* sin function:                          Numeric Functions. (line  9076)
-* single quote (') <1>:                  Quoting.           (line  1370)
-* single quote (') <2>:                  Long.              (line  1223)
-* single quote ('):                      One-shot.          (line  1126)
-* single quote ('), vs. apostrophe:      Comments.          (line  1317)
-* single quote ('), with double quotes:  Quoting.           (line  1392)
+                                                              (line  30)
+* side effects, asort function:          Array Sorting.       (line  25)
+* side effects, assignment expressions:  Assignment Ops.      (line  23)
+* side effects, Boolean operators:       Boolean Ops.         (line  30)
+* side effects, conditional expressions: Conditional Exp.     (line  22)
+* side effects, decrement/increment operators: Increment Ops. (line  11)
+* side effects, FILENAME variable:       Getline Notes.       (line  19)
+* side effects, function calls:          Function Calls.      (line  49)
+* side effects, statements:              Action Overview.     (line  32)
+* signals, HUP/SIGHUP:                   Profiling.           (line 207)
+* signals, INT/SIGINT (MS-DOS):          Profiling.           (line 210)
+* signals, QUIT/SIGQUIT (MS-DOS):        Profiling.           (line 210)
+* signals, USR1/SIGUSR1:                 Profiling.           (line 185)
+* sin function:                          Numeric Functions.   (line  31)
+* single quote (') <1>:                  Quoting.             (line  27)
+* single quote (') <2>:                  Long.                (line  33)
+* single quote ('):                      One-shot.            (line  15)
+* single quote ('), vs. apostrophe:      Comments.            (line  27)
+* single quote ('), with double quotes:  Quoting.             (line  49)
 * single-character fields:               Single Character Fields.
-                                                            (line  3401)
-* single-precision floating-point:       Basic Data Typing. (line 19666)
-* Skywalker, Luke:                       Undocumented.      (line 12443)
-* sleep utility:                         Alarm Program.     (line 15572)
-* sockets:                               TCP/IP Networking. (line 11682)
-* sort function, arrays, sorting:        Array Sorting.     (line  8875)
-* sort utility:                          Word Sorting.      (line 15876)
-* sort utility, coprocesses and:         Two-way I/O.       (line 11600)
+                                                              (line   6)
+* single-precision floating-point:       Basic Data Typing.   (line  33)
+* Skywalker, Luke:                       Undocumented.        (line   6)
+* sleep utility:                         Alarm Program.       (line 102)
+* sockets:                               TCP/IP Networking.   (line  30)
+* Solaris, POSIX compliant awk:          Other Versions.      (line  96)
+* sort function, arrays, sorting:        Array Sorting.       (line   6)
+* sort utility:                          Word Sorting.        (line  54)
+* sort utility, coprocesses and:         Two-way I/O.         (line  84)
 * sorting characters in different languages: Explaining gettext.
-                                                            (line 11004)
-* source code, awka:                     Other Versions.    (line 18453)
-* source code, Bell Laboratories awk:    Other Versions.    (line 18390)
-* source code, gawk:                     Gawk Distribution. (line 17174)
-* source code, mawk:                     Other Versions.    (line 18410)
-* source code, mixing:                   Options.           (line 12227)
-* source files, search path for:         Igawk Program.     (line 16601)
-* sparse arrays:                         Array Intro.       (line  8377)
-* Spencer, Henry:                        Glossary.          (line 19837)
-* split function:                        String Functions.  (line  9344)
-* split function, array elements, deleting: Delete.         (line  8635)
-* split utility:                         Split Program.     (line 14862)
-* split.awk program:                     Split Program.     (line 14886)
-* sprintf function <1>:                  String Functions.  (line  9397)
-* sprintf function:                      OFMT.              (line  4443)
-* sprintf function, OFMT variable and:   User-modified.     (line  7916)
+                                                              (line  89)
+* source code, awka:                     Other Versions.      (line  76)
+* source code, Bell Laboratories awk:    Other Versions.      (line  13)
+* source code, gawk:                     Gawk Distribution.   (line   6)
+* source code, mawk:                     Other Versions.      (line  33)
+* source code, mixing:                   Options.             (line 231)
+* source files, search path for:         Igawk Program.       (line 358)
+* sparse arrays:                         Array Intro.         (line  66)
+* Spencer, Henry:                        Glossary.            (line  12)
+* split function:                        String Functions.    (line 186)
+* split function, array elements, deleting: Delete.           (line  56)
+* split utility:                         Split Program.       (line   6)
+* split.awk program:                     Split Program.       (line  30)
+* sprintf function <1>:                  String Functions.    (line 239)
+* sprintf function:                      OFMT.                (line  15)
+* sprintf function, OFMT variable and:   User-modified.       (line 109)
 * sprintf function, print/printf statements and: Round Function.
-                                                            (line 12900)
-* sqrt function:                         Numeric Functions. (line  9063)
-* square brackets ([]):                  Regexp Operators.  (line  2230)
-* srand function:                        Numeric Functions. (line  9125)
-* Stallman, Richard <1>:                 Glossary.          (line 20109)
-* Stallman, Richard <2>:                 Contributors.      (line 17074)
-* Stallman, Richard <3>:                 Acknowledgments.   (line   960)
-* Stallman, Richard:                     Manual History.    (line   865)
-* standard input <1>:                    Special FD.        (line  5019)
-* standard input:                        Read Terminal.     (line  1146)
-* standard output:                       Special FD.        (line  5019)
-* stat function, implementing in gawk:   Sample Library.    (line 19054)
-* statements, compound, control statements and: Statements. (line  7228)
-* statements, control, in actions:       Statements.        (line  7224)
-* statements, multiple:                  Statements/Lines.  (line  1853)
-* stlen internal variable:               Internals.         (line 18836)
-* stptr internal variable:               Internals.         (line 18836)
-* stream editors <1>:                    Simple Sed.        (line 16170)
+                                                              (line   6)
+* sqrt function:                         Numeric Functions.   (line  18)
+* square brackets ([]):                  Regexp Operators.    (line  55)
+* srand function:                        Numeric Functions.   (line  80)
+* Stallman, Richard <1>:                 Glossary.            (line 284)
+* Stallman, Richard <2>:                 Contributors.        (line  24)
+* Stallman, Richard <3>:                 Acknowledgments.     (line  18)
+* Stallman, Richard:                     Manual History.      (line   6)
+* standard input <1>:                    Special FD.          (line   6)
+* standard input:                        Read Terminal.       (line   6)
+* standard output:                       Special FD.          (line   6)
+* stat function, implementing in gawk:   Sample Library.      (line   6)
+* statements, compound, control statements and: Statements.   (line  10)
+* statements, control, in actions:       Statements.          (line   6)
+* statements, multiple:                  Statements/Lines.    (line  90)
+* stlen internal variable:               Internals.           (line  50)
+* stptr internal variable:               Internals.           (line  50)
+* stream editors <1>:                    Simple Sed.          (line   6)
 * stream editors:                        Field Splitting Summary.
-                                                            (line  3555)
-* strftime function (gawk):              Time Functions.    (line 10034)
-* string constants:                      Scalar Constants.  (line  5434)
-* string constants, vs. regexp constants: Computed Regexps. (line  2687)
+                                                              (line  47)
+* strftime function (gawk):              Time Functions.      (line  53)
+* string constants:                      Scalar Constants.    (line  15)
+* string constants, vs. regexp constants: Computed Regexps.   (line  38)
 * string extraction (internationalization): String Extraction.
-                                                            (line 11177)
-* string operators:                      Concatenation.     (line  5911)
-* string-matching operators:             Regexp Usage.      (line  1989)
-* strings:                               Internals.         (line 18863)
-* strings, converting:                   Conversion.        (line  5719)
-* strings, converting, numbers to <1>:   Bitwise Functions. (line 10407)
-* strings, converting, numbers to:       User-modified.     (line  7833)
-* strings, empty, See null strings:      Records.           (line  2912)
-* strings, extracting:                   String Extraction. (line 11177)
-* strings, for localization:             Programmer i18n.   (line 11059)
-* strings, length of:                    Scalar Constants.  (line  5439)
-* strings, merging arrays into:          Join Function.     (line 13067)
-* strings, NODE internal type:           Internals.         (line 18809)
+                                                              (line   6)
+* string operators:                      Concatenation.       (line   9)
+* string-matching operators:             Regexp Usage.        (line  19)
+* strings:                               Internals.           (line  77)
+* strings, converting:                   Conversion.          (line   6)
+* strings, converting, numbers to <1>:   Bitwise Functions.   (line  99)
+* strings, converting, numbers to:       User-modified.       (line  26)
+* strings, empty, See null strings:      Records.             (line 102)
+* strings, extracting:                   String Extraction.   (line   6)
+* strings, for localization:             Programmer i18n.     (line  14)
+* strings, length of:                    Scalar Constants.    (line  20)
+* strings, merging arrays into:          Join Function.       (line   6)
+* strings, NODE internal type:           Internals.           (line  23)
 * strings, null:                         Regexp Field Splitting.
-                                                            (line  3379)
-* strings, numeric:                      Typing and Comparison.
-                                                            (line  6281)
-* strings, splitting:                    String Functions.  (line  9358)
-* strtonum function (gawk):              String Functions.  (line  9405)
+                                                              (line  43)
+* strings, numeric:                      Variable Typing.     (line   6)
+* strings, splitting:                    String Functions.    (line 200)
+* strtonum function (gawk):              String Functions.    (line 247)
 * strtonum function (gawk), --non-decimal-data option and: Nondecimal Data.
-                                                            (line 11510)
-* sub function <1>:                      String Functions.  (line  9426)
+                                                              (line  36)
+* sub function <1>:                      String Functions.    (line 268)
 * sub function:                          Using Constant Regexps.
-                                                            (line  5582)
-* sub function, arguments of:            String Functions.  (line  9483)
-* sub function, escape processing:       Gory Details.      (line  9642)
-* subscript separators:                  User-modified.     (line  7939)
-* subscripts in arrays, multidimensional: Multi-dimensional.
-                                                            (line  8754)
+                                                              (line  44)
+* sub function, arguments of:            String Functions.    (line 325)
+* sub function, escape processing:       Gory Details.        (line   6)
+* subscript separators:                  User-modified.       (line 132)
+* subscripts in arrays, multidimensional: Multi-dimensional.  (line   6)
 * subscripts in arrays, multidimensional, scanning: Multi-scanning.
-                                                            (line  8840)
+                                                              (line  11)
 * subscripts in arrays, numbers as:      Numeric Array Subscripts.
-                                                            (line  8656)
+                                                              (line   6)
 * subscripts in arrays, uninitialized variables as: Uninitialized Subscripts.
-                                                            (line  8707)
-* SUBSEP variable:                       User-modified.     (line  7939)
+                                                              (line   6)
+* SUBSEP variable:                       User-modified.       (line 132)
 * SUBSEP variable, multidimensional arrays: Multi-dimensional.
-                                                            (line  8760)
-* substr function:                       String Functions.  (line  9570)
-* Sumner, Andrew:                        Other Versions.    (line 18453)
-* switch statement:                      Switch Statement.  (line  7464)
+                                                              (line  12)
+* substr function:                       String Functions.    (line 412)
+* Sumner, Andrew:                        Other Versions.      (line  76)
+* switch statement:                      Switch Statement.    (line   6)
 * syntactic ambiguity: /= operator vs. /=.../ regexp constant: Assignment Ops.
-                                                            (line  6137)
-* system function:                       I/O Functions.     (line  9872)
-* systime function (gawk):               Time Functions.    (line 10005)
-* tandem:                                Tandem Installation.
-                                                            (line 18278)
-* Tcl:                                   Library Names.     (line 12592)
-* TCP/IP:                                TCP/IP Networking. (line 11658)
-* TCP/IP, support for:                   Special Network.   (line  5145)
-* tee utility:                           Tee Program.       (line 14964)
-* tee.awk program:                       Tee Program.       (line 14984)
-* terminating records:                   Records.           (line  2921)
-* testbits.awk program:                  Bitwise Functions. (line 10368)
-* Texinfo <1>:                           Adding Code.       (line 18640)
+                                                              (line 148)
+* system function:                       I/O Functions.       (line  63)
+* systime function (gawk):               Time Functions.      (line  24)
+* tandem:                                Tandem Installation. (line   6)
+* Tcl:                                   Library Names.       (line  57)
+* TCP/IP:                                TCP/IP Networking.   (line   6)
+* TCP/IP, support for:                   Special Network.     (line   6)
+* tee utility:                           Tee Program.         (line   6)
+* tee.awk program:                       Tee Program.         (line  26)
+* terminating records:                   Records.             (line 112)
+* testbits.awk program:                  Bitwise Functions.   (line  60)
+* Texinfo <1>:                           Adding Code.         (line  99)
 * Texinfo <2>:                           Distribution contents.
-                                                            (line 17315)
-* Texinfo <3>:                           Extract Program.   (line 15985)
-* Texinfo <4>:                           Dupword Program.   (line 15440)
-* Texinfo <5>:                           Library Functions. (line 12485)
-* Texinfo <6>:                           Sample Data Files. (line  1521)
-* Texinfo:                               Conventions.       (line   819)
-* Texinfo, chapter beginnings in files:  Regexp Operators.  (line  2197)
+                                                              (line  68)
+* Texinfo <3>:                           Extract Program.     (line  12)
+* Texinfo <4>:                           Dupword Program.     (line  17)
+* Texinfo <5>:                           Library Functions.   (line  22)
+* Texinfo <6>:                           Sample Data Files.   (line  66)
+* Texinfo:                               Conventions.         (line   6)
+* Texinfo, chapter beginnings in files:  Regexp Operators.    (line  22)
 * Texinfo, extracting programs from source files: Extract Program.
-                                                            (line 15979)
-* text, printing:                        Print.             (line  4300)
-* text, printing, unduplicated lines of: Uniq Program.      (line 15048)
-* textdomain function (C library):       Explaining gettext.
-                                                            (line 10942)
-* TEXTDOMAIN variable <1>:               Programmer i18n.   (line 11054)
-* TEXTDOMAIN variable:                   User-modified.     (line  7945)
-* TEXTDOMAIN variable, BEGIN pattern and: Programmer i18n.  (line 11103)
-* TEXTDOMAIN variable, portability and:  I18N Portability.  (line 11294)
-* tilde (~), ~ operator <1>:             Expression Patterns.
-                                                            (line  6851)
-* tilde (~), ~ operator <2>:             Precedence.        (line  6727)
-* tilde (~), ~ operator <3>:             Typing and Comparison.
-                                                            (line  6342)
-* tilde (~), ~ operator <4>:             Regexp Constants.  (line  5532)
-* tilde (~), ~ operator <5>:             Computed Regexps.  (line  2656)
-* tilde (~), ~ operator <6>:             Case-sensitivity.  (line  2569)
-* tilde (~), ~ operator:                 Regexp Usage.      (line  1989)
-* time, alarm clock example program:     Alarm Program.     (line 15480)
-* time, localization and:                Explaining gettext.
-                                                            (line 11026)
+                                                              (line   6)
+* text, printing:                        Print.               (line  22)
+* text, printing, unduplicated lines of: Uniq Program.        (line   6)
+* textdomain function (C library):       Explaining gettext.  (line  27)
+* TEXTDOMAIN variable <1>:               Programmer i18n.     (line   9)
+* TEXTDOMAIN variable:                   User-modified.       (line 138)
+* TEXTDOMAIN variable, BEGIN pattern and: Programmer i18n.    (line  58)
+* TEXTDOMAIN variable, portability and:  I18N Portability.    (line  20)
+* tilde (~), ~ operator <1>:             Expression Patterns. (line  24)
+* tilde (~), ~ operator <2>:             Precedence.          (line  81)
+* tilde (~), ~ operator <3>:             Comparison Operators.
+                                                              (line  11)
+* tilde (~), ~ operator <4>:             Regexp Constants.    (line   6)
+* tilde (~), ~ operator <5>:             Computed Regexps.    (line   6)
+* tilde (~), ~ operator <6>:             Case-sensitivity.    (line  26)
+* tilde (~), ~ operator:                 Regexp Usage.        (line  19)
+* time, alarm clock example program:     Alarm Program.       (line   9)
+* time, localization and:                Explaining gettext.  (line 111)
 * time, managing:                        Gettimeofday Function.
-                                                            (line 13112)
-* time, retrieving:                      Time Functions.    (line  9998)
-* timestamps:                            Time Functions.    (line  9987)
-* timestamps, converting dates to:       Time Functions.    (line 10050)
+                                                              (line   6)
+* time, retrieving:                      Time Functions.      (line  17)
+* timestamps:                            Time Functions.      (line   6)
+* timestamps, converting dates to:       Time Functions.      (line  72)
 * timestamps, formatted:                 Gettimeofday Function.
-                                                            (line 13112)
-* tmp_number internal function:          Internals.         (line 18878)
-* tmp_string internal function:          Internals.         (line 18873)
-* tolower function:                      String Functions.  (line  9612)
-* toupper function:                      String Functions.  (line  9618)
-* tr utility:                            Translate Program. (line 15601)
-* translate.awk program:                 Translate Program. (line 15649)
-* troubleshooting, --non-decimal-data option: Options.      (line 12170)
-* troubleshooting, -F option:            Known Bugs.        (line 12454)
-* troubleshooting, == operator:          Typing and Comparison.
-                                                            (line  6377)
-* troubleshooting, awk uses FS not IFS:  Field Separators.  (line  3285)
+                                                              (line   6)
+* tmp_number internal function:          Internals.           (line  92)
+* tmp_string internal function:          Internals.           (line  87)
+* tolower function:                      String Functions.    (line 454)
+* toupper function:                      String Functions.    (line 460)
+* tr utility:                            Translate Program.   (line   6)
+* translate.awk program:                 Translate Program.   (line  55)
+* troubleshooting, --non-decimal-data option: Options.        (line 171)
+* troubleshooting, -F option:            Known Bugs.          (line   6)
+* troubleshooting, == operator:          Comparison Operators.
+                                                              (line  37)
+* troubleshooting, awk uses FS not IFS:  Field Separators.    (line  28)
 * troubleshooting, backslash before nonspecial character: Escape Sequences.
-                                                            (line  2145)
-* troubleshooting, division:             Arithmetic Ops.    (line  5861)
+                                                              (line 113)
+* troubleshooting, division:             Arithmetic Ops.      (line  44)
 * troubleshooting, fatal errors, field widths, specifying: Constant Size.
-                                                            (line  3618)
+                                                              (line  22)
 * troubleshooting, fatal errors, printf format strings: Format Modifiers.
-                                                            (line  4767)
-* troubleshooting, fflush function:      I/O Functions.     (line  9860)
-* troubleshooting, function call syntax: Function Calls.    (line  6615)
-* troubleshooting, gawk <1>:             Compatibility Mode.
-                                                            (line 18503)
-* troubleshooting, gawk:                 Known Bugs.        (line 12454)
-* troubleshooting, gawk, bug reports:    Bugs.              (line 18317)
+                                                              (line 159)
+* troubleshooting, fflush function:      I/O Functions.       (line  51)
+* troubleshooting, function call syntax: Function Calls.      (line  28)
+* troubleshooting, gawk <1>:             Compatibility Mode.  (line   6)
+* troubleshooting, gawk:                 Known Bugs.          (line   6)
+* troubleshooting, gawk, bug reports:    Bugs.                (line   9)
 * troubleshooting, gawk, fatal errors, function arguments: Calling Built-in.
-                                                            (line  9017)
-* troubleshooting, getline function:     File Checking.     (line 13352)
-* troubleshooting, gsub/sub functions:   String Functions.  (line  9493)
-* troubleshooting, match function:       String Functions.  (line  9339)
+                                                              (line  16)
+* troubleshooting, getline function:     File Checking.       (line  24)
+* troubleshooting, gsub/sub functions:   String Functions.    (line 335)
+* troubleshooting, match function:       String Functions.    (line 181)
 * troubleshooting, print statement, omitting commas: Print Examples.
-                                                            (line  4338)
-* troubleshooting, printing:             Redirection.       (line  4959)
-* troubleshooting, quotes with file names: Special FD.      (line  5076)
-* troubleshooting, readable data files:  File Checking.     (line 13334)
+                                                              (line  31)
+* troubleshooting, printing:             Redirection.         (line 115)
+* troubleshooting, quotes with file names: Special FD.        (line  63)
+* troubleshooting, readable data files:  File Checking.       (line   6)
 * troubleshooting, regexp constants vs. string constants: Computed Regexps.
-                                                            (line  2687)
-* troubleshooting, string concatenation: Concatenation.     (line  5929)
-* troubleshooting, substr function:      String Functions.  (line  9588)
-* troubleshooting, system function:      I/O Functions.     (line  9896)
+                                                              (line  38)
+* troubleshooting, string concatenation: Concatenation.       (line  27)
+* troubleshooting, substr function:      String Functions.    (line 430)
+* troubleshooting, system function:      I/O Functions.       (line  87)
 * troubleshooting, typographical errors, global variables: Options.
-                                                            (line 12107)
-* true, logical:                         Truth Values.      (line  6246)
-* Trueman, David <1>:                    Contributors.      (line 17081)
-* Trueman, David <2>:                    Acknowledgments.   (line   986)
-* Trueman, David:                        History.           (line   653)
-* trunc-mod operation:                   Arithmetic Ops.    (line  5883)
-* truth values:                          Truth Values.      (line  6246)
-* type conversion:                       Conversion.        (line  5734)
-* type internal variable:                Internals.         (line 18844)
-* undefined functions:                   Function Caveats.  (line 10740)
-* underscore (_), _ C macro:             Explaining gettext.
-                                                            (line 10983)
+                                                              (line 101)
+* true, logical:                         Truth Values.        (line   6)
+* Trueman, David <1>:                    Contributors.        (line  31)
+* Trueman, David <2>:                    Acknowledgments.     (line  44)
+* Trueman, David:                        History.             (line  30)
+* trunc-mod operation:                   Arithmetic Ops.      (line  66)
+* truth values:                          Truth Values.        (line   6)
+* type conversion:                       Conversion.          (line  21)
+* type internal variable:                Internals.           (line  58)
+* undefined functions:                   Function Caveats.    (line  79)
+* underscore (_), _ C macro:             Explaining gettext.  (line  68)
 * underscore (_), in names of private variables: Library Names.
-                                                            (line 12564)
-* underscore (_), translatable string:   Programmer i18n.   (line 11112)
-* undocumented features:                 Undocumented.      (line 12443)
+                                                              (line  29)
+* underscore (_), translatable string:   Programmer i18n.     (line  67)
+* undocumented features:                 Undocumented.        (line   6)
 * uninitialized variables, as array subscripts: Uninitialized Subscripts.
-                                                            (line  8707)
-* uniq utility:                          Uniq Program.      (line 15048)
-* uniq.awk program:                      Uniq Program.      (line 15107)
-* Unix:                                  Glossary.          (line 20404)
+                                                              (line   6)
+* uniq utility:                          Uniq Program.        (line   6)
+* uniq.awk program:                      Uniq Program.        (line  65)
+* Unix:                                  Glossary.            (line 582)
 * Unix awk, backslashes in escape sequences: Escape Sequences.
-                                                            (line  2157)
+                                                              (line 125)
 * Unix awk, close function and:          Close Files And Pipes.
-                                                            (line  5323)
+                                                              (line 130)
 * Unix awk, password files, field separators and: Command Line Field Separator.
-                                                            (line  3493)
-* Unix, awk scripts and:                 Executable Scripts.
-                                                            (line  1233)
-* unsigned integers:                     Basic Data Typing. (line 19661)
-* update_ERRNO internal function:        Internals.         (line 18938)
-* update_ERRNO_saved internal function:  Internals.         (line 18943)
-* user database, reading:                Passwd Functions.  (line 13743)
-* user-defined, functions:               User-defined.      (line 10472)
-* user-defined, functions, counts:       Profiling.         (line 11868)
-* user-defined, variables:               Variables.         (line  5621)
-* user-modifiable variables:             User-modified.     (line  7813)
-* users, information about, printing:    Id Program.        (line 14755)
-* users, information about, retrieving:  Passwd Functions.  (line 13753)
-* USR1 signal:                           Profiling.         (line 11921)
-* values, numeric:                       Basic Data Typing. (line 19646)
-* values, string:                        Basic Data Typing. (line 19646)
+                                                              (line  72)
+* Unix, awk scripts and:                 Executable Scripts.  (line   6)
+* unsigned integers:                     Basic Data Typing.   (line  28)
+* update_ERRNO internal function:        Internals.           (line 152)
+* update_ERRNO_saved internal function:  Internals.           (line 157)
+* user database, reading:                Passwd Functions.    (line   6)
+* user-defined, functions:               User-defined.        (line   6)
+* user-defined, functions, counts:       Profiling.           (line 135)
+* user-defined, variables:               Variables.           (line   6)
+* user-modifiable variables:             User-modified.       (line   6)
+* users, information about, printing:    Id Program.          (line   6)
+* users, information about, retrieving:  Passwd Functions.    (line  16)
+* USR1 signal:                           Profiling.           (line 185)
+* values, numeric:                       Basic Data Typing.   (line  13)
+* values, string:                        Basic Data Typing.   (line  13)
 * variable typing:                       Typing and Comparison.
-                                                            (line  6277)
-* variables <1>:                         Basic Data Typing. (line 19639)
-* variables:                             Other Features.    (line  1879)
-* variables, assigning on command line:  Assignment Options.
-                                                            (line  5671)
-* variables, built-in <1>:               Built-in Variables.
-                                                            (line  7787)
-* variables, built-in:                   Using Variables.   (line  5650)
-* variables, built-in, -v option, setting with: Options.    (line 12044)
-* variables, built-in, conveying information: Auto-set.     (line  7967)
-* variables, flag:                       Boolean Ops.       (line  6524)
+                                                              (line   9)
+* variables <1>:                         Basic Data Typing.   (line   6)
+* variables:                             Other Features.      (line   6)
+* variables, assigning on command line:  Assignment Options.  (line   6)
+* variables, built-in <1>:               Built-in Variables.  (line   6)
+* variables, built-in:                   Using Variables.     (line  17)
+* variables, built-in, -v option, setting with: Options.      (line  38)
+* variables, built-in, conveying information: Auto-set.       (line   6)
+* variables, flag:                       Boolean Ops.         (line  67)
 * variables, getline command into, using <1>: Getline/Variable/Coprocess.
-                                                            (line  4167)
+                                                              (line   6)
 * variables, getline command into, using <2>: Getline/Variable/Pipe.
-                                                            (line  4110)
+                                                              (line   6)
 * variables, getline command into, using <3>: Getline/Variable/File.
-                                                            (line  4012)
-* variables, getline command into, using: Getline/Variable. (line  3938)
-* variables, global, for library functions: Library Names.  (line 12546)
-* variables, global, printing list of:   Options.           (line 12101)
-* variables, initializing:               Using Variables.   (line  5650)
-* variables, names of:                   Arrays.            (line  8287)
-* variables, private:                    Library Names.     (line 12546)
-* variables, setting:                    Options.           (line 12036)
-* variables, shadowing:                  Definition Syntax. (line 10542)
-* variables, types of:                   Assignment Ops.    (line  6022)
+                                                              (line   6)
+* variables, getline command into, using: Getline/Variable.   (line   6)
+* variables, global, for library functions: Library Names.    (line  11)
+* variables, global, printing list of:   Options.             (line  95)
+* variables, initializing:               Using Variables.     (line  17)
+* variables, names of:                   Arrays.              (line  17)
+* variables, private:                    Library Names.       (line  11)
+* variables, setting:                    Options.             (line  30)
+* variables, shadowing:                  Definition Syntax.   (line  56)
+* variables, types of:                   Assignment Ops.      (line  40)
 * variables, types of, comparison expressions and: Typing and Comparison.
-                                                            (line  6277)
+                                                              (line   9)
 * variables, uninitialized, as array subscripts: Uninitialized Subscripts.
-                                                            (line  8707)
-* variables, user-defined:               Variables.         (line  5621)
-* vertical bar (|):                      Regexp Operators.  (line  2243)
-* vertical bar (|), | operator (I/O) <1>: Precedence.       (line  6711)
-* vertical bar (|), | operator (I/O):    Getline/Pipe.      (line  4051)
-* vertical bar (|), |& I/O operator (I/O): Two-way I/O.     (line 11560)
-* vertical bar (|), |& operator (I/O) <1>: Precedence.      (line  6711)
-* vertical bar (|), |& operator (I/O):   Getline/Coprocess. (line  4137)
+                                                              (line   6)
+* variables, user-defined:               Variables.           (line   6)
+* vertical bar (|):                      Regexp Operators.    (line  68)
+* vertical bar (|), | operator (I/O) <1>: Precedence.         (line  65)
+* vertical bar (|), | operator (I/O):    Getline/Pipe.        (line   6)
+* vertical bar (|), |& I/O operator (I/O): Two-way I/O.       (line  44)
+* vertical bar (|), |& operator (I/O) <1>: Precedence.        (line  65)
+* vertical bar (|), |& operator (I/O):   Getline/Coprocess.   (line   6)
 * vertical bar (|), |& operator (I/O), two-way communications: Portal Files.
-                                                            (line 11729)
-* vertical bar (|), || operator <1>:     Precedence.        (line  6736)
-* vertical bar (|), || operator:         Boolean Ops.       (line  6514)
-* vname internal variable:               Internals.         (line 18848)
-* w utility:                             Constant Size.     (line  3618)
-* Wall, Larry:                           Future Extensions. (line 19424)
-* warnings, issuing:                     Options.           (line 12150)
-* wc utility:                            Wc Program.        (line 15264)
-* wc.awk program:                        Wc Program.        (line 15303)
-* Weinberger, Peter <1>:                 Contributors.      (line 17062)
-* Weinberger, Peter:                     History.           (line   640)
-* while statement <1>:                   While Statement.   (line  7299)
-* while statement:                       Regexp Usage.      (line  1989)
-* whitespace, as field separators:       Field Separators.  (line  3320)
-* whitespace, functions, calling:        Calling Built-in.  (line  9011)
-* whitespace, newlines as:               Options.           (line 12182)
-* Williams, Kent:                        Contributors.      (line 17087)
-* Woods, John:                           Contributors.      (line 17078)
+                                                              (line  10)
+* vertical bar (|), || operator <1>:     Precedence.          (line  90)
+* vertical bar (|), || operator:         Boolean Ops.         (line  57)
+* vname internal variable:               Internals.           (line  62)
+* w utility:                             Constant Size.       (line  22)
+* Wall, Larry:                           Future Extensions.   (line   6)
+* warnings, issuing:                     Options.             (line 144)
+* wc utility:                            Wc Program.          (line   6)
+* wc.awk program:                        Wc Program.          (line  45)
+* Weinberger, Peter <1>:                 Contributors.        (line  12)
+* Weinberger, Peter:                     History.             (line  17)
+* while statement <1>:                   While Statement.     (line   6)
+* while statement:                       Regexp Usage.        (line  19)
+* whitespace, as field separators:       Field Separators.    (line  63)
+* whitespace, functions, calling:        Calling Built-in.    (line  10)
+* whitespace, newlines as:               Options.             (line 183)
+* Williams, Kent:                        Contributors.        (line  37)
+* Woods, John:                           Contributors.        (line  28)
 * word boundaries, matching:             GNU Regexp Operators.
-                                                            (line  2485)
+                                                              (line  30)
 * word, regexp definition of:            GNU Regexp Operators.
-                                                            (line  2461)
+                                                              (line   6)
 * word-boundary operator (gawk):         GNU Regexp Operators.
-                                                            (line  2510)
-* wordfreq.awk program:                  Word Sorting.      (line 15882)
-* words, counting:                       Wc Program.        (line 15264)
-* words, duplicate, searching for:       Dupword Program.   (line 15429)
-* words, usage counts, generating:       Word Sorting.      (line 15828)
-* xgettext utility:                      String Extraction. (line 11184)
-* XML:                                   Internals.         (line 18964)
-* XOR bitwise operation:                 Bitwise Functions. (line 10314)
-* xor function (gawk):                   Bitwise Functions. (line 10349)
-* Zaretskii, Eli:                        Acknowledgments.   (line   995)
-* zero, negative vs. positive:           Floating Point Issues.
-                                                            (line 19798)
-* zerofile.awk program:                  Empty Files.       (line 13377)
-* Zoulas, Christos:                      Contributors.      (line 17111)
-* {} (braces), actions and:              Action Overview.   (line  7178)
-* {} (braces), pgawk program:            Profiling.         (line 11873)
-* {} (braces), statements, grouping:     Statements.        (line  7228)
-* | (vertical bar):                      Regexp Operators.  (line  2243)
-* | (vertical bar), | operator (I/O) <1>: Precedence.       (line  6711)
-* | (vertical bar), | operator (I/O) <2>: Redirection.      (line  4899)
-* | (vertical bar), | operator (I/O):    Getline/Pipe.      (line  4051)
-* | (vertical bar), |& operator (I/O) <1>: Two-way I/O.     (line 11560)
-* | (vertical bar), |& operator (I/O) <2>: Precedence.      (line  6711)
-* | (vertical bar), |& operator (I/O) <3>: Redirection.     (line  4944)
-* | (vertical bar), |& operator (I/O):   Getline/Coprocess. (line  4137)
+                                                              (line  55)
+* wordfreq.awk program:                  Word Sorting.        (line  60)
+* words, counting:                       Wc Program.          (line   6)
+* words, duplicate, searching for:       Dupword Program.     (line   6)
+* words, usage counts, generating:       Word Sorting.        (line   6)
+* xgettext utility:                      String Extraction.   (line  13)
+* XML:                                   Internals.           (line 178)
+* XOR bitwise operation:                 Bitwise Functions.   (line   6)
+* xor function (gawk):                   Bitwise Functions.   (line  41)
+* Zaretskii, Eli:                        Acknowledgments.     (line  53)
+* zero, negative vs. positive:           Unexpected Results.  (line  28)
+* zerofile.awk program:                  Empty Files.         (line  21)
+* Zoulas, Christos:                      Contributors.        (line  61)
+* {} (braces), actions and:              Action Overview.     (line  19)
+* {} (braces), pgawk program:            Profiling.           (line 140)
+* {} (braces), statements, grouping:     Statements.          (line  10)
+* | (vertical bar):                      Regexp Operators.    (line  68)
+* | (vertical bar), | operator (I/O) <1>: Precedence.         (line  65)
+* | (vertical bar), | operator (I/O) <2>: Redirection.        (line  54)
+* | (vertical bar), | operator (I/O):    Getline/Pipe.        (line   6)
+* | (vertical bar), |& operator (I/O) <1>: Two-way I/O.       (line  44)
+* | (vertical bar), |& operator (I/O) <2>: Precedence.        (line  65)
+* | (vertical bar), |& operator (I/O) <3>: Redirection.       (line  99)
+* | (vertical bar), |& operator (I/O):   Getline/Coprocess.   (line   6)
 * | (vertical bar), |& operator (I/O), pipes, closing: Close Files And Pipes.
-                                                            (line  5310)
+                                                              (line 117)
 * | (vertical bar), |& operator (I/O), two-way communications: Portal Files.
-                                                            (line 11729)
-* | (vertical bar), || operator <1>:     Precedence.        (line  6736)
-* | (vertical bar), || operator:         Boolean Ops.       (line  6514)
-* ~ (tilde), ~ operator <1>:             Expression Patterns.
-                                                            (line  6851)
-* ~ (tilde), ~ operator <2>:             Precedence.        (line  6727)
-* ~ (tilde), ~ operator <3>:             Typing and Comparison.
-                                                            (line  6342)
-* ~ (tilde), ~ operator <4>:             Regexp Constants.  (line  5532)
-* ~ (tilde), ~ operator <5>:             Computed Regexps.  (line  2656)
-* ~ (tilde), ~ operator:                 Case-sensitivity.  (line  2569)
+                                                              (line  10)
+* | (vertical bar), || operator <1>:     Precedence.          (line  90)
+* | (vertical bar), || operator:         Boolean Ops.         (line  57)
+* ~ (tilde), ~ operator <1>:             Expression Patterns. (line  24)
+* ~ (tilde), ~ operator <2>:             Precedence.          (line  81)
+* ~ (tilde), ~ operator <3>:             Comparison Operators.
+                                                              (line  11)
+* ~ (tilde), ~ operator <4>:             Regexp Constants.    (line   6)
+* ~ (tilde), ~ operator <5>:             Computed Regexps.    (line   6)
+* ~ (tilde), ~ operator:                 Case-sensitivity.    (line  26)
 
 
 
 Tag Table:
-Node: Top1326
-Node: Foreword26895
-Node: Preface31216
-Ref: Preface-Footnote-134077
-Node: History34306
-Node: Names36509
-Ref: Names-Footnote-137969
-Node: This Manual38038
-Ref: This Manual-Footnote-142723
-Node: Conventions42820
-Node: Manual History44682
-Ref: Manual History-Footnote-148102
-Ref: Manual History-Footnote-248140
-Node: How To Contribute48211
-Node: Acknowledgments48809
-Node: Getting Started52576
-Node: Running gawk54940
-Node: One-shot56120
-Node: Read Terminal57336
-Ref: Read Terminal-Footnote-158982
-Node: Long59150
-Node: Executable Scripts60520
-Ref: Executable Scripts-Footnote-162404
-Ref: Executable Scripts-Footnote-262552
-Node: Comments63000
-Node: Quoting65353
-Node: Sample Data Files69833
-Node: Very Simple72853
-Node: Two Rules77443
-Node: More Complex79581
-Ref: More Complex-Footnote-182489
-Ref: More Complex-Footnote-282934
-Node: Statements/Lines83014
-Ref: Statements/Lines-Footnote-187372
-Node: Other Features87634
-Node: When88480
-Ref: When-Footnote-190706
-Node: Regexp90784
-Node: Regexp Usage92235
-Node: Escape Sequences94272
-Node: Regexp Operators99988
-Ref: Regexp Operators-Footnote-1107077
-Ref: Regexp Operators-Footnote-2107221
-Node: Character Lists107316
-Ref: table-char-classes109260
-Node: GNU Regexp Operators112784
-Node: Case-sensitivity116355
-Ref: Case-sensitivity-Footnote-1119505
-Node: Leftmost Longest119737
-Node: Computed Regexps120919
-Node: Locales124282
-Node: Reading Files126302
-Node: Records128053
-Ref: Records-Footnote-1136555
-Node: Fields136589
-Ref: Fields-Footnote-1139601
-Node: Nonconstant Fields139684
-Node: Changing Fields141876
-Node: Field Separators147122
-Node: Regexp Field Splitting150591
-Node: Single Character Fields153047
-Node: Command Line Field Separator154096
-Node: Field Splitting Summary157513
-Ref: Field Splitting Summary-Footnote-1160691
-Node: Constant Size160789
-Node: Multiple Line165245
-Ref: Multiple Line-Footnote-1170908
-Node: Getline171084
-Node: Plain Getline173143
-Node: Getline/Variable175185
-Node: Getline/File176323
-Node: Getline/Variable/File177641
-Node: Getline/Pipe179188
-Node: Getline/Variable/Pipe181244
-Node: Getline/Coprocess182345
-Node: Getline/Variable/Coprocess183576
-Node: Getline Notes184284
-Node: Getline Summary185927
-Ref: table-getline-variants186211
-Node: Printing187376
-Node: Print189005
-Node: Print Examples190325
-Node: Output Separators193105
-Node: OFMT194857
-Node: Printf196209
-Node: Basic Printf197128
-Node: Control Letters198655
-Node: Format Modifiers201875
-Node: Printf Examples207914
-Node: Redirection210613
-Node: Special Files217175
-Node: Special FD217809
-Node: Special Process220823
-Node: Special Network223055
-Node: Special Caveats223894
-Ref: Special Caveats-Footnote-1225089
-Node: Close Files And Pipes225469
-Ref: Close Files And Pipes-Footnote-1232348
-Ref: Close Files And Pipes-Footnote-2232493
-Node: Expressions232638
-Node: Constants234824
-Node: Scalar Constants235502
-Ref: Scalar Constants-Footnote-1236351
-Node: Nondecimal-numbers236530
-Node: Regexp Constants239572
-Node: Using Constant Regexps240045
-Node: Variables243122
-Node: Using Variables243778
-Node: Assignment Options245279
-Node: Conversion247153
-Ref: Conversion-Footnote-1251902
-Node: Arithmetic Ops252008
-Node: Concatenation254503
-Node: Assignment Ops257187
-Ref: table-assign-ops262136
-Node: Increment Ops264040
-Node: Truth Values267515
-Node: Typing and Comparison268562
-Ref: table-relational-ops271609
-Ref: Typing and Comparison-Footnote-1275850
-Node: Boolean Ops275992
-Node: Conditional Exp279998
-Node: Function Calls281729
-Node: Precedence284612
-Node: Patterns and Actions288033
-Node: Pattern Overview289084
-Node: Regexp Patterns290518
-Node: Expression Patterns291061
-Node: Ranges294593
-Node: BEGIN/END297667
-Node: Using BEGIN/END298417
-Ref: Using BEGIN/END-Footnote-1301135
-Node: I/O And BEGIN/END301246
-Node: Empty303503
-Node: Using Shell Variables303811
-Node: Action Overview306082
-Node: Statements308434
-Node: If Statement310287
-Node: While Statement311783
-Node: Do Statement313812
-Node: For Statement314958
-Node: Switch Statement318074
-Node: Break Statement320338
-Node: Continue Statement322386
-Node: Next Statement324284
-Node: Nextfile Statement326552
-Node: Exit Statement329128
-Node: Built-in Variables331183
-Node: User-modified332275
-Ref: User-modified-Footnote-1339515
-Node: Auto-set339574
-Ref: Auto-set-Footnote-1347911
-Node: ARGC and ARGV348113
-Node: Arrays351807
-Node: Array Intro353709
-Node: Reference to Elements357883
-Node: Assigning Elements359738
-Node: Array Example360205
-Node: Scanning an Array361921
-Node: Delete364182
-Ref: Delete-Footnote-1366534
-Node: Numeric Array Subscripts366588
-Node: Uninitialized Subscripts368766
-Node: Multi-dimensional370357
-Node: Multi-scanning373353
-Node: Array Sorting374962
-Node: Functions378599
-Node: Built-in379331
-Node: Calling Built-in380301
-Node: Numeric Functions382256
-Ref: Numeric Functions-Footnote-1385995
-Ref: Numeric Functions-Footnote-2386318
-Node: String Functions386584
-Ref: String Functions-Footnote-1406443
-Ref: String Functions-Footnote-2406569
-Ref: String Functions-Footnote-3406813
-Node: Gory Details406897
-Ref: table-sub-escapes408523
-Ref: table-sub-posix-92409858
-Ref: table-sub-proposed411197
-Ref: table-posix-2001-sub412550
-Ref: table-gensub-escapes413887
-Ref: Gory Details-Footnote-1415070
-Node: I/O Functions415118
-Ref: I/O Functions-Footnote-1421680
-Node: Time Functions421768
-Ref: Time Functions-Footnote-1432452
-Ref: Time Functions-Footnote-2432517
-Ref: Time Functions-Footnote-3432672
-Ref: Time Functions-Footnote-4432780
-Ref: Time Functions-Footnote-5432902
-Ref: Time Functions-Footnote-6433126
-Node: Bitwise Functions433385
-Ref: table-bitwise-ops433960
-Ref: Bitwise Functions-Footnote-1438182
-Node: I18N Functions438363
-Node: User-defined440086
-Node: Definition Syntax440867
-Node: Function Example445193
-Node: Function Caveats447758
-Node: Return Statement451662
-Node: Dynamic Typing454301
-Node: Internationalization455035
-Node: I18N and L10N456451
-Node: Explaining gettext457135
-Ref: Explaining gettext-Footnote-1462023
-Ref: Explaining gettext-Footnote-2462259
-Node: Programmer i18n462425
-Node: Translator i18n466642
-Node: String Extraction467429
-Ref: String Extraction-Footnote-1468373
-Node: Printf Ordering468496
-Ref: Printf Ordering-Footnote-1471248
-Node: I18N Portability471309
-Ref: I18N Portability-Footnote-1473733
-Node: I18N Example473793
-Ref: I18N Example-Footnote-1476385
-Node: Gawk I18N476454
-Node: Advanced Features477033
-Node: Nondecimal Data478427
-Node: Two-way I/O479977
-Ref: Two-way I/O-Footnote-1485426
-Node: TCP/IP Networking485500
-Node: Portal Files487911
-Node: Profiling488552
-Node: Invoking Gawk496068
-Node: Command Line497245
-Node: Options498024
-Ref: Options-Footnote-1510187
-Node: Other Arguments510209
-Node: AWKPATH Variable512869
-Ref: AWKPATH Variable-Footnote-1515626
-Node: Obsolete515883
-Node: Undocumented516877
-Node: Known Bugs517136
-Node: Library Functions517738
-Ref: Library Functions-Footnote-1520692
-Node: Library Names520860
-Ref: Library Names-Footnote-1524307
-Ref: Library Names-Footnote-2524523
-Node: General Functions524606
-Node: Nextfile Function525665
-Node: Strtonum Function530004
-Node: Assert Function532926
-Node: Round Function536212
-Node: Cliff Random Function537719
-Ref: Cliff Random Function-Footnote-1538702
-Node: Ordinal Functions538770
-Ref: Ordinal Functions-Footnote-1541818
-Node: Join Function542031
-Ref: Join Function-Footnote-1543782
-Node: Gettimeofday Function543979
-Node: Data File Management547676
-Node: Filetrans Function548308
-Node: Rewind Function551716
-Node: File Checking553153
-Node: Empty Files554201
-Node: Ignoring Assigns556408
-Node: Getopt Function557944
-Ref: Getopt Function-Footnote-1568908
-Node: Passwd Functions569106
-Ref: Passwd Functions-Footnote-1577714
-Node: Group Functions577799
-Node: Sample Programs585738
-Node: Running Examples586412
-Node: Clones587134
-Node: Cut Program588260
-Node: Egrep Program597933
-Ref: Egrep Program-Footnote-1605635
-Node: Id Program605742
-Node: Split Program609332
-Node: Tee Program612780
-Node: Uniq Program615442
-Node: Wc Program622780
-Ref: Wc Program-Footnote-1626994
-Node: Miscellaneous Programs627187
-Node: Dupword Program628183
-Node: Alarm Program630205
-Node: Translate Program634730
-Ref: Translate Program-Footnote-1638949
-Ref: Translate Program-Footnote-2639183
-Node: Labels Program639314
-Ref: Labels Program-Footnote-1642587
-Node: Word Sorting642668
-Node: History Sorting646931
-Node: Extract Program648757
-Node: Simple Sed656078
-Node: Igawk Program659112
-Ref: Igawk Program-Footnote-1673741
-Ref: Igawk Program-Footnote-2673939
-Node: Language History674074
-Node: V7/SVR3.1675458
-Node: SVR4677538
-Node: POSIX678977
-Node: BTL680484
-Node: POSIX/GNU682006
-Node: Contributors689379
-Node: Installation692822
-Node: Gawk Distribution693793
-Node: Getting694277
-Node: Extracting695508
-Node: Distribution contents696890
-Node: Unix Installation701971
-Node: Quick Installation702562
-Node: Additional Configuration Options704253
-Node: Configuration Philosophy706001
-Node: Non-Unix Installation708349
-Node: Amiga Installation708936
-Node: BeOS Installation710023
-Node: PC Installation711164
-Node: PC Binary Installation712391
-Node: PC Compiling714222
-Node: PC Dynamic718742
-Node: PC Using721088
-Node: Cygwin725682
-Ref: Cygwin-Footnote-1726674
-Node: VMS Installation726703
-Node: VMS Compilation727231
-Node: VMS Installation Details728802
-Node: VMS Running730426
-Node: VMS POSIX732015
-Node: Unsupported733286
-Node: Atari Installation733689
-Node: Atari Compiling734972
-Node: Atari Using736844
-Node: Tandem Installation739677
-Node: Bugs741342
-Node: Other Versions744605
-Ref: Other Versions-Footnote-1748206
-Node: Notes748245
-Node: Compatibility Mode748937
-Node: Additions749725
-Node: Adding Code750472
-Node: New Ports756519
-Node: Dynamic Extensions760574
-Node: Internals761821
-Node: Sample Library772806
-Node: Internal File Description773465
-Node: Internal File Ops777146
-Ref: Internal File Ops-Footnote-1782436
-Node: Using Internal File Ops782581
-Node: Future Extensions784598
-Node: Basic Concepts788534
-Node: Basic High Level789291
-Ref: Basic High Level-Footnote-1793302
-Node: Basic Data Typing793493
-Node: Floating Point Issues797895
-Ref: Floating Point Issues-Footnote-1801748
-Ref: Floating Point Issues-Footnote-2801798
-Node: Glossary801904
-Node: Copying825513
-Node: GNU Free Documentation License844649
-Node: Index867040
+Node: Top1336
+Node: Foreword27371
+Node: Preface31692
+Ref: Preface-Footnote-134571
+Node: History34803
+Node: Names37019
+Ref: Names-Footnote-138491
+Node: This Manual38563
+Ref: This Manual-Footnote-143318
+Node: Conventions43418
+Node: Manual History45292
+Ref: Manual History-Footnote-148745
+Ref: Manual History-Footnote-248786
+Node: How To Contribute48860
+Node: Acknowledgments49458
+Node: Getting Started53260
+Node: Running gawk55632
+Node: One-shot56818
+Node: Read Terminal58043
+Ref: Read Terminal-Footnote-159701
+Node: Long59872
+Node: Executable Scripts61248
+Ref: Executable Scripts-Footnote-163144
+Ref: Executable Scripts-Footnote-263295
+Node: Comments63746
+Node: Quoting66114
+Node: Sample Data Files70615
+Node: Very Simple73647
+Node: Two Rules78252
+Node: More Complex80399
+Ref: More Complex-Footnote-183322
+Ref: More Complex-Footnote-283770
+Node: Statements/Lines83853
+Ref: Statements/Lines-Footnote-188235
+Node: Other Features88500
+Node: When89352
+Ref: When-Footnote-191591
+Node: Regexp91676
+Node: Regexp Usage93130
+Node: Escape Sequences95182
+Node: Regexp Operators100921
+Ref: Regexp Operators-Footnote-1108028
+Ref: Regexp Operators-Footnote-2108175
+Node: Character Lists108273
+Ref: table-char-classes110230
+Node: GNU Regexp Operators112855
+Node: Case-sensitivity116499
+Ref: Case-sensitivity-Footnote-1119672
+Node: Leftmost Longest119907
+Node: Computed Regexps121098
+Node: Locales124479
+Node: Reading Files126745
+Node: Records128502
+Ref: Records-Footnote-1137060
+Node: Fields137097
+Ref: Fields-Footnote-1140127
+Node: Nonconstant Fields140213
+Node: Changing Fields142415
+Node: Field Separators147696
+Node: Regexp Field Splitting151187
+Node: Single Character Fields153652
+Node: Command Line Field Separator154703
+Node: Field Splitting Summary158142
+Ref: Field Splitting Summary-Footnote-1161328
+Node: Constant Size161429
+Node: Multiple Line165906
+Ref: Multiple Line-Footnote-1171637
+Node: Getline171816
+Node: Plain Getline173884
+Node: Getline/Variable175901
+Node: Getline/File177042
+Node: Getline/Variable/File178366
+Node: Getline/Pipe179925
+Node: Getline/Variable/Pipe182522
+Node: Getline/Coprocess183629
+Node: Getline/Variable/Coprocess184872
+Node: Getline Notes185586
+Node: Getline Summary187229
+Ref: table-getline-variants187513
+Node: Printing188079
+Node: Print189708
+Node: Print Examples191034
+Node: Output Separators193829
+Node: OFMT195590
+Node: Printf196945
+Node: Basic Printf197864
+Node: Control Letters199399
+Node: Format Modifiers202617
+Node: Printf Examples208635
+Node: Redirection211352
+Node: Special Files218249
+Node: Special FD218883
+Node: Special Process221909
+Node: Special Network224144
+Node: Special Caveats224986
+Ref: Special Caveats-Footnote-1226184
+Node: Close Files And Pipes226567
+Ref: Close Files And Pipes-Footnote-1233488
+Ref: Close Files And Pipes-Footnote-2233636
+Node: Expressions233784
+Node: Constants235973
+Node: Scalar Constants236654
+Ref: Scalar Constants-Footnote-1237509
+Node: Nondecimal-numbers237691
+Node: Regexp Constants240749
+Node: Using Constant Regexps241222
+Node: Variables244305
+Node: Using Variables244961
+Node: Assignment Options246471
+Node: Conversion248348
+Ref: table-locale-affects253780
+Ref: Conversion-Footnote-1254404
+Node: Arithmetic Ops254513
+Node: Concatenation257025
+Ref: Concatenation-Footnote-1259807
+Node: Assignment Ops259898
+Ref: table-assign-ops264876
+Node: Increment Ops266277
+Node: Truth Values269770
+Node: Typing and Comparison270820
+Node: Variable Typing271523
+Ref: Variable Typing-Footnote-1275198
+Node: Comparison Operators275342
+Ref: table-relational-ops275718
+Node: Boolean Ops279267
+Ref: Boolean Ops-Footnote-1283327
+Node: Conditional Exp283418
+Node: Function Calls285155
+Node: Precedence288437
+Node: Patterns and Actions292093
+Node: Pattern Overview293147
+Node: Regexp Patterns294584
+Node: Expression Patterns295127
+Node: Ranges298677
+Node: BEGIN/END301766
+Node: Using BEGIN/END302516
+Ref: Using BEGIN/END-Footnote-1305248
+Node: I/O And BEGIN/END305362
+Node: Empty307629
+Node: Using Shell Variables307937
+Node: Action Overview310218
+Node: Statements312576
+Node: If Statement314432
+Node: While Statement315931
+Node: Do Statement317963
+Node: For Statement319112
+Node: Switch Statement322252
+Node: Break Statement324528
+Node: Continue Statement326585
+Node: Next Statement328489
+Node: Nextfile Statement330769
+Node: Exit Statement333366
+Node: Built-in Variables335437
+Node: User-modified336532
+Ref: User-modified-Footnote-1343775
+Node: Auto-set343837
+Ref: Auto-set-Footnote-1352177
+Node: ARGC and ARGV352382
+Node: Arrays356094
+Node: Array Intro358002
+Node: Reference to Elements362199
+Node: Assigning Elements364066
+Node: Array Example364533
+Node: Scanning an Array366255
+Node: Delete368522
+Ref: Delete-Footnote-1370904
+Node: Numeric Array Subscripts370961
+Node: Uninitialized Subscripts373148
+Node: Multi-dimensional374754
+Node: Multi-scanning377767
+Node: Array Sorting379382
+Node: Functions383045
+Node: Built-in383780
+Node: Calling Built-in384750
+Node: Numeric Functions386717
+Ref: Numeric Functions-Footnote-1390459
+Ref: Numeric Functions-Footnote-2390785
+Node: String Functions391054
+Ref: String Functions-Footnote-1410916
+Ref: String Functions-Footnote-2411045
+Ref: String Functions-Footnote-3411293
+Node: Gory Details411380
+Ref: table-sub-escapes413015
+Ref: table-sub-posix-92414350
+Ref: table-sub-proposed415689
+Ref: table-posix-2001-sub417041
+Ref: table-gensub-escapes418378
+Ref: Gory Details-Footnote-1419564
+Node: I/O Functions419615
+Ref: I/O Functions-Footnote-1426189
+Node: Time Functions426280
+Ref: Time Functions-Footnote-1437072
+Ref: Time Functions-Footnote-2437140
+Ref: Time Functions-Footnote-3437298
+Ref: Time Functions-Footnote-4437409
+Ref: Time Functions-Footnote-5437534
+Ref: Time Functions-Footnote-6437761
+Node: Bitwise Functions438023
+Ref: table-bitwise-ops438601
+Ref: Bitwise Functions-Footnote-1442835
+Node: I18N Functions443019
+Node: User-defined444740
+Node: Definition Syntax445521
+Node: Function Example449880
+Node: Function Caveats452460
+Node: Return Statement456385
+Node: Dynamic Typing459042
+Node: Internationalization459779
+Node: I18N and L10N461198
+Node: Explaining gettext461882
+Ref: Explaining gettext-Footnote-1466789
+Ref: Explaining gettext-Footnote-2467028
+Node: Programmer i18n467197
+Node: Translator i18n471420
+Node: String Extraction472210
+Ref: String Extraction-Footnote-1473160
+Node: Printf Ordering473286
+Ref: Printf Ordering-Footnote-1476064
+Node: I18N Portability476128
+Ref: I18N Portability-Footnote-1478556
+Node: I18N Example478619
+Ref: I18N Example-Footnote-1481231
+Node: Gawk I18N481303
+Node: Advanced Features481885
+Node: Nondecimal Data483284
+Node: Two-way I/O484843
+Ref: Two-way I/O-Footnote-1490324
+Node: TCP/IP Networking490401
+Node: Portal Files492830
+Node: Profiling493474
+Node: Invoking Gawk500930
+Node: Command Line502110
+Node: Options502895
+Ref: Options-Footnote-1515735
+Node: Other Arguments515760
+Node: AWKPATH Variable518441
+Ref: AWKPATH Variable-Footnote-1521213
+Node: Obsolete521473
+Node: Undocumented522473
+Node: Known Bugs522735
+Node: Library Functions523337
+Ref: Library Functions-Footnote-1526318
+Node: Library Names526489
+Ref: Library Names-Footnote-1529962
+Ref: Library Names-Footnote-2530181
+Node: General Functions530267
+Node: Nextfile Function531326
+Node: Strtonum Function535690
+Node: Assert Function538625
+Node: Round Function541929
+Node: Cliff Random Function543436
+Ref: Cliff Random Function-Footnote-1544425
+Node: Ordinal Functions544496
+Ref: Ordinal Functions-Footnote-1547556
+Node: Join Function547772
+Ref: Join Function-Footnote-1549532
+Node: Gettimeofday Function549732
+Node: Data File Management553435
+Node: Filetrans Function554067
+Node: Rewind Function557493
+Node: File Checking558939
+Node: Empty Files559991
+Node: Ignoring Assigns562216
+Node: Getopt Function563764
+Ref: Getopt Function-Footnote-1575042
+Node: Passwd Functions575243
+Ref: Passwd Functions-Footnote-1583904
+Node: Group Functions583992
+Node: Sample Programs591990
+Node: Running Examples592667
+Node: Clones593395
+Node: Cut Program594527
+Node: Egrep Program604284
+Ref: Egrep Program-Footnote-1612034
+Node: Id Program612144
+Node: Split Program615751
+Node: Tee Program619215
+Node: Uniq Program621892
+Node: Wc Program629260
+Ref: Wc Program-Footnote-1633504
+Node: Miscellaneous Programs633700
+Node: Dupword Program634696
+Node: Alarm Program636727
+Node: Translate Program641267
+Ref: Translate Program-Footnote-1645513
+Ref: Translate Program-Footnote-2645750
+Node: Labels Program645884
+Ref: Labels Program-Footnote-1649175
+Node: Word Sorting649259
+Node: History Sorting653542
+Node: Extract Program655380
+Node: Simple Sed662732
+Node: Igawk Program665787
+Ref: Igawk Program-Footnote-1680492
+Ref: Igawk Program-Footnote-2680693
+Node: Language History680831
+Node: V7/SVR3.1682215
+Node: SVR4684479
+Node: POSIX685918
+Node: BTL687526
+Node: POSIX/GNU689051
+Node: Contributors696885
+Node: Installation700421
+Node: Gawk Distribution701392
+Node: Getting701876
+Node: Extracting703110
+Node: Distribution contents704498
+Node: Unix Installation709579
+Node: Quick Installation710170
+Node: Additional Configuration Options711872
+Node: Configuration Philosophy713734
+Node: Non-Unix Installation716098
+Node: Amiga Installation716685
+Node: BeOS Installation717781
+Node: PC Installation718934
+Node: PC Binary Installation720164
+Node: PC Compiling722007
+Node: PC Dynamic726559
+Node: PC Using728920
+Node: Cygwin733533
+Ref: Cygwin-Footnote-1734531
+Node: VMS Installation734563
+Node: VMS Compilation735167
+Node: VMS Installation Details736744
+Node: VMS Running738374
+Node: VMS POSIX739971
+Node: VMS Old Gawk741269
+Node: Unsupported741738
+Node: Atari Installation742141
+Node: Atari Compiling743430
+Node: Atari Using745315
+Node: Tandem Installation748160
+Node: Bugs749840
+Node: Other Versions753145
+Ref: Other Versions-Footnote-1757571
+Ref: Other Versions-Footnote-2757613
+Ref: Other Versions-Footnote-3757650
+Node: Notes757688
+Node: Compatibility Mode758380
+Node: Additions759174
+Node: Adding Code759924
+Node: New Ports765974
+Node: Dynamic Extensions770106
+Node: Internals771363
+Node: Sample Library782366
+Node: Internal File Description783025
+Node: Internal File Ops786718
+Ref: Internal File Ops-Footnote-1792044
+Node: Using Internal File Ops792192
+Node: Future Extensions794215
+Node: Basic Concepts798168
+Node: Basic High Level798925
+Ref: Basic High Level-Footnote-1802957
+Node: Basic Data Typing803151
+Node: Floating Point Issues807588
+Ref: Floating Point Issues-Footnote-1808674
+Node: String Conversion Precision808727
+Ref: String Conversion Precision-Footnote-1810421
+Node: Unexpected Results810530
+Node: POSIX Floating Point Problems812356
+Ref: POSIX Floating Point Problems-Footnote-1815830
+Node: Glossary815868
+Node: Copying839636
+Node: GNU Free Documentation License877193
+Node: Index899595
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index c0b738c7..39673e01 100755..100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -20,9 +20,9 @@
 @c applies to and all the info about who's publishing this edition
 
 @c These apply across the board.
-@set UPDATE-MONTH June, 2005
+@set UPDATE-MONTH October, 2007
 @set VERSION 3.1
-@set PATCHLEVEL 5
+@set PATCHLEVEL 6
 
 @set FSF
 
@@ -110,7 +110,7 @@ Some comments on the layout for TeX.
 @end iftex
 
 @copying
-Copyright @copyright{} 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 @sp 2
 
 This is Edition @value{EDITION} of @cite{@value{TITLE}: @value{SUBTITLE}},
@@ -171,13 +171,15 @@ liabilities with respect to the programs or applications.
 So there.
 @sp 2
 UNIX is a registered trademark of The Open Group in the United States and other countries. @*
+Linux is a registered trademark of Linus Torvalds in the United States and other countries. @*
 Microsoft, MS and MS-DOS are registered trademarks, and Windows is a
 trademark of Microsoft Corporation in the United States and other
 countries. @*
 Atari, 520ST, 1040ST, TT, STE, Mega and Falcon are registered trademarks
 or trademarks of Atari Corporation. @*
-DEC, Digital, OpenVMS, ULTRIX and VMS are trademarks of Digital Equipment
-Corporation. @*
+Once upon a time,
+DEC, Digital, OpenVMS, ULTRIX and VMS were trademarks of Digital Equipment
+Corporation. Now they belong to Hewlett-Packard Corporation. @*
 @end ignore
 ``To boldly go where no man has gone before'' is a
 Registered Trademark of Paramount Pictures Corporation. @*
@@ -281,7 +283,7 @@ particular records in a file and perform operations upon them.
                                    operating systems.
 * Notes::                          Notes about @command{gawk} extensions and
                                    possible future work.
-* Basic Concepts::                 A very quick intoduction to programming
+* Basic Concepts::                 A very quick introduction to programming
                                    concepts.
 * Glossary::                       An explanation of some unfamiliar terms.
 * Copying::                        Your right to copy and distribute
@@ -406,6 +408,8 @@ particular records in a file and perform operations upon them.
 * Typing and Comparison::          How variables acquire types and how this
                                    affects comparison of numbers and strings
                                    with @samp{<}, etc.
+* Variable Typing::                String type versus numeric type.
+* Comparison Operators::           The comparison operators.
 * Boolean Ops::                    Combining comparison expressions using
                                    boolean operators @samp{||} (``or''),
                                    @samp{&&} (``and'') and @samp{!} (``not'').
@@ -601,6 +605,7 @@ particular records in a file and perform operations upon them.
 * VMS Installation Details::       How to install @command{gawk} under VMS.
 * VMS Running::                    How to run @command{gawk} under VMS.
 * VMS POSIX::                      Alternate instructions for VMS POSIX.
+* VMS Old Gawk::                   An old version comes with some VMS systems.
 * Unsupported::                    Systems whose ports are no longer
                                    supported.
 * Atari Installation::             Installing @command{gawk} on the Atari ST.
@@ -630,6 +635,10 @@ particular records in a file and perform operations upon them.
 * Basic High Level::               The high level view.
 * Basic Data Typing::              A very quick intro to data types.
 * Floating Point Issues::          Stuff to know about floating-point numbers.
+* String Conversion Precision::    The String Value Can Lie.
+* Unexpected Results::             Floating Point Numbers Are Not
+                                   Abstract Numbers.
+* POSIX Floating Point Problems::  Standards Versus Existing Practice.
 @end detailmenu
 @end menu
 
@@ -930,7 +939,7 @@ for a complete list of those who made important contributions to @command{gawk}.
 @node Names
 @section A Rose by Any Other Name
 
-@cindex @command{awk}, new vs. old
+@cindex @command{awk}, new vs.@: old
 The @command{awk} language has evolved over the years. Full details are
 provided in @ref{Language History}.
 The language described in this @value{DOCUMENT}
@@ -1218,7 +1227,7 @@ The GPL applies to the C language source code for @command{gawk}.
 To find out more about the FSF and the GNU Project online,
 see @uref{http://www.gnu.org, the GNU Project's home page}.
 This @value{DOCUMENT} may also be read from
-@uref{http://www.gnu.org/manual/gawk/, their web site}.
+@uref{http://www.gnu.org/software/gawk/manual/, their web site}.
 
 A shell, an editor (Emacs), highly portable optimizing C, C++, and
 Objective-C compilers, a symbolic debugger and dozens of large and
@@ -1559,7 +1568,7 @@ of the patterns, @command{awk} performs specified actions on that line.
 the end of the input files.
 
 @cindex @command{awk}, uses for
-@cindex programming languages@comma{} data-driven vs. procedural
+@cindex programming languages@comma{} data-driven vs.@: procedural
 @cindex @command{awk} programs
 Programs in @command{awk} are different from programs in most other languages,
 because @command{awk} programs are @dfn{data-driven}; that is, you describe
@@ -1926,8 +1935,8 @@ comment is to help you or another person understand the program
 when reading it at a later time.
 
 @cindex quoting
-@cindex single quote (@code{'}), vs. apostrophe
-@cindex @code{'} (single quote), vs. apostrophe
+@cindex single quote (@code{'}), vs.@: apostrophe
+@cindex @code{'} (single quote), vs.@: apostrophe
 @strong{Caution:} As mentioned in
 @ref{One-shot},
 you can enclose small to medium programs in single quotes, in order to keep
@@ -2692,7 +2701,7 @@ Complex programs have been written in @command{awk}, including a complete
 retargetable assembler for eight-bit microprocessors (@pxref{Glossary}, for
 more information), and a microcode assembler for a special-purpose Prolog
 computer.  More recently, @command{gawk} was used for writing a Wiki
-clone.@footnote{@uref{http://www.awk-scripting.de/cgi/wiki.cgi/yawk/, Yet Another Wiki Clone}.}
+clone.@footnote{@uref{http://www.awk-scripting.de/cgi-bin/wiki.cgi/yawk/, Yet Another Wiki Clone}.}
 While the original @command{awk}'s capabilities were strained by tasks
 of such complexity, modern versions are more capable.  Even the Bell
 Labs version of @command{awk} has fewer predefined limits, and those
@@ -3561,6 +3570,7 @@ are not special, interval expressions are not available, nor
 are the POSIX character classes (@code{[[:alnum:]]}, etc.).
 Characters described by octal and hexadecimal escape sequences are
 treated literally, even if they represent regexp metacharacters.
+Also, @command{gawk} silently skips directories named on the command line.
 
 @item @code{--re-interval}
 Allow interval expressions in regexps, even if @option{--traditional}
@@ -3663,7 +3673,7 @@ character set. This character set is a superset of the traditional 128
 ASCII characters, which also provides a number of characters suitable
 for use with European languages.
 
-As of @command{gawk} 3.1.4, the case equivalencies are fully
+As of @command{gawk} 3.1.4, the case equivalences are fully
 locale-aware.  They are based on the C @code{<ctype.h>} facilities,
 such as @code{isalpha()} and @code{toupper()}.
 
@@ -3751,7 +3761,7 @@ match the string on the lefthand side of the operator with the pattern
 on the right.  This is true of any string-valued expression (such as
 @code{digits_regexp}, shown previously), not just string constants.
 
-@cindex regexp constants, slashes vs. quotes
+@cindex regexp constants, slashes vs.@: quotes
 @cindex @code{\} (backslash), regexp constants
 @cindex backslash (@code{\}), regexp constants
 @cindex @code{"} (double quote), regexp constants
@@ -3767,9 +3777,9 @@ you have to type @code{"\\*"}.  The first backslash escapes the
 second one so that the string actually contains the
 two characters @samp{\} and @samp{*}.
 
-@cindex troubleshooting, regexp constants vs. string constants
-@cindex regexp constants, vs. string constants
-@cindex string constants, vs. regexp constants
+@cindex troubleshooting, regexp constants vs.@: string constants
+@cindex regexp constants, vs.@: string constants
+@cindex string constants, vs.@: regexp constants
 Given that you can use both regexp and string constants to describe
 regular expressions, which should you use?  The answer is ``regexp
 constants,'' for several reasons:
@@ -3828,6 +3838,7 @@ occur often in practice, but it's worth noting for future reference.
 
 @node Locales
 @section Where You Are Makes A Difference
+@cindex locale, definition of
 
 Modern systems support the notion of @dfn{locales}: a way to tell
 the system about the local character set and language.  The current
@@ -3852,6 +3863,7 @@ should not normally match @samp{[A-Z]*}.  This result is due to the
 locale setting (and thus you may not see it on your system).
 There are two fixes.  The first is to use the POSIX character
 class @samp{[[:upper:]]}, instead of @samp{[A-Z]}.
+(This is preferred, since then your program will work everywhere.)
 The second is to change the locale setting in the environment,
 before running @command{gawk},
 by using the shell statements:
@@ -3873,10 +3885,14 @@ ranges should be avoided; either list the characters individually,
 or use a POSIX character class such as @samp{[[:punct:]]}.)
 
 For the normal case of @samp{RS = "\n"}, the locale is largely irrelevant.
-For other single byte record separators, using @samp{LC_ALL=C} will give you
-much better performance when reading records.  Otherwise, @command{gawk} has
-to make several function calls, @emph{per input character} to find the record
-terminator.
+For other single-character record separators, using @samp{LC_ALL=C}
+will give you much better performance when reading records.  Otherwise,
+@command{gawk} has to make several function calls, @emph{per input
+character} to find the record terminator.
+
+Finally, the locale affects the value of the decimal point character
+used when @command{gawk} parses input data.  This is discussed in
+detail in @ref{Conversion}.
 
 @node Reading Files
 @chapter Reading Input Files
@@ -4840,7 +4856,7 @@ Perhaps the most common use of a single character as the field
 separator occurs when processing the Unix system password file.
 On many Unix systems, each user has a separate entry in the system password
 file, one line per user.  The information in these lines is separated
-by colons.  The first field is the user's logon name and the second is
+by colons.  The first field is the user's login name and the second is
 the user's (encrypted or shadow) password.  A password file entry might look
 like this:
 
@@ -5161,7 +5177,7 @@ Now that the input is separated into records, the second step is to
 separate the fields in the record.  One way to do this is to divide each
 of the lines into fields in the normal manner.  This happens by default
 as the result of a special feature.  When @code{RS} is set to the empty
-string, @emph{and} @code{FS} is a set to a single character,
+string, @emph{and} @code{FS} is set to a single character,
 the newline character @emph{always} acts as a field separator.
 This is in addition to whatever field separations result from
 @code{FS}.@footnote{When @code{FS} is the null string (@code{""})
@@ -5185,7 +5201,7 @@ separator is a percent character, instead of
 Another way to separate fields is to
 put each field on a separate line: to do this, just set the
 variable @code{FS} to the string @code{"\n"}.  (This single
-character seperator matches a single newline.)
+character separator matches a single newline.)
 A practical example of a @value{DF} organized this way might be a mailing
 list, where each entry is separated by blank lines.  Consider a mailing
 list in a file named @file{addresses}, which looks like this:
@@ -5259,7 +5275,9 @@ Records are separated by each occurrence of the character.  Multiple
 successive occurrences delimit empty records.
 
 @item RS == ""
-Records are separated by runs of blank lines.  The newline character
+Records are separated by runs of blank lines.
+When @code{FS} is a single character, then
+the newline character
 always serves as a field separator, in addition to whatever value
 @code{FS} may have. Leading and trailing newlines in a file are ignored.
 
@@ -5347,7 +5365,6 @@ processing on the next record @emph{right now}.  For example:
                     print m > "/dev/stderr"
                     exit
                @}
-               t = -1
                u = index($0, "*/")
           @}
           # substr expression will be "" if */
@@ -5358,7 +5375,7 @@ processing on the next record @emph{right now}.  For example:
 @}
 @end example
 
-This @command{awk} program deletes all C-style comments (@samp{/* @dots{}
+This @command{awk} program deletes C-style comments (@samp{/* @dots{}
 */}) from the input.  By replacing the @samp{print $0} with other
 statements, you could perform more complicated processing on the
 decommented input, such as searching for matches of a regular
@@ -5601,6 +5618,20 @@ because the concatenation operator is not parenthesized.  You should
 write it as @samp{(@w{"echo "} "date") | getline} if you want your program
 to be portable to other @command{awk} implementations.
 
+@quotation NOTE
+Unfortunately, @command{gawk} has not been consistent in its treatment
+of a construct like @samp{@w{"echo "} "date" | getline}. Up to and including
+@value{PVERSION} 3.1.1 of @command{gawk}, it was treated as
+@samp{@w{("echo "} "date") | getline}.
+(This how Unix @command{awk} behaves.)
+From 3.1.2 through 3.1.5, it was treated as
+@samp{@w{"echo "} ("date" | getline)}.
+(This is how @command{mawk} behaves.)
+Starting with @value{PVERSION} 3.1.6, the earlier behavior was reinstated.
+In short, @emph{always} use explicit parentheses, and then you won't
+have to worry.
+@end quotation
+
 @node Getline/Variable/Pipe
 @subsection Using @code{getline} into a Variable from a Pipe
 @cindex variables, @code{getline} command into@comma{} using
@@ -5648,7 +5679,7 @@ sends data @emph{to} your @command{awk} program.
 
 On occasion, you might want to send data to another program
 for processing and then read the results back.
-@command{gawk} allows you start a @dfn{coprocess}, with which two-way
+@command{gawk} allows you to start a @dfn{coprocess}, with which two-way
 communications are possible.  This is done with the @samp{|&}
 operator.
 Typically, you write data to the coprocess first and then
@@ -6179,7 +6210,7 @@ representing negative
 infinity are formatted as
 @samp{-inf} or @samp{-infinity},
 and positive infinity as
-@samp{inf} and @samp{-infinity}.
+@samp{inf} and @samp{infinity}.
 The special ``not a number'' value formats as @samp{-nan} or @samp{nan}.
 
 @item %F
@@ -6187,7 +6218,7 @@ Like @code{%f} but the infinity and ``not a number'' values are spelled
 using uppercase letters.
 
 The @code{%F} format is a POSIX extension to ISO C; not all systems
-support.  On those that don't, @command{gawk} uses @code{%f} instead.
+support it.  On those that don't, @command{gawk} uses @code{%f} instead.
 
 @item %g@r{,} %G
 These print a number in either scientific notation or in floating-point
@@ -6220,7 +6251,7 @@ argument and it ignores any modifiers.
 @cindex @command{gawk}, format-control characters
 @quotation NOTE
 When using the integer format-control letters for values that are
-outside the range of the widest C integer type, @command{gawk} switches to the
+outside the range of the widest C integer type, @command{gawk} switches to
 the @samp{%g} format specifier. If @option{--lint} is provided on the
 command line (@pxref{Options}), @command{gawk}
 warns about this.  Other versions of @command{awk} may print invalid
@@ -6313,19 +6344,19 @@ This flag only has an effect when the field width is wider than the
 value to print.
 
 @item '
-A single quote or apostrohe character is a POSIX extension to ISO C.
+A single quote or apostrophe character is a POSIX extension to ISO C.
 It indicates that the integer part of a floating point value, or the
 entire part of an integer decimal value, should have a thousands-separator
 character in it.  This only works in locales that support such characters.
 For example:
 
 @example
-$ @kbd{cat thousands.awk}                                     @i{Show source program}
+$ @kbd{cat thousands.awk}          @i{Show source program}
 @print{} BEGIN @{ printf "%'d\n", 1234567 @}
-$ @kbd{LC_ALL=C gawk -f thousands.awk}                        @i{Run it in "C" locale}
-@print{} 1234567
-$ @kbd{LC_ALL=en_US.UTF-8 gawk -f thousands.awk}              @i{Run in US English UTF locale}
-@print{} 1,234,567
+$ @kbd{LC_ALL=C gawk -f thousands.awk}
+@print{} 1234567                   @i{Results in "C" locale}
+$ @kbd{LC_ALL=en_US.UTF-8 gawk -f thousands.awk}
+@print{} 1,234,567                 @i{Results in US English UTF locale}
 @end example
 
 @noindent
@@ -6334,7 +6365,7 @@ see @ref{Locales}.
 
 @quotation NOTE
 The @samp{'} flag is a nice feature, but its use complicates things: it
-now becomes difficult to use it in command-line programs.  For information
+becomes difficult to use it in command-line programs.  For information
 on appropriate quoting tricks, see @ref{Quoting}.
 @end quotation
 
@@ -6654,7 +6685,8 @@ for more information.
 This example also illustrates the use of a variable to represent
 a @var{file} or @var{command}---it is not necessary to always
 use a string constant.  Using a variable is generally a good idea,
-because @command{awk} requires that the string value be spelled identically
+because (if you mean to refer to that same file or command)
+@command{awk} requires that the string value be spelled identically
 every time.
 
 @cindex coprocesses
@@ -6671,6 +6703,8 @@ but subsidiary to, the @command{awk} program.
 
 This feature is a @command{gawk} extension, and is not available in
 POSIX @command{awk}.
+@xref{Getline/Coprocess},
+for a brief discussion.
 @xref{Two-way I/O},
 for a more complete discussion.
 @end table
@@ -6696,7 +6730,10 @@ print "Avoid improbability generators" >> "guide.txt"
 This is indeed how redirections must be used from the shell.  But in
 @command{awk}, it isn't necessary.  In this kind of case, a program should
 use @samp{>} for all the @code{print} statements, since the output file
-is only opened once.
+is only opened once. (It happens that if you mix @samp{>} and @samp{>>}
+that output is produced in the expected order. However, mixing the operators
+for the same file is definitely poor style, and is confusing to readers
+of your program.)
 
 @cindex differences in @command{awk} and @command{gawk}, implementation limitations
 @cindex implementation issues@comma{} @command{gawk}, limits
@@ -7767,8 +7804,8 @@ b = a ""
 
 @cindex POSIX @command{awk}, @code{OFMT} variable and
 @cindex @code{OFMT} variable
-@cindex portability, new @command{awk} vs. old @command{awk}
-@cindex @command{awk}, new vs. old, @code{OFMT} variable
+@cindex portability, new @command{awk} vs.@: old @command{awk}
+@cindex @command{awk}, new vs.@: old, @code{OFMT} variable
 Prior to the POSIX standard, @command{awk} used the value
 of @code{OFMT} for converting numbers to strings.  @code{OFMT}
 specifies the output format to use when printing numbers with @code{print}.
@@ -7783,23 +7820,22 @@ that instead of changing your programs, just port @command{gawk} itself.
 @xref{Print},
 for more information on the @code{print} statement.
 
-Finally, once again, where you are can matter when it comes to
-converting between numbers and strings.  In
-@ref{Locales}, we mentioned that the
-local character set and language (the locale) can affect how @command{gawk} matches
-characters.  The locale also affects numeric formats.  In particular, for @command{awk}
-programs, it affects the decimal point character.  The @code{"C"} locale, and most
-English-language locales, use the period character (@samp{.}) as the decimal point.
-However, many (if not most) European and non-English locales use the comma (@samp{,})
-as the decimal point character.
+And, once again, where you are can matter when it comes to converting
+between numbers and strings.  In @ref{Locales}, we mentioned that
+the local character set and language (the locale) can affect how
+@command{gawk} matches characters.  The locale also affects numeric
+formats.  In particular, for @command{awk} programs, it affects the
+decimal point character.  The @code{"C"} locale, and most English-language
+locales, use the period character (@samp{.}) as the decimal point.
+However, many (if not most) European and non-English locales use the comma
+(@samp{,}) as the decimal point character.
 
 The POSIX standard says that @command{awk} always uses the period as the decimal
 point when reading the @command{awk} program source code, and for command-line
 variable assignments (@pxref{Other Arguments}).
 However, when interpreting input data, for @code{print} and @code{printf} output,
 and for number to string conversion, the local decimal point character is used.
-As of @value{PVERSION} 3.1.3, @command{gawk} fully complies with this aspect
-of the standard.  Here are some examples indicating the difference in behavior,
+Here are some examples indicating the difference in behavior,
 on a GNU/Linux system:
 
 @example
@@ -7819,6 +7855,37 @@ the decimal point separator.  In the normal @code{"C"} locale, @command{gawk}
 treats @samp{4,321} as @samp{4}, while in the Danish locale, it's treated
 as the full number, @samp{4.321}.
 
+For @value{PVERSION} 3.1.3 through 3.1.5, @command{gawk} fully complied
+with this aspect of the standard.  However, many users in non-English
+locales complained about this behavior, since their data used a period
+as the decimal point.  Beginning in @value{PVERSION} 3.1.6, the default
+behavior was restored to use a period as the decimal point character.
+You can use the @option{--use-lc-numeric} option (@pxref{Options})
+to force @command{gawk} to use the locale's decimal point character.
+(@command{gawk} also uses the locale's decimal point character when in
+POSIX mode, either via @option{--posix}, or the @env{POSIXLY_CORRECT}
+environment variable.)
+
+The following table describes the cases in which the locale's decimal
+point character is used and when a period is used. Some of these
+features have not been described yet.
+
+@float Table,table-locale-affects
+@caption{Locale Decimal Point versus A Period}
+@multitable @columnfractions .15 .20 .45
+@headitem Feature @tab Default @tab @option{--posix} or @option{--use-lc-numeric}
+@item @samp{%'g} @tab Use locale @tab Use locale
+@item @samp{%g} @tab Use period @tab Use locale
+@item Input @tab Use period @tab Use locale
+@item @samp{strtonum} @tab Use period @tab Use locale
+@end multitable
+@end float
+
+Finally, modern day formal standards and IEEE standard floating point
+representation can have an unusual but important effect on the way
+@command{gawk} converts some special string values to numbers.  The details
+are presented in @ref{POSIX Floating Point Problems}.
+
 @node Arithmetic Ops
 @section Arithmetic Operators
 @cindex arithmetic operators
@@ -7969,9 +8036,9 @@ $ awk '@{ print "Field number one:" $1 @}' BBS-list
 @cindex troubleshooting, string concatenation
 Because string concatenation does not have an explicit operator, it is
 often necessary to insure that it happens at the right time by using
-parentheses to enclose the items to concatenate.  For example, the
-following code fragment does not concatenate @code{file} and @code{name}
-as you might expect:
+parentheses to enclose the items to concatenate.  For example,
+you might expect that the
+following code fragment concatenates @code{file} and @code{name}:
 
 @example
 file = "file"
@@ -7980,6 +8047,9 @@ print "something meaningful" > file name
 @end example
 
 @noindent
+This produces a syntax error with Unix @command{awk}.@footnote{It happens
+that @command{gawk} and @command{mawk} ``get it right,'' but you should
+not rely on this.}
 It is necessary to use the following:
 
 @example
@@ -8013,7 +8083,7 @@ counter-intuitive.  Consider this example:
 
 @ignore
 > To: bug-gnu-utils@@gnu.org
-> CC: arnold@gnu.org
+> CC: arnold@@gnu.org
 > Subject: gawk 3.0.4 bug with {print -12 " " -24}
 > From: Russell Schulz <Russell_Schulz@locutus.ofB.ORG>
 > Date: Tue, 8 Feb 2000 19:56:08 -0700
@@ -8500,6 +8570,16 @@ The Hitchhiker's Guide to the Galaxy
 Unlike other programming languages, @command{awk} variables do not have a
 fixed type. Instead, they can be either a number or a string, depending
 upon the value that is assigned to them.
+We look now at how variables are typed, and how @command{awk}
+compares variables.
+
+@menu
+* Variable Typing::             String type versus numeric type.
+* Comparison Operators::        The comparison operators.
+@end menu
+
+@node Variable Typing
+@subsection String Type Versus Numeric Type
 
 @cindex numeric, strings
 @cindex strings, numeric
@@ -8544,9 +8624,9 @@ operation:
 
 @example
 BEGIN @{
-         a = 12.345
-         b = a " is a cute number"
-         print b
+     a = 12.345
+     b = a " is a cute number"
+     print b
 @}
 @end example
 
@@ -8615,17 +8695,49 @@ STRNUM  |       string          numeric         numeric
 The basic idea is that user input that looks numeric---and @emph{only}
 user input---should be treated as numeric, even though it is actually
 made of characters and is therefore also a string.
-Thus, for example, the string constant @w{@code{" +3.14"}}
-is a string, even though it looks numeric,
-and is @emph{never} treated as number for comparison
+Thus, for example, the string constant @w{@code{" +3.14"}},
+when it appears in program source code,
+is a string---even though it looks numeric---and
+is @emph{never} treated as number for comparison
 purposes.
 
 In short, when one operand is a ``pure'' string, such as a string
 constant, then a string comparison is performed.  Otherwise, a
-numeric comparison is performed.@footnote{The POSIX standard is under
-revision.  The revised standard's rules for typing and comparison are
+numeric comparison is performed.@footnote{The POSIX standard has
+been revised.  The revised standard's rules for typing and comparison are
 the same as just described for @command{gawk}.}
 
+This point bears additional emphasis: All user input is made of characters,
+and so is first and foremost of @var{string} type; input strings
+that look numeric are additionally given the @var{strnum} attribute.
+Thus, the six-character input string @w{@samp{ +3.14}} receives the
+@var{strnum} attribute. In contrast, the eight-character literal
+@w{@code{" +3.14"}} appearing in program text is a string constant.
+The following examples print @samp{1} when the comparison between
+the two different constants is true, @samp{0} otherwise:
+
+@example
+$ echo ' +3.14' | gawk '@{ print $0 == " +3.14" @}'    @i{True}
+@print{} 1
+$ echo ' +3.14' | gawk '@{ print $0 == "+3.14" @}'     @i{False}
+@print{} 0
+$ echo ' +3.14' | gawk '@{ print $0 == "3.14" @}'      @i{False}
+@print{} 0
+$ echo ' +3.14' | gawk '@{ print $0 == 3.14 @}'        @i{True}
+@print{} 1
+$ echo ' +3.14' | gawk '@{ print $1 == " +3.14" @}'    @i{False}
+@print{} 0
+$ echo ' +3.14' | gawk '@{ print $1 == "+3.14" @}'     @i{True}
+@print{} 1
+$ echo ' +3.14' | gawk '@{ print $1 == "3.14" @}'      @i{False}
+@print{} 0
+$ echo ' +3.14' | gawk '@{ print $1 == 3.14 @}'        @i{True}
+@print{} 1
+@end example
+
+@node Comparison Operators
+@subsection Comparison Operators
+
 @dfn{Comparison expressions} compare strings or numbers for
 relationships such as equality.  They are written using @dfn{relational
 operators}, which are a superset of those in C.
@@ -8726,9 +8838,9 @@ $ echo 1e2 3 | awk '@{ print ($1 < $2) ? "true" : "false" @}'
 @print{} false
 @end example
 
-@cindex comparison expressions, string vs. regexp
-@c @cindex string comparison vs. regexp comparison
-@c @cindex regexp comparison vs. string comparison
+@cindex comparison expressions, string vs.@: regexp
+@c @cindex string comparison vs.@: regexp comparison
+@c @cindex regexp comparison vs.@: string comparison
 @noindent
 the result is @samp{false} because both @code{$1} and @code{$2}
 are user input.  They are numeric strings---therefore both have
@@ -8906,7 +9018,9 @@ out initialized to zero, which is also false.  When a line is seen whose
 first field is @samp{START}, the value of @code{interested} is toggled
 to true, using @samp{!}. The next rule prints lines as long as
 @code{interested} is true.  When a line is seen whose first field is
-@samp{END}, @code{interested} is toggled back to false.
+@samp{END}, @code{interested} is toggled back to false.@footnote{This
+program has a bug; it prints lines starting with @samp{END}. How
+would you fix it?}
 
 @ignore
 Scott Deifik points out that this program isn't robust against
@@ -9047,8 +9161,7 @@ treated as local variables and initialized to the empty string
 Like every other expression, the function call has a value, which is
 computed by the function based on the arguments you give it.  In this
 example, the value of @samp{sqrt(@var{argument})} is the square root of
-@var{argument}.  A function can also have side effects, such as assigning
-values to certain variables or doing I/O.
+@var{argument}.
 The following program reads numbers, one number per line, and prints the
 square root of each one:
 
@@ -9063,6 +9176,34 @@ $ awk '@{ print "The square root of", $1, "is", sqrt($1) @}'
 @kbd{@value{CTL}-d}
 @end example
 
+A function can also have side effects, such as assigning
+values to certain variables or doing I/O.
+This program shows how the @samp{match} function
+(@pxref{String Functions})
+changes the variables @code{RSTART} and @code{RLENGTH}:
+
+@example
+@{
+    if (match($1, $2))
+        print RSTART, RLENGTH
+    else
+        print "no match"
+@}
+@end example
+
+@noindent
+Here is a sample run:
+
+@example
+$ awk -f matchit.awk 
+aaccdd  c+
+@print{} 3 2
+foo     bar
+@print{} no match
+abcdefg e
+@print{} 5 1
+@end example
+
 @node Precedence
 @section Operator Precedence (How Operators Nest)
 @c STARTOFRANGE prec
@@ -9093,14 +9234,20 @@ exponentiation operators, which group in the opposite order.
 Thus, @samp{a - b + c} groups as @samp{(a - b) + c} and
 @samp{a = b = c} groups as @samp{a = (b = c)}.
 
-The precedence of prefix unary operators does not matter as long as only
-unary operators are involved, because there is only one way to interpret
+Normally the precedence of prefix unary operators does not matter,
+because there is only one way to interpret
 them: innermost first.  Thus, @samp{$++i} means @samp{$(++i)} and
 @samp{++$x} means @samp{++($x)}.  However, when another operator follows
 the operand, then the precedence of the unary operators can matter.
 @samp{$x^2} means @samp{($x)^2}, but @samp{-x^2} means
 @samp{-(x^2)}, because @samp{-} has lower precedence than @samp{^},
 whereas @samp{$} has higher precedence.
+Also, operators cannot be combined in a way that violates the
+precedence rules; for example, @samp{$$0++--} is not a valid
+expression because the first @samp{$} has higher precedence than the
+@samp{++}; to avoid the problem the expression can be rewritten as
+@samp{$($0++)--}.
+
 This table presents @command{awk}'s operators, in order of highest
 to lowest precedence:
 
@@ -9144,7 +9291,7 @@ Unary plus, minus, logical ``not.''
 @cindex @code{%} (percent sign), @code{%} operator
 @cindex percent sign (@code{%}), @code{%} operator
 @item * / %
-Multiplication, division, modulus.
+Multiplication, division, remainder.
 
 @cindex @code{+} (plus sign), @code{+} operator
 @cindex plus sign (@code{+}), @code{+} operator
@@ -11168,9 +11315,9 @@ BEGIN @{
             verbose = 1
         else if (ARGV[i] == "-d")
             debug = 1
-        else if (ARGV[i] ~ /^-?/) @{
+        else if (ARGV[i] ~ /^-./) @{
             e = sprintf("%s: unrecognized option -- %c",
-                    ARGV[0], substr(ARGV[i], 1, ,1))
+                    ARGV[0], substr(ARGV[i], 2, 1))
             print e > "/dev/stderr"
         @} else
             break
@@ -12699,7 +12846,7 @@ store a modified value there.  If this argument is omitted, then the
 default is to use and alter @code{$0}.@footnote{Note that this means
 that the record will first be regenerated using the value of @code{OFS} if
 any fields have been changed, and that the fields will be updated
-after the substituion, even if the operation is a ``no-op'' such
+after the substitution, even if the operation is a ``no-op'' such
 as @samp{sub(/^/, "")}.}
 For example:
 
@@ -13112,7 +13259,7 @@ to produce a @samp{\} preceding the matched text. This is shown in
 @ref{table-sub-proposed}.
 
 @float Table,table-sub-proposed
-@caption{Propsosed rules for sub and backslash}
+@caption{Proposed rules for sub and backslash}
 @tex
 \vbox{\bigskip
 % This table has lots of &'s and \'s, so unspecialize them.
@@ -13425,7 +13572,7 @@ Some operating systems cannot implement the @code{system} function.
 @c fakenode --- for prepinfo
 @subheading Advanced Notes: Interactive Versus Noninteractive Buffering
 @cindex advanced features, buffering
-@cindex buffering, interactive vs. noninteractive
+@cindex buffering, interactive vs.@: noninteractive
 
 As a side point, buffering issues can be even more confusing, depending
 upon whether your program is @dfn{interactive}, i.e., communicating
@@ -13598,12 +13745,15 @@ whether daylight savings time is in effect for the specified time.
 If @var{datespec} does not contain enough elements or if the resulting time
 is out of range, @code{mktime} returns @minus{}1.
 
-@item strftime(@r{[}@var{format} @r{[}, @var{timestamp}@r{]]})
+@item strftime(@r{[}@var{format} @r{[}, @var{timestamp} @r{[}, @var{utc-flag}@r{]]]})
 @c STARTOFRANGE strf
 @cindex @code{strftime} function (@command{gawk})
 This function returns a string.  It is similar to the function of the
 same name in ISO C.  The time specified by @var{timestamp} is used to
 produce a string, based on the contents of the @var{format} string.
+If @var{utc-flag} is present and is either non-zero or non-null, the value
+is formatted as UTC (Coordinated Universal Time, formerly GMT or Greenwich
+Mean Time). Otherwise, the value is formatted for the local time zone.
 The @var{timestamp} is in the same format as the value returned by the
 @code{systime} function.  If no @var{timestamp} argument is supplied,
 @command{gawk} uses the current time of day as the timestamp.
@@ -13805,8 +13955,9 @@ Thus, the @samp{%x} specification in a @code{"US"} locale might produce
 locale, which is an environment that is typical of what most C programmers
 are used to.
 
-A public-domain C version of @code{strftime} is supplied with @command{gawk}
-for systems that are not yet fully standards-compliant.
+For systems that are not yet fully standards-compliant,
+@command{gawk} supplies a copy of
+@code{strftime} from the GNU C Library.
 It supports all of the just listed format specifications.
 If that version is
 used to compile @command{gawk} (@pxref{Installation}),
@@ -13821,6 +13972,7 @@ Single-digit numbers are padded with a space.
 The hour (12-hour clock) as a decimal number (1--12).
 Single-digit numbers are padded with a space.
 
+@ignore
 @item %N
 The ``Emperor/Era'' name.
 Equivalent to @code{%C}.
@@ -13828,12 +13980,15 @@ Equivalent to @code{%C}.
 @item %o
 The ``Emperor/Era'' year.
 Equivalent to @code{%y}.
+@end ignore
 
 @item %s
 The time as a decimal timestamp in seconds since the epoch.
 
+@ignore
 @item %v
 The date in VMS format (e.g., @samp{20-JUN-1991}).
+@end ignore
 @end table
 @c ENDOFRANGE strf
 
@@ -15241,7 +15396,7 @@ Even though @code{gettext} can return the translated string
 at runtime,
 it cannot change the argument order in the call to @code{printf}.
 
-To solve this problem, @code{printf} format specificiers may have
+To solve this problem, @code{printf} format specifiers may have
 an additional optional element, which we call a @dfn{positional specifier}.
 For example:
 
@@ -15281,7 +15436,7 @@ $ gawk 'BEGIN @{
 @quotation NOTE
 When using @samp{*} with a positional specifier, the @samp{*}
 comes first, then the integer position, and then the @samp{$}.
-This is somewhat counterintutive.
+This is somewhat counterintuitive.
 @end quotation
 
 @cindex @code{printf} statement, positional specifiers, mixing with regular formats
@@ -16130,9 +16285,11 @@ For example, @samp{(3 + 5) * 4} means add three plus five, then multiply
 the total by four.  However, @samp{3 + 5 * 4} has no parentheses, and
 means @samp{3 + (5 * 4)}.
 
+@ignore
 @item
 All string concatenations are parenthesized too.
 (This could be made a bit smarter.)
+@end ignore
 
 @item
 Parentheses are used around the arguments to @code{print}
@@ -16241,6 +16398,8 @@ keyboard.  The @code{INT} signal is generated by the
 @c ENDOFRANGE awkp
 @c ENDOFRANGE proawk
 
+
+
 @node Invoking Gawk
 @chapter Running @command{awk} and @command{gawk}
 
@@ -16525,6 +16684,12 @@ development of cleaner @command{awk} programs.
 With an optional argument of @samp{invalid}, only warnings about things that are
 actually invalid are issued. (This is not fully implemented yet.)
 
+Some warnings are only printed once, even if the dubious constructs they warn
+about occur multiple times in your @command{awk} program.  Thus, when eliminating
+problems pointed out by @option{--lint}, you should take care to search for all
+occurrences of each inappropriate construct. As @command{awk} programs are
+usually short, doing so is not burdensome.
+
 @item -W lint-old
 @itemx --lint-old
 @cindex @code{--lint-old} option
@@ -16596,6 +16761,12 @@ Specifying @samp{-Ft} on the command-line does not set the value
 of @code{FS} to be a single TAB character
 (@pxref{Field Separators}).
 
+@cindex locale decimal point character
+@cindex decimal point character, locale specific
+@item
+The locale's decimal point character is used for parsing input
+data (@pxref{Locales}).
+
 @cindex @code{fflush} function@comma{} unsupported
 @item
 The @code{fflush} built-in function is not supported
@@ -16647,6 +16818,12 @@ This is particularly useful
 when you have library functions that you want to use from your command-line
 programs (@pxref{AWKPATH Variable}).
 
+@item -W use-lc-numeric
+@itemx --use-lc-numeric
+@cindex @code{--use-lc-numeric} option
+This option forces the use of the locale's decimal point character
+when parsing numeric input data (@pxref{Locales}).
+
 @item -W version
 @itemx --version
 @cindex @code{--version} option
@@ -16700,8 +16877,8 @@ If no @option{-f} or @option{--source} option is specified, then @command{gawk}
 uses the first non-option command-line argument as the text of the
 program source code.
 
-@cindex @code{POSIXLY_CORRECT} environment variable
-@cindex lint checking, @code{POSIXLY_CORRECT} environment variable
+@cindex @env{POSIXLY_CORRECT} environment variable
+@cindex lint checking, @env{POSIXLY_CORRECT} environment variable
 @cindex POSIX mode
 If the environment variable @env{POSIXLY_CORRECT} exists,
 then @command{gawk} behaves in strict POSIX mode, exactly as if
@@ -16720,7 +16897,7 @@ POSIXLY_CORRECT=true
 export POSIXLY_CORRECT
 @end example
 
-@cindex @command{csh} utility, @code{POSIXLY_CORRECT} environment variable
+@cindex @command{csh} utility, @env{POSIXLY_CORRECT} environment variable
 For a @command{csh}-compatible
 shell,@footnote{Not recommended.}
 you would add this line to the @file{.login} file in your home directory:
@@ -16729,7 +16906,7 @@ you would add this line to the @file{.login} file in your home directory:
 setenv POSIXLY_CORRECT true
 @end example
 
-@cindex portability, @code{POSIXLY_CORRECT} environment variable
+@cindex portability, @env{POSIXLY_CORRECT} environment variable
 Having @env{POSIXLY_CORRECT} set is not recommended for daily use,
 but it is good for testing the portability of your programs to other
 environments.
@@ -17302,7 +17479,7 @@ is necessary if you are not using @command{gawk}.}
 
 @cindex @code{nextfile} user-defined function
 This initial version has a subtle problem.
-If the same @value{DF} is listed @emph{twice} on the commandline,
+If the same @value{DF} is listed @emph{twice} on the command line,
 one right after the other
 or even with just a variable assignment between them,
 this code skips right through the file a second time, even though
@@ -17318,7 +17495,7 @@ is shown here:
 @ignore
 @c file eg/lib/nextfile.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May, 1993
 
 @c endfile
@@ -17462,7 +17639,7 @@ The use of @code{tolower} simplifies the computation for finding
 the correct numeric value for each hexadecimal digit.
 
 Finally, if the string matches the (rather complicated) regex for a
-regular decimal integer or floating-point numer, the computation
+regular decimal integer or floating-point number, the computation
 @samp{ret = str + 0} lets @command{awk} convert the value to a
 number.
 
@@ -17524,7 +17701,7 @@ Following is the function:
 @c file eg/lib/assert.awk
 
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May, 1993
 
 @c endfile
@@ -17631,7 +17808,7 @@ does unbiased rounding:
 @ignore
 @c file eg/lib/round.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # August, 1996
 
 @c endfile
@@ -17661,10 +17838,11 @@ function round(x,   ival, aval, fraction)
          return ival
    @}
 @}
+@c endfile
+@c don't include test harness in the file that gets installed
 
 # test harness
 @{ print $0, round($0) @}
-@c endfile
 @end example
 
 @node Cliff Random Function
@@ -17675,7 +17853,7 @@ function round(x,   ival, aval, fraction)
 @cindex functions, library, Cliff random numbers
 
 The Cliff random number
-generator@footnote{@uref{http://mathworld.wolfram.com/CliffRandomNumberGenerator.hmtl}}
+generator@footnote{@uref{http://mathworld.wolfram.com/CliffRandomNumberGenerator.html}}
 is a very simple random number generator that ``passes the noise sphere test
 for randomness by showing no structure.''
 It is easily programmed, in less than 10 lines of @command{awk} code:
@@ -17688,7 +17866,7 @@ It is easily programmed, in less than 10 lines of @command{awk} code:
 @ignore
 @c file eg/lib/cliff_rand.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # December 2000
 
 @c endfile
@@ -17742,7 +17920,7 @@ reason to build them into the @command{awk} interpreter:
 @ignore
 @c file eg/lib/ord.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # 16 January, 1992
 # 20 July, 1992, revised
 
@@ -17860,7 +18038,7 @@ assumption since the array was likely created with @code{split}
 @ignore
 @c file eg/lib/join.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 
 @c endfile
@@ -17918,7 +18096,7 @@ time formatted in the same way as the @command{date} utility:
 @ignore
 @c file eg/lib/gettime.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain, May 1993
+# Arnold Robbins, arnold@@skeeve.com, Public Domain, May 1993
 #
 @c endfile
 @end ignore
@@ -18044,7 +18222,7 @@ Besides solving the problem in only nine(!) lines of code, it does so
 # that each take the name of the file being started or
 # finished, respectively.
 @c #
-@c # Arnold Robbins, arnold@@gnu.org, Public Domain
+@c # Arnold Robbins, arnold@@skeeve.com, Public Domain
 @c # January 1992
 
 FILENAME != _oldfilename \
@@ -18097,7 +18275,7 @@ The following version solves the problem:
 @ignore
 @c file eg/lib/ftrans.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # November 1992
 
 @c endfile
@@ -18141,7 +18319,7 @@ For lack of a better name, we'll call it @code{rewind}:
 @ignore
 @c file eg/lib/rewind.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # September 2000
 
 @c endfile
@@ -18204,7 +18382,7 @@ program:
 @ignore
 @c file eg/lib/readable.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # October 2000
 
 @c endfile
@@ -18258,7 +18436,7 @@ the @value{FN} and the position in @code{ARGV} where it was found:
 @ignore
 @c file eg/lib/zerofile.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # June 2003
 
 @c endfile
@@ -18358,7 +18536,7 @@ a library file does the trick:
 @ignore
 @c file eg/lib/noassign.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # October 1999
 
 @c endfile
@@ -18533,7 +18711,7 @@ The discussion that follows walks through the code a bit at a time:
 @ignore
 @c file eg/lib/getopt.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 #
 # Initial version: March, 1991
 # Revised: May, 1993
@@ -18739,6 +18917,15 @@ $ awk -f getopt.awk -v _getopt_test=1 -- -a -x -- xyz abc
 In both runs,
 the first @option{--} terminates the arguments to @command{awk}, so that it does
 not try to interpret the @option{-a}, etc., as its own options.
+
+@quotation NOTE
+After @code{getopt} is through, it is the responsibility of the user level
+code to
+clear out all the elements of @code{ARGV} from 1 to @code{Optind},
+so that @command{awk} does not try to process the command-line options
+as @value{FN}s.
+@end quotation
+
 Several of the sample programs presented in
 @ref{Sample Programs},
 use @code{getopt} to process their arguments.
@@ -18811,7 +18998,7 @@ Following is @command{pwcat}, a C program that ``cats'' the password database:
 @ignore
 @c file eg/lib/pwcat.c
 /*
- * Arnold Robbins, arnold@@gnu.org, May 1993
+ * Arnold Robbins, arnold@@skeeve.com, May 1993
  * Public Domain
  */
 
@@ -18940,7 +19127,7 @@ functions of the same names:
 @ignore
 @c file eg/lib/passwdawk.in
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 # Revised October 2000
 
@@ -19161,7 +19348,7 @@ is as follows:
 @ignore
 @c file eg/lib/grcat.c
 /*
- * Arnold Robbins, arnold@@gnu.org, May 1993
+ * Arnold Robbins, arnold@@skeeve.com, May 1993
  * Public Domain
  */
 
@@ -19232,7 +19419,7 @@ The numeric group ID number. This number is unique within the file.
 we cast it to @code{long} for all cases.)
 
 @item Group Member List
-A comma-separated list of usernames.  These users are members of the group.
+A comma-separated list of user names.  These users are members of the group.
 Modern Unix systems allow users to be members of several groups
 simultaneously.  If your system does, then there are elements
 @code{"group1"} through @code{"group@var{N}"} in @code{PROCINFO}
@@ -19252,7 +19439,7 @@ it is usually empty or set to @samp{*}.
 The group's numeric group ID number; this number should be unique within the file.
 
 @item Group member list @tab
-A comma-separated list of usernames.  These users are members of the group.
+A comma-separated list of user names.  These users are members of the group.
 Modern Unix systems allow users to be members of several groups
 simultaneously.  If your system does, then there are elements
 @code{"group1"} through @code{"group@var{N}"} in @code{PROCINFO}
@@ -19286,7 +19473,7 @@ There are several, modeled after the C library functions of the same names:
 @ignore
 @c file eg/lib/groupawk.in
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 # Revised October 2000
 
@@ -19362,7 +19549,7 @@ scanning the group information.
 The group information is stored is several associative arrays.
 The arrays are indexed by group name (@code{@w{_gr_byname}}), by group ID number
 (@code{@w{_gr_bygid}}), and by position in the database (@code{@w{_gr_bycount}}).
-There is an additional array indexed by username (@code{@w{_gr_groupsbyuser}}),
+There is an additional array indexed by user name (@code{@w{_gr_groupsbyuser}}),
 which is a space-separated list of groups to which each user belongs.
 
 Unlike the user database, it is possible to have multiple records in the
@@ -19375,7 +19562,7 @@ tvpeople:*:101:david,conan,tom,joan
 @end example
 
 For this reason, @code{_gr_init} looks to see if a group name or
-group ID number is already seen.  If it is, then the usernames are
+group ID number is already seen.  If it is, then the user names are
 simply concatenated onto the previous list of users.  (There is actually a
 subtle problem with the code just presented.  Suppose that
 the first time there were no names. This code adds the names with
@@ -19423,7 +19610,7 @@ function getgrgid(gid)
 
 @cindex @code{getgruser} function (C library)
 The @code{getgruser} function does not have a C counterpart. It takes a
-username and returns the list of groups that have the user as a member:
+user name and returns the list of groups that have the user as a member:
 
 @cindex @code{getgruser} function, user-defined
 @example
@@ -19645,7 +19832,7 @@ supplied:
 @ignore
 @c file eg/prog/cut.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 
 @c endfile
@@ -19735,7 +19922,9 @@ Special care is taken when the field delimiter is a space.  Using
 a single space (@code{@w{" "}}) for the value of @code{FS} is
 incorrect---@command{awk} would separate fields with runs of spaces,
 tabs, and/or newlines, and we want them to be separated with individual
-spaces.  Also, note that after @code{getopt} is through, we have to
+spaces.  Also remember that after @code{getopt} is through
+(as described in @ref{Getopt Function}),
+we have to
 clear out all the elements of @code{ARGV} from 1 to @code{Optind},
 so that @command{awk} does not try to process the command-line options
 as @value{FN}s.
@@ -19983,7 +20172,7 @@ that processes the command-line arguments with @code{getopt}.  The @option{-i}
 @ignore
 @c file eg/prog/egrep.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 
 @c endfile
@@ -20252,7 +20441,7 @@ numbers:
 @ignore
 @c file eg/prog/id.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 # Revised February 1996
 
@@ -20390,7 +20579,7 @@ is used as the prefix for the output @value{FN}s:
 @ignore
 @c file eg/prog/split.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 
 @c endfile
@@ -20532,7 +20721,7 @@ Finally, @command{awk} is forced to read the standard input by setting
 @ignore
 @c file eg/prog/tee.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 # Revised December 1995
 
@@ -20697,7 +20886,7 @@ standard output, @file{/dev/stdout}:
 @ignore
 @c file eg/prog/uniq.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 
 @c endfile
@@ -20935,7 +21124,7 @@ command line:
 @ignore
 @c file eg/prog/wc.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 @c endfile
 @end ignore
@@ -21126,7 +21315,7 @@ word, comparing it to the previous one:
 @ignore
 @c file eg/prog/dupword.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # December 1991
 # Revised October 2000
 
@@ -21192,7 +21381,7 @@ Here is the program:
 @ignore
 @c file eg/prog/alarm.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 
 @c endfile
@@ -21391,7 +21580,7 @@ Finally, the processing rule simply calls @code{translate} for each record:
 @ignore
 @c file eg/prog/translate.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # August 1989
 
 @c endfile
@@ -21523,7 +21712,7 @@ not have been an even multiple of 20 labels in the data:
 @ignore
 @c file eg/prog/labels.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # June 1992
 @c endfile
 @end ignore
@@ -21751,7 +21940,7 @@ The @code{END} rule simply prints out the lines, in order:
 @ignore
 @c file eg/prog/histsort.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 
 @c endfile
@@ -21901,7 +22090,7 @@ exits with a zero exit status, signifying OK:
 @ignore
 @c file eg/prog/extract.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # May 1993
 # Revised September 2000
 
@@ -22087,7 +22276,7 @@ are provided, the standard input is used:
 @ignore
 @c file eg/prog/awksed.awk
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # August 1995
 
 @c endfile
@@ -22318,7 +22507,7 @@ The program is as follows:
 @ignore
 @c file eg/prog/igawk.sh
 #
-# Arnold Robbins, arnold@@gnu.org, Public Domain
+# Arnold Robbins, arnold@@skeeve.com, Public Domain
 # July 1993
 
 @c endfile
@@ -22330,7 +22519,7 @@ then
     shift
 fi
 
-# A literal newline, so that program text is formmatted correctly
+# A literal newline, so that program text is formatted correctly
 n='
 '
 
@@ -22769,10 +22958,17 @@ The @code{ARGC}, @code{ARGV}, @code{FNR}, @code{RLENGTH}, @code{RSTART},
 and @code{SUBSEP} built-in variables (@pxref{Built-in Variables}).
 
 @item
+Assignable @code{$0}.
+
+@item
 The conditional expression using the ternary operator @samp{?:}
 (@pxref{Conditional Exp}).
 
 @item
+The expression @samp{@var{index} in @var{array}} outside of @samp{for}
+statements (@pxref{Reference to Elements}).
+
+@item
 The exponentiation operator @samp{^}
 (@pxref{Arithmetic Ops}) and its assignment operator
 form @samp{^=} (@pxref{Assignment Ops}).
@@ -22785,7 +22981,8 @@ programs (@pxref{Precedence}).
 Regexps as the value of @code{FS}
 (@pxref{Field Separators}) and as the
 third argument to the @code{split} function
-(@pxref{String Functions}).
+(@pxref{String Functions}), rather than using only the first character
+of @code{FS}.
 
 @item
 Dynamic regexps as operands of the @samp{~} and @samp{!~} operators
@@ -22931,6 +23128,10 @@ of @code{FS} to be a single TAB character
 (@pxref{Field Separators}).
 
 @item
+The locale's decimal point character is used for parsing input
+data (@pxref{Locales}).
+
+@item
 The @code{fflush} built-in function is not supported
 (@pxref{I/O Functions}).
 @end itemize
@@ -23012,7 +23213,7 @@ The ability to delete all of an array at once with @samp{delete @var{array}}
 @appendixsec Extensions in @command{gawk} Not in POSIX @command{awk}
 
 @ignore
-I've tried to follow this general order, esp. for the 3.0 and 3.1 sections:
+I've tried to follow this general order, esp.@: for the 3.0 and 3.1 sections:
        variables
        special files
        language changes (e.g., hex constants)
@@ -23296,11 +23497,21 @@ profiles of @command{awk} programs
 (@pxref{Profiling}).
 
 @item
+The @option{--use-lc-numeric} option to force @command{gawk}
+to use the locale's decimal point for parsing input data
+(@pxref{Conversion}).
+
+@item
 The @option{--enable-portals} configuration option to enable special treatment of
 pathnames that begin with @file{/p} as BSD portals
 (@pxref{Portal Files}).
 
 @item
+The @option{--disable-directories-fatal} configuration option which
+causes @command{gawk} to silently skip directories named on the
+command line (@pxref{Additional Configuration Options}).
+
+@item
 The use of GNU Automake to help in standardizing the configuration process
 (@pxref{Quick Installation}).
 
@@ -23334,7 +23545,7 @@ POSIX compliance for @code{sub} and @code{gsub}
 (@pxref{Gory Details}).
 
 @item
-The @option{--exec} option, for use in CGI scripts.
+The @option{--exec} option, for use in CGI scripts
 (@pxref{Options}).
 
 @item
@@ -23342,6 +23553,11 @@ The @code{length} function was extended to accept an array argument
 and return the number of elements in the array
 (@pxref{String Functions}).
 
+@item
+The @code{strftime} function acquired a third argument to
+enable printing times as UTC
+(@pxref{Time Functions}).
+
 @end itemize
 
 @c XXX ADD MORE STUFF HERE
@@ -23481,7 +23697,9 @@ code and documentation, and motivated the inclusion of the @samp{|&} operator.
 @item
 @cindex Davies, Stephen
 Stephen Davies
-provided the port to Tandem systems and its documentation.
+provided the initial port to Tandem systems and its documentation.
+Matthew Woehlke provided improvements for Tandem's POSIX-compliant
+systems.
 
 @item
 @cindex Brown, Martin
@@ -23498,7 +23716,8 @@ GNU Automake and @code{gettext}.
 @cindex Broder, Alan J.@:
 Alan J.@: Broder
 provided the initial version of the @code{asort} function
-as well as the code for the new optional third argument to the @code{match} function.
+as well as the code for the new optional third argument to the
+@code{match} function.
 
 @item
 @cindex Buening, Andreas
@@ -23942,6 +24161,11 @@ to fail.  This option may be removed at a later date.
 Disable all message-translation facilities.
 This is usually not desirable, but it may bring you some slight performance
 improvement.
+
+@cindex @code{--disable-directories-fatal} configuration option
+@cindex configuration option, @code{--disable-directories-fatal}
+@item --disable-directories-fatal
+Causes @command{gawk} to silently skip directories named on the command line.
 @end table
 
 As of version 3.1.5, the @option{--with-included-gettext} configuration
@@ -24084,7 +24308,7 @@ under Unix.
 If these steps do not work, please send in a bug report
 (@pxref{Bugs}).
 
-@c Rewritten by Scott Deifik <scottd@amgen.com>
+@c Rewritten by Scott Deifik <scottd.mail@sbcglobal.net>
 @c and Darrel Hankerson <hankedr@mail.auburn.edu>
 
 @node PC Installation
@@ -24508,6 +24732,7 @@ This @value{SUBSECTION} describes how to compile and install @command{gawk} unde
 * VMS Installation Details::    How to install @command{gawk} under VMS.
 * VMS Running::                 How to run @command{gawk} under VMS.
 * VMS POSIX::                   Alternate instructions for VMS POSIX.
+* VMS Old Gawk::                An old version comes with some VMS systems.
 @end menu
 
 @node VMS Compilation
@@ -24674,6 +24899,21 @@ Once built, @command{gawk} works like any other shell utility.  Unlike
 the normal VMS port of @command{gawk}, no special command-line manipulation is
 needed in the VMS POSIX environment.
 
+@node VMS Old Gawk
+@appendixsubsubsec Some VMS Systems Have An Old Version of @command{gawk}
+
+@c Thanks to "gerard labadie" <gerard.labadie@gmail.com>
+
+Some versions of VMS have an old version of @command{gawk}.  To access it,
+define a symbol, as follows:
+
+@example
+$ @kbd{gawk :== $ sys$common:[syshlp.examples.tcpip.snmp]gawk.exe}
+@end example
+
+This is apparently @value{PVERSION} 2.15.6, which is quite old. We
+recommend compiling and using the current version.
+
 @node Unsupported
 @appendixsec Unsupported Operating System Ports
 
@@ -24891,7 +25131,7 @@ Please include the version number of @command{gawk} you are using.
 You can get this information with the command @samp{gawk --version}.
 Using this address automatically sends a carbon copy of your
 mail to me.  If necessary, I can be reached directly at
-@email{arnold@@gnu.org}.  The bug reporting address is preferred since the
+@email{arnold@@skeeve.com}.  The bug reporting address is preferred since the
 email list is archived at the GNU Project.
 @emph{All email should be in English, since that is my native language.}
 
@@ -24930,7 +25170,7 @@ Martin Brown, @email{mc@@whoever.com}.
 @cindex Deifik, Scott
 @cindex Hankerson, Darrel
 @item MS-DOS
-Scott Deifik, @email{scottd@@amgen.com} and
+Scott Deifik, @email{scottd.mail@@sbcglobal.net} and
 Darrel Hankerson, @email{hankedr@@mail.auburn.edu}.
 
 @cindex Grigera, Juan
@@ -24959,7 +25199,7 @@ Pat Rankin, @email{rankin@@pactechdata.com}.
 
 @cindex Deifik, Scott
 @cindex Hankerson, Darrel
-@item MS-DOS @tab Scott Deifik, @email{scottd@@amgen.com} and
+@item MS-DOS @tab Scott Deifik, @email{scottd.mail@@sbcglobal.net} and
 Darrel Hankerson, @email{hankedr@@mail.auburn.edu}.
 
 @cindex Grigera, Juan
@@ -24997,7 +25237,7 @@ Date: Wed, 4 Sep 1996 08:11:48 -0700 (PDT)
 Michael Brennan
 @end quotation
 
-There are three other freely available @command{awk} implementations.
+There are a number of other freely available @command{awk} implementations.
 This @value{SECTION} briefly describes where to get them:
 
 @table @asis
@@ -25124,6 +25364,27 @@ profiling.  You may find it at either
 or
 @uref{http://www.math.utah.edu/pub/pawk/pawk-20020210.tar.gz}.
 
+@cindex OpenSolaris
+@cindex Solaris, POSIX compliant @command{awk}
+@item The OpenSolaris POSIX @command{awk}
+The version of @command{awk} in @file{/usr/xpg4/bin} on Solaris is
+POSIX compliant. It is based on the @command{awk} from Mortice Kern
+Systems for PCs.  The source code can be downloaded from
+the OpenSolaris web site.@footnote{@uref{http://www.opensolaris.org}}
+This author was able to make it compile and work under GNU/Linux
+with 1--2 hours of work.  Making it more generally portable (using
+GNU Autoconf and/or Automake) would take more work, and this
+has not been done, at least to our knowledge.
+
+@cindex @command{jawk}
+@cindex Java implementation of @command{awk}
+@item @command{jawk}
+This is an interpreter for @command{awk} written in Java. It claims
+to be a full interpreter, although because it uses Java facilities
+for I/O and for regexp matching, the language it supports is different
+from POSIX @command{awk}.  More information is available on the
+project's home page.@footnote{@uref{http://jawk.sourceforge.net}}.
+
 @end table
 @c ENDOFRANGE gligawk
 @c ENDOFRANGE ingawk
@@ -25406,9 +25667,10 @@ A number of the files that come with @command{gawk} are maintained by other
 people at the Free Software Foundation.  Thus, you should not change them
 unless it is for a very good reason; i.e., changes are not out of the
 question, but changes to these files are scrutinized extra carefully.
-The files are @file{getopt.h}, @file{getopt.c},
-@file{getopt1.c}, @file{regex.h}, @file{regex.c}, @file{dfa.h},
-@file{dfa.c}, @file{install-sh}, and @file{mkinstalldirs}.
+The files are @file{getopt.h}, @file{getopt.c}, @file{getopt1.c},
+@file{regex.h}, @file{regex.c}, @file{regcomp.c}, @file{regex_internal.c},
+@file{regex_internal.h}, @file{regexec.c}, @file{dfa.h}, @file{dfa.c},
+@file{install-sh}, and @file{mkinstalldirs}.
 
 @item
 Be willing to continue to maintain the port.
@@ -25503,7 +25765,7 @@ at some future time.
 @strong{Caution:} If you have written your own dynamic extensions,
 be sure to recompile them for each new @command{gawk} release.
 There is no guarantee of binary compatibility between different
-releases, no will there ever be such a guarantee.
+releases, nor will there ever be such a guarantee.
 
 @menu
 * Internals::                   A brief look at some @command{gawk} internals.
@@ -26822,6 +27084,16 @@ Computer Scientist Should Know About Floating-point Arithmetic,''
 This is worth reading if you are interested in the details,
 but it does require a background in computer science.
 
+@menu
+* String Conversion Precision::    The String Value Can Lie.
+* Unexpected Results::             Floating Point Numbers Are Not
+                                   Abstract Numbers.
+* POSIX Floating Point Problems::  Standards Versus Existing Practice.
+@end menu
+
+@node String Conversion Precision
+@appendixsubsec The String Value Can Lie
+
 Internally, @command{awk} keeps both the numeric value
 (double-precision floating-point) and the string value for a variable.
 Separately, @command{awk} keeps
@@ -26875,6 +27147,9 @@ On most modern machines, most of the time,
 value exactly.@footnote{Pathological cases can require up to
 752 digits (!), but we doubt that you need to worry about this.}
 
+@node Unexpected Results
+@appendixsubsec Floating Point Numbers Are Not Abstract Numbers
+
 @cindex floating-point
 Unlike numbers in the abstract sense (such as what you studied in high school
 or college math), numbers stored in computers are limited in certain ways.
@@ -26927,6 +27202,101 @@ $ gawk 'BEGIN @{ mz = -0 ; pz = 0
 It helps to keep this in mind should you process numeric data
 that contains negative zero values; the fact that the zero is negative
 is noted and can affect comparisons.
+
+@node POSIX Floating Point Problems
+@appendixsubsec Standards Versus Existing Practice
+
+Historically, @command{awk} has converted any non-numeric looking string
+to the numeric value zero, when required.  Furthermore, the original
+definition of the language and the original POSIX standards specified that
+@command{awk} only understands decimal numbers (base 10), and not octal
+(base 8) or hexadecimal numbers (base 16).
+
+As of this writing (February, 2007), changes in the language of the
+current POSIX standard can be interpreted to imply that @command{awk}
+should support additional features.  These features are:
+
+@itemize @bullet
+@item
+Interpretation of floating point data values specified in hexadecimal
+notation (@samp{0xDEADBEEF}). (Note: data values, @emph{not}
+source code constants.)
+
+@item
+Support for the special IEEE 754 floating point values ``Not A Number''
+(NaN), positive Infinity (``inf'') and negative Infinity (``@minus{}inf'').
+In particular, the format for these values is as specified by the ISO C99
+standard, which ignores case and can allow machine-dependent additional
+characters after the @samp{nan} and allow either @samp{inf} or @samp{infinity}.
+@end itemize
+
+The first problem is that both of these are clear changes to historical
+practice:
+
+@itemize @bullet
+@item
+The @command{gawk} maintainer feels that hexadecimal floating
+point values, in particular, is ugly, and was never intended by the
+original designers to be part of the language.
+
+@item
+Allowing completely alphabetic strings to have valid numeric
+values is also a very severe departure from historical practice.
+@end itemize
+
+The second problem is that the @code{gawk} maintainer feels that this
+interpretation of the standard, which requires a certain amount of
+``language lawyering'' to arrive at in the first place, was not intended
+by the standard developers, either.  In other words, ``we see how you
+got where you are, but we don't think that that's where you want to be.''
+
+Nevertheless, on systems that support IEEE floating point, it seems
+reasonable to provide @emph{some} way to support NaN and Infinity values.
+The solution implemented in @command{gawk}, as of version 3.1.6, is
+as follows:
+
+@enumerate 1
+@item
+With the @option{--posix} command-line option, @command{gawk} becomes
+``hands off.'' String values are passed directly to the system library's
+@code{strtod()} function, and if it successfuly returns a numeric value,
+that is what's used.  By definition, the results are not portable across
+different systems.@footnote{You asked for it, you got it.}
+They are also a little surprising:
+
+@example
+$ @kbd{echo nanny | gawk --posix '@{ print $1 + 0 @}'}
+@print{} nan
+$ @kbd{echo 0xDeadBeef | gawk --posix '@{ print $1 + 0 @}'}
+@print{} 3735928559
+@end example
+
+@item
+Without @option{--posix}, @command{gawk} interprets the four strings
+@samp{+inf},
+@samp{-inf},
+@samp{+nan},
+and
+@samp{-nan}
+specially, producing the corresponding special numeric values.
+The leading sign acts a signal to @command{gawk} (and the user)
+that the value is really numeric.  Hexadecimal floating point is
+not supported (unless you also use @option{--non-decimal-data},
+which is @emph{not} recommended). For example:
+
+@example
+$ @kbd{echo nanny | gawk '@{ print $1 + 0 @}'}
+@print{} 0
+$ @kbd{echo +nan | gawk '@{ print $1 + 0 @}'}
+@print{} nan
+$ @kbd{echo 0xDeadBeef | gawk '@{ print $1 + 0 @}'}
+@print{} 0
+@end example
+
+@command{gawk} does ignore case distinction in the four special values.
+Thus @samp{+nan} and @samp{+NaN} are the same.
+@end enumerate
+
 @c ENDOFRANGE procon
 
 @node Glossary
@@ -27380,6 +27750,13 @@ meaning.  Keywords are reserved and may not be used as variable names.
 @code{func},
 and
 @code{exit}.
+If @command{gawk} was configured with the @option{--enable-switch}
+option (@pxref{Switch Statement}), then
+@code{switch},
+@code{case},
+and
+@code{default}
+are also keywords.
 
 @cindex LGPL (Lesser General Public License)
 @cindex Lesser General Public License (LGPL)
@@ -27619,406 +27996,729 @@ A sequence of space, TAB, or newline characters occurring inside an input
 record or a string.
 @end table
 
+@c The GNU General Public License.
 @node Copying
 @unnumbered GNU General Public License
-@center Version 2, June 1991
+@center Version 3, 29 June 2007
+
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.  
 
 @display
-Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02111, USA
+Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
 
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
 @end display
 
 @c fakenode --- for prepinfo
-@unnumberedsec Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
+@heading Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program---to make sure it remains
+free software for all its users.  We, the Free Software Foundation,
+use the GNU General Public License for most of our software; it
+applies also to any other work released this way by its authors.  You
+can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too,
+receive or can get the source code.  And you must show them these
+terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so.  This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software.  The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products.  If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary.  To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
 modification follow.
 
-@ifnotinfo
 @c fakenode --- for prepinfo
-@unnumberedsec Terms and Conditions for Copying, Distribution and Modification
-@end ifnotinfo
-@ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end ifinfo
+@heading TERMS AND CONDITIONS
 
 @enumerate 0
-@item
-This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The ``Program'', below,
-refers to any such program or work, and a ``work based on the Program''
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term ``modification''.)  Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-@item
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-@item
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+@item Definitions.
+
+``This License'' refers to version 3 of the GNU General Public License.
+
+``Copyright'' also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+``The Program'' refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as ``you''.  ``Licensees'' and
+``recipients'' may be individuals or organizations.
+
+To ``modify'' a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy.  The resulting work is called a ``modified version'' of
+the earlier work or a work ``based on'' the earlier work.
+
+A ``covered work'' means either the unmodified Program or a work based
+on the Program.
+
+To ``propagate'' a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To ``convey'' a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays ``Appropriate Legal Notices'' to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+@item Source Code.
+
+The ``source code'' for a work means the preferred form of the work for
+making modifications to it.  ``Object code'' means any non-source form
+of a work.
+
+A ``Standard Interface'' means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The ``System Libraries'' of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+``Major Component'', in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The ``Corresponding Source'' for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+@item Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright.  Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+@item Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+@item Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+@item Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
 
 @enumerate a
+@item 
+The work must carry prominent notices stating that you modified it,
+and giving a relevant date.
+
 @item
-You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
+The work must carry prominent notices stating that it is released
+under this License and any conditions added under section 7.  This
+requirement modifies the requirement in section 4 to ``keep intact all
+notices''.
 
 @item
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
+You must license the entire work, as a whole, under this License to
+anyone who comes into possession of a copy.  This License will
+therefore apply, along with any applicable section 7 additional terms,
+to the whole of the work, and all its parts, regardless of how they
+are packaged.  This License gives no permission to license the work in
+any other way, but it does not invalidate such permission if you have
+separately received it.
 
 @item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
+If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your work
+need not make them do so.
 @end enumerate
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+``aggregate'' if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+@item  Conveying Non-Source Forms.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
 
+@enumerate a
 @item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium customarily
+used for software interchange.
+
+@item
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a written
+offer, valid for at least three years and valid for as long as you
+offer spare parts or customer support for that product model, to give
+anyone who possesses the object code either (1) a copy of the
+Corresponding Source for all the software in the product that is
+covered by this License, on a durable physical medium customarily used
+for software interchange, for a price no more than your reasonable
+cost of physically performing this conveying of source, or (2) access
+to copy the Corresponding Source from a network server at no charge.
+
+@item
+Convey individual copies of the object code with a copy of the written
+offer to provide the Corresponding Source.  This alternative is
+allowed only occasionally and noncommercially, and only if you
+received the object code with such an offer, in accord with subsection
+6b.
+
+@item
+Convey the object code by offering access from a designated place
+(gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to copy
+the object code is a network server, the Corresponding Source may be
+on a different server (operated by you or a third party) that supports
+equivalent copying facilities, provided you maintain clear directions
+next to the object code saying where to find the Corresponding Source.
+Regardless of what server hosts the Corresponding Source, you remain
+obligated to ensure that it is available for as long as needed to
+satisfy these requirements.
+
+@item
+Convey the object code using peer-to-peer transmission, provided you
+inform other peers where the object code and Corresponding Source of
+the work are being offered to the general public at no charge under
+subsection 6d.
+
+@end enumerate
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A ``User Product'' is either (1) a ``consumer product'', which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling.  In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage.  For a particular product received by a particular user,
+``normally used'' refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product.  A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+``Installation Information'' for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source.  The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed.  Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+@item Additional Terms.
+
+``Additional permissions'' are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
 
 @enumerate a
 @item
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
+Disclaiming warranty or limiting liability differently from the terms
+of sections 15 and 16 of this License; or
 
 @item
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
+Requiring preservation of specified reasonable legal notices or author
+attributions in that material or in the Appropriate Legal Notices
+displayed by works containing it; or
 
 @item
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
-@end enumerate
+Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-@item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+@item
+Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
 
 @item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+Declining to grant rights under trademark law for use of some trade
+names, trademarks, or service marks; or
 
 @item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+Requiring indemnification of licensors and authors of that material by
+anyone who conveys the material (or modified versions of it) with
+contractual assumptions of liability to the recipient, for any
+liability that these contractual assumptions directly impose on those
+licensors and authors.
+@end enumerate
+
+All other non-permissive additional terms are considered ``further
+restrictions'' within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+@item Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+@item Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+@item Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An ``entity transaction'' is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+@item Patents.
+
+A ``contributor'' is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's ``contributor version''.
+
+A contributor's ``essential patent claims'' are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, ``control'' includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-@item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a ``patent license'' is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To ``grant'' such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  ``Knowingly relying'' means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is ``discriminatory'' if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License.  You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+@item No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-@item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+excuse you from the conditions of this License.  If you cannot convey
+a covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all.  For example, if you agree
+to terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+@item Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+@item Revised Versions of this License.
 
-@item
 The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+of the GNU General Public License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
 
 Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-@item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-@ifnotinfo
-@c fakenode --- for prepinfo
-@heading NO WARRANTY
-@end ifnotinfo
-@ifinfo
-@center NO WARRANTY
-@end ifinfo
-
-@item
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW@.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE@.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU@.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+specifies that a certain numbered version of the GNU General Public
+License ``or any later version'' applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation.  If
+the Program does not specify a version number of the GNU General
+Public License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+@item Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+@item Limitation of Liability.
 
-@item
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+@item Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
 @end enumerate
 
-@ifnotinfo
 @c fakenode --- for prepinfo
 @heading END OF TERMS AND CONDITIONS
-@end ifnotinfo
-@ifinfo
-@center END OF TERMS AND CONDITIONS
-@end ifinfo
 
-@page
 @c fakenode --- for prepinfo
-@unnumberedsec How to Apply These Terms to Your New Programs
+@heading How to Apply These Terms to Your New Programs
 
-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+free software which everyone can redistribute and change under these
+terms.
 
-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the ``copyright'' line and a pointer to where the full notice is found.
 
 @smallexample
-@var{one line to give the program's name and an idea of what it does.}
-Copyright (C) @var{year}  @var{name of author}
+@var{one line to give the program's name and a brief idea of what it does.}  
+Copyright (C) @var{year} @var{name of author}
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@.  See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
+along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
 @smallexample
-Gnomovision version 69, Copyright (C) @var{year} @var{name of author}
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-type `show w'.  This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c'
-for details.
+@var{program} Copyright (C) @var{year} @var{name of author} 
+This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
+This is free software, and you are welcome to redistribute it
+under certain conditions; type @samp{show c} for details.
 @end smallexample
 
 The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than @samp{show w} and
-@samp{show c}; they could even be mouse-clicks or menu items---whatever
-suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  Here is a sample; alter the names:
-
-@smallexample
-@group
-Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision'
-(which makes passes at compilers) written
-by James Hacker.
-
-@var{signature of Ty Coon}, 1 April 1989
-Ty Coon, President of Vice
-@end group
-@end smallexample
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+the appropriate parts of the General Public License.  Of course, your
+program's commands might be different; for a GUI interface, you would
+use an ``about box''.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a ``copyright disclaimer'' for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+@url{http://www.gnu.org/licenses/}.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs.  If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library.  If this is what you want to do, use
+the GNU Lesser General Public License instead of this License.  But
+first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
 
 @node GNU Free Documentation License
 @unnumbered GNU Free Documentation License
@@ -28389,7 +29089,7 @@ permission from their copyright holders, but you may include
 translations of some or all Invariant Sections in addition to the
 original versions of these Invariant Sections.  You may include a
 translation of this License, and all the license notices in the
-Document, and any Warrany Disclaimers, provided that you also include
+Document, and any Warranty Disclaimers, provided that you also include
 the original English version of this License and the original versions
 of those notices and disclaimers.  In case of a disagreement between
 the translation and the original version of this License or a notice
diff --git a/doc/gawkinet.info b/doc/gawkinet.info
index 3c23e3c5..a496f6a2 100644
--- a/doc/gawkinet.info
+++ b/doc/gawkinet.info
@@ -1,12 +1,11 @@
-This is gawkinet.info, produced by makeinfo version 4.6 from
-gawkinet.texi.
-
 INFO-DIR-SECTION Network applications
 START-INFO-DIR-ENTRY
+This is gawkinet.info, produced by makeinfo version 4.11 from gawkinet.texi.
+
 * Gawkinet: (gawkinet).         TCP/IP Internetworking With `gawk'.
 END-INFO-DIR-ENTRY
 
-This is Edition 1.1 of `TCP/IP Internetworking With `gawk'', for the
+   This is Edition 1.1 of `TCP/IP Internetworking With `gawk'', for the
 3.1.4 (or later) version of the GNU implementation of AWK.
 
 
@@ -29,7 +28,7 @@ texts being (a) (see below), and with the Back-Cover Texts being (b)
 
    This file documents the networking features in GNU `awk'.
 
-This is Edition 1.1 of `TCP/IP Internetworking With `gawk'', for the
+   This is Edition 1.1 of `TCP/IP Internetworking With `gawk'', for the
 3.1.4 (or later) version of the GNU implementation of AWK.
 
 
@@ -59,7 +58,7 @@ General Introduction
 This file documents the networking features in GNU Awk (`gawk') version
 3.1 and later.
 
-This is Edition 1.1 of `TCP/IP Internetworking With `gawk'', for the
+   This is Edition 1.1 of `TCP/IP Internetworking With `gawk'', for the
 3.1.4 (or later) version of the GNU implementation of AWK.
 
 
@@ -83,7 +82,7 @@ texts being (a) (see below), and with the Back-Cover Texts being (b)
 * Menu:
 
 * Preface::                          About this document.
-* Introduction::                     About networkiing.
+* Introduction::                     About networking.
 * Using Networking::                 Some examples.
 * Some Applications and Techniques:: More extended examples.
 * Links::                            Where to find the stuff mentioned in this
@@ -167,7 +166,7 @@ File: gawkinet.info,  Node: Introduction,  Next: Using Networking,  Prev: Prefac
 1 Networking Concepts
 *********************
 
-This major node provides a (necessarily) brief intoduction to computer
+This major node provides a (necessarily) brief introduction to computer
 networking concepts.  For many applications of `gawk' to TCP/IP
 networking, we hope that this is enough.  For more advanced tasks, you
 will need deeper background, and it may be necessary to switch to
@@ -301,7 +300,7 @@ IP
 UDP
      The User Datagram Protocol.  This is a best effort datagram
      protocol.  It provides a small amount of extra reliability over
-     IP, and adds the notion of "ports", described in *Note TCP and UDP
+     IP, and adds the notion of "ports", described in *note TCP and UDP
      Ports: Ports.
 
 TCP
@@ -394,8 +393,8 @@ the following table, where an "X" indicates that the given action
 blocks.
 
 TCP        X       X
-UDP        X
-RAW        X
+UDP        X       
+RAW        X       
 
    ---------- Footnotes ----------
 
@@ -460,7 +459,7 @@ File: gawkinet.info,  Node: Gawk Special Files,  Next: TCP Connecting,  Prev: Us
 ==================================
 
 The `|&' operator introduced in `gawk' 3.1 for use in communicating
-with a "coprocess" is described in *Note Two-way Communications With
+with a "coprocess" is described in *note Two-way Communications With
 Another Process: (gawk)Two-way I/O.  It shows how to do two-way I/O to a
 separate process, sending it data with `print' or `printf' and reading
 data with `getline'.  If you haven't read it already, you should detour
@@ -487,10 +486,10 @@ fields, all of which are mandatory:
 
      /inet/PROTOCOL/LOCALPORT/HOSTNAME/REMOTEPORT
 
-The `/inet/' field is, of course, constant when accessing the network.
-The LOCALPORT and REMOTEPORT fields do not have a meaning when used
-with `/inet/raw' because "ports" only apply to TCP and UDP. So, when
-using `/inet/raw', the port fields always have to be `0'.
+   The `/inet/' field is, of course, constant when accessing the
+network.  The LOCALPORT and REMOTEPORT fields do not have a meaning
+when used with `/inet/raw' because "ports" only apply to TCP and UDP.
+So, when using `/inet/raw', the port fields always have to be `0'.
 
 * Menu:
 
@@ -546,13 +545,13 @@ REMOTEPORT
      Instead they specify a local port to which clients connect.  It is
      possible to use a name from `/etc/services' here.
 
-Experts in network programming will notice that the usual client/server
-asymmetry found at the level of the socket API is not visible here.
-This is for the sake of simplicity of the high-level concept. If this
-asymmetry is necessary for your application, use another language.  For
-`gawk', it is more important to enable users to write a client program
-with a minimum of code. What happens when first accessing a network
-connection is seen in the following pseudocode:
+   Experts in network programming will notice that the usual
+client/server asymmetry found at the level of the socket API is not
+visible here. This is for the sake of simplicity of the high-level
+concept. If this asymmetry is necessary for your application, use
+another language.  For `gawk', it is more important to enable users to
+write a client program with a minimum of code. What happens when first
+accessing a network connection is seen in the following pseudocode:
 
      if ((name of remote host given) && (other side accepts connection)) {
        rendez-vous successful; transmit with getline or print
@@ -566,54 +565,40 @@ connection is seen in the following pseudocode:
          ready
      }
 
-The exact behavior of this algorithm depends on the values of the
-fields of the special file name. When in doubt, *Note
+   The exact behavior of this algorithm depends on the values of the
+fields of the special file name. When in doubt, *note
 table-inet-components:: gives you the combinations of values and their
 meaning. If this table is too complicated, focus on the three lines
-printed in *bold*. All the examples in *Note Networking With `gawk':
+printed in *bold*. All the examples in *note Networking With `gawk':
 Using Networking, use only the patterns printed in bold letters.
 
 PROTOCOL    LOCAL PORT  HOST NAME   REMOTE      RESULTING CONNECTION-LEVEL
                                     PORT        BEHAVIOR
-------------------------------------------------------------------------------
+------------------------------------------------------------------------------ 
 *tcp*       *0*         *x*         *x*          *Dedicated client, fails if
                                                 immediately connecting to a
                                                             server on the
                                                 other side fails*
-------------------------------------------------------------------------------
 udp         0           x           x           Dedicated client
-------------------------------------------------------------------------------
 raw         0           x           0           Dedicated client, works only
                                                 as `root'
-------------------------------------------------------------------------------
 *tcp, udp*  *x*         *x*         *x*          *Client, switches to
                                                 dedicated server if
                                                 necessary*
-------------------------------------------------------------------------------
 *tcp, udp*  *x*         *0*         *0*          *Dedicated server*
-------------------------------------------------------------------------------
 raw         0           0           0           Dedicated server, works only
                                                 as `root'
-------------------------------------------------------------------------------
 tcp, udp,   x           x           0           Invalid
-raw
-------------------------------------------------------------------------------
+raw                                             
 tcp, udp,   0           0           x           Invalid
-raw
-------------------------------------------------------------------------------
+raw                                             
 tcp, udp,   x           0           x           Invalid
-raw
-------------------------------------------------------------------------------
+raw                                             
 tcp, udp    0           0           0           Invalid
-------------------------------------------------------------------------------
 tcp, udp    0           x           0           Invalid
-------------------------------------------------------------------------------
 raw         x           0           0           Invalid
-------------------------------------------------------------------------------
 raw         0           x           x           Invalid
-------------------------------------------------------------------------------
 raw         x           x           x           Invalid
-------------------------------------------------------------------------------
 
 Table 2.1: /inet Special File Components
 
@@ -654,7 +639,7 @@ sender program:
        close("/inet/tcp/8888/0/0")
      }
 
-The receiver is very simple:
+   The receiver is very simple:
 
      # Client
      BEGIN {
@@ -663,7 +648,7 @@ The receiver is very simple:
        close("/inet/tcp/0/localhost/8888")
      }
 
-TCP guarantees that the bytes arrive at the receiving end in exactly
+   TCP guarantees that the bytes arrive at the receiving end in exactly
 the same order that they were sent. No byte is lost (except for broken
 connections), doubled, or out of order. Some overhead is necessary to
 accomplish this, but this is the price to pay for a reliable service.
@@ -688,7 +673,7 @@ started first:
        close("/inet/udp/8888/0/0")
      }
 
-The receiver is almost identical to the TCP receiver:
+   The receiver is almost identical to the TCP receiver:
 
      # Client
      BEGIN {
@@ -697,7 +682,7 @@ The receiver is almost identical to the TCP receiver:
        close("/inet/udp/0/localhost/8888")
      }
 
-UDP cannot guarantee that the datagrams at the receiving end will
+   UDP cannot guarantee that the datagrams at the receiving end will
 arrive in exactly the same order they were sent. Some datagrams could be
 lost, some doubled, and some out of order. But no overhead is necessary
 to accomplish this. This unreliable behavior is good enough for tasks
@@ -716,7 +701,7 @@ case, the sender has to supply the encapsulating header bytes in front
 of the packet and the receiver has to strip the additional bytes from
 the message.
 
-RAW receivers cannot receive packets sent with TCP or UDP because the
+   RAW receivers cannot receive packets sent with TCP or UDP because the
 operating system does not deliver the packets to a RAW receiver. The
 operating system knows about some of the protocols on top of IP and
 decides on its own which packet to deliver to which process.  (d.c.)
@@ -724,7 +709,7 @@ Therefore, the UDP receiver must be used for receiving UDP datagrams
 sent with the RAW sender. This is a dark corner, not only of `gawk',
 but also of TCP/IP.
 
-For extended experimentation with protocols, look into the approach
+   For extended experimentation with protocols, look into the approach
 implemented in a tool called SPAK.  This tool reflects the hierarchical
 layering of protocols (encapsulation) in the way data streams are piped
 out of one program into the next one.  It shows which protocol is based
@@ -733,9 +718,9 @@ ordering of the program calls.  Cleverly thought out, SPAK is much
 better than `gawk''s `/inet' for learning the meaning of each and every
 bit in the protocol headers.
 
-The next example uses the RAW protocol to emulate the behavior of UDP.
-The sender program is the same as above, but with some additional bytes
-that fill the places of the UDP fields:
+   The next example uses the RAW protocol to emulate the behavior of
+UDP. The sender program is the same as above, but with some additional
+bytes that fill the places of the UDP fields:
 
      BEGIN {
        Message = "Hello world\n"
@@ -752,7 +737,7 @@ that fill the places of the UDP fields:
        close(RawService)
      }
 
-Since this program tries to emulate the behavior of UDP, it checks if
+   Since this program tries to emulate the behavior of UDP, it checks if
 the RAW sender is understood by the UDP receiver but not if the RAW
 receiver can understand the UDP sender. In a real network, the RAW
 receiver is hardly of any use because it gets every IP packet that
@@ -761,15 +746,15 @@ would be too slow for processing them.  Only on a network with little
 traffic can the IP-level receiver program be tested. Programs for
 analyzing IP traffic on modem or ISDN channels should be possible.
 
-Port numbers do not have a meaning when using `/inet/raw'. Their fields
-have to be `0'. Only TCP and UDP use ports. Receiving data from
+   Port numbers do not have a meaning when using `/inet/raw'. Their
+fields have to be `0'. Only TCP and UDP use ports. Receiving data from
 `/inet/raw' is difficult, not only because of processing speed but also
 because data is usually binary and not restricted to ASCII. This
 implies that line separation with `RS' does not work as usual.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) This special file is reserved, but not otherwise currently
+   (1) This special file is reserved, but not otherwise currently
 implemented.
 
 
@@ -789,7 +774,7 @@ the service `daytime' on the machine what time it is:
        close("/inet/tcp/0/localhost/daytime")
      }
 
-Even experienced `awk' users will find the second line strange in two
+   Even experienced `awk' users will find the second line strange in two
 respects:
 
    * A special file is used as a shell command that pipes its output
@@ -802,12 +787,12 @@ respects:
      language needed (apart from the special files) to introduce
      network access.
 
-The `|&' operator was introduced in `gawk' 3.1 in order to overcome the
-crucial restriction that access to files and pipes in `awk' is always
-unidirectional. It was formerly impossible to use both access modes on
-the same file or pipe. Instead of changing the whole concept of file
-access, the `|&' operator behaves exactly like the usual pipe operator
-except for two additions:
+   The `|&' operator was introduced in `gawk' 3.1 in order to overcome
+the crucial restriction that access to files and pipes in `awk' is
+always unidirectional. It was formerly impossible to use both access
+modes on the same file or pipe. Instead of changing the whole concept
+of file access, the `|&' operator behaves exactly like the usual pipe
+operator except for two additions:
 
    * Normal shell commands connected to their `gawk' program with a `|&'
      pipe can be accessed bidirectionally. The `|&' turns out to be a
@@ -817,7 +802,7 @@ except for two additions:
      are not executed as shell commands. Instead, they can be read and
      written to, just like a full-duplex network connection.
 
-In the earlier example, the `|&' operator tells `getline' to read a
+   In the earlier example, the `|&' operator tells `getline' to read a
 line from the special file `/inet/tcp/0/localhost/daytime'.  We could
 also have printed a line into the special file. But instead we just
 read a line with the time, printed it, and closed the connection.
@@ -879,27 +864,28 @@ a look at your `/etc/services' file. It could look like this:
      irc         194/udp
      ...
 
-Here, you find a list of services that traditional Unix machines usually
-support. If your GNU/Linux machine does not do so, it may be that these
-services are switched off in some startup script. Systems running some
-flavor of Microsoft Windows usually do _not_ support these services.
-Nevertheless, it _is_ possible to do networking with `gawk' on Microsoft
-Windows.(1) The first column of the file gives the name of the service,
-and the second column gives a unique number and the protocol that one
-can use to connect to this service.  The rest of the line is treated as
-a comment.  You see that some services (`echo') support TCP as well as
-UDP.
-
----------- Footnotes ----------
-
-(1) Microsoft prefered to ignore the TCP/IP family of protocols until
-1995. Then came the rise of the Netscape browser as a landmark "killer
-application." Microsoft added TCP/IP support and their own browser to
-Microsoft Windows 95 at the last minute. They even back-ported their
-TCP/IP implementation to Microsoft Windows for Workgroups 3.11, but it
-was a rather rudimentary and half-hearted implementation. Nevertheless,
-the equivalent of `/etc/services' resides under
-`C:\WINNT\system32\drivers\etc\services' on Microsoft Windows 2000.
+   Here, you find a list of services that traditional Unix machines
+usually support. If your GNU/Linux machine does not do so, it may be
+that these services are switched off in some startup script. Systems
+running some flavor of Microsoft Windows usually do _not_ support these
+services.  Nevertheless, it _is_ possible to do networking with `gawk'
+on Microsoft Windows.(1) The first column of the file gives the name of
+the service, and the second column gives a unique number and the
+protocol that one can use to connect to this service.  The rest of the
+line is treated as a comment.  You see that some services (`echo')
+support TCP as well as UDP.
+
+   ---------- Footnotes ----------
+
+   (1) Microsoft preferred to ignore the TCP/IP family of protocols
+until 1995. Then came the rise of the Netscape browser as a landmark
+"killer application." Microsoft added TCP/IP support and their own
+browser to Microsoft Windows 95 at the last minute. They even
+back-ported their TCP/IP implementation to Microsoft Windows for
+Workgroups 3.11, but it was a rather rudimentary and half-hearted
+implementation. Nevertheless, the equivalent of `/etc/services' resides
+under `C:\WINNT\system32\drivers\etc\services' on Microsoft Windows
+2000.
 
 
 File: gawkinet.info,  Node: Interacting,  Next: Setting Up,  Prev: Troubleshooting,  Up: Using Networking
@@ -921,14 +907,14 @@ name in your local network:
        close(NetService)
      }
 
-After telling the service on the machine which user to look for, the
+   After telling the service on the machine which user to look for, the
 program repeatedly reads lines that come as a reply. When no more lines
 are coming (because the service has closed the connection), the program
 also closes the connection. Try replacing `"NAME"' with your login name
 (or the name of someone else logged in).  For a list of all users
 currently logged in, replace NAME with an empty string (`""').
 
-The final `close' command could be safely deleted from the above
+   The final `close' command could be safely deleted from the above
 script, because the operating system closes any open connection by
 default when a script reaches the end of execution. In order to avoid
 portability problems, it is best to always close connections explicitly.
@@ -936,18 +922,18 @@ With the Linux kernel, for example, proper closing results in flushing
 of buffers. Letting the close happen by default may result in
 discarding buffers.
 
-When looking at `/etc/services' you may have noticed that the `daytime'
-service is also available with `udp'. In the earlier example, change
-`tcp' to `udp', and change `finger' to `daytime'.  After starting the
-modified program, you see the expected day and time message.  The
-program then hangs, because it waits for more lines coming from the
-service. However, they never come. This behavior is a consequence of the
-differences between TCP and UDP. When using UDP, neither party is
-automatically informed about the other closing the connection.
-Continuing to experiment this way reveals many other subtle differences
-between TCP and UDP. To avoid such trouble, one should always remember
-the advice Douglas E. Comer and David Stevens give in Volume III of
-their series `Internetworking With TCP' (page 14):
+   When looking at `/etc/services' you may have noticed that the
+`daytime' service is also available with `udp'. In the earlier example,
+change `tcp' to `udp', and change `finger' to `daytime'.  After
+starting the modified program, you see the expected day and time
+message.  The program then hangs, because it waits for more lines
+coming from the service. However, they never come. This behavior is a
+consequence of the differences between TCP and UDP. When using UDP,
+neither party is automatically informed about the other closing the
+connection.  Continuing to experiment this way reveals many other subtle
+differences between TCP and UDP. To avoid such trouble, one should
+always remember the advice Douglas E. Comer and David Stevens give in
+Volume III of their series `Internetworking With TCP' (page 14):
 
      When designing client-server applications, beginners are strongly
      advised to use TCP because it provides reliable,
@@ -969,32 +955,32 @@ a server does not know in advance who is going to connect to it over
 the network. Therefore, we cannot insert a name for the host to connect
 to in our special file name.
 
-Start the following program in one window. Notice that the service does
-not have the name `daytime', but the number `8888'.  From looking at
-`/etc/services', you know that names like `daytime' are just mnemonics
-for predetermined 16-bit integers.  Only the system administrator
-(`root') could enter our new service into `/etc/services' with an
-appropriate name.  Also notice that the service name has to be entered
-into a different field of the special file name because we are setting
-up a server, not a client:
+   Start the following program in one window. Notice that the service
+does not have the name `daytime', but the number `8888'.  From looking
+at `/etc/services', you know that names like `daytime' are just
+mnemonics for predetermined 16-bit integers.  Only the system
+administrator (`root') could enter our new service into `/etc/services'
+with an appropriate name.  Also notice that the service name has to be
+entered into a different field of the special file name because we are
+setting up a server, not a client:
 
      BEGIN {
        print strftime() |& "/inet/tcp/8888/0/0"
        close("/inet/tcp/8888/0/0")
      }
 
-Now open another window on the same machine.  Copy the client program
-given as the first example (*note Establishing a TCP Connection: TCP
-Connecting.)  to a new file and edit it, changing the name `daytime' to
-`8888'.  Then start the modified client.  You should get a reply like
-this:
+   Now open another window on the same machine.  Copy the client
+program given as the first example (*note Establishing a TCP
+Connection: TCP Connecting.)  to a new file and edit it, changing the
+name `daytime' to `8888'.  Then start the modified client.  You should
+get a reply like this:
 
      Sat Sep 27 19:08:16 CEST 1997
 
 Both programs explicitly close the connection.
 
-Now we will intentionally make a mistake to see what happens when the
-name `8888' (the so-called port) is already used by another service.
+   Now we will intentionally make a mistake to see what happens when
+the name `8888' (the so-called port) is already used by another service.
 Start the server program in both windows. The first one works, but the
 second one complains that it could not open the connection. Each port
 on a single machine can only be used by one server program at a time.
@@ -1008,7 +994,7 @@ running some flavor of Microsoft Windows, there is no restriction that
 reserves ports 1 to 1024 for a privileged user; hence, you can start an
 `echo' server there.
 
-Turning this short server program into something really useful is
+   Turning this short server program into something really useful is
 simple.  Imagine a server that first reads a file name from the client
 through the network connection, then does something with the file and
 sends a result back to the client. The server-side processing could be:
@@ -1042,7 +1028,7 @@ that communicate with your machine using special protocols. To receive
 email, we will use the Post Office Protocol (POP).  Sending can be done
 with the much older Simple Mail Transfer Protocol (SMTP).
 
-When you type in the following program, replace the EMAILHOST by the
+   When you type in the following program, replace the EMAILHOST by the
 name of your local email server. Ask your administrator if the server
 has a POP service, and then use its name or number in the program below.
 Now the program is ready to connect to your email server, but it will
@@ -1067,19 +1053,19 @@ the first email the server has in store:
        close(POPService)
      }
 
-The record separators `RS' and `ORS' are redefined because the protocol
-(POP) requires CR-LF to separate lines. After identifying yourself to
-the email service, the command `retr 1' instructs the service to send
-the first of all your email messages in line. If the service replies
-with something other than `+OK', the program exits; maybe there is no
-email. Otherwise, the program first announces that it intends to finish
-reading email, and then redefines `RS' in order to read the entire
-email as multiline input in one record. From the POP RFC, we know that
-the body of the email always ends with a single line containing a
-single dot.  The program looks for this using `RS = "\r\n\\.\r\n"'.
-When it finds this sequence in the mail message, it quits.  You can
-invoke this program as often as you like; it does not delete the
-message it reads, but instead leaves it on the server.
+   The record separators `RS' and `ORS' are redefined because the
+protocol (POP) requires CR-LF to separate lines. After identifying
+yourself to the email service, the command `retr 1' instructs the
+service to send the first of all your email messages in line. If the
+service replies with something other than `+OK', the program exits;
+maybe there is no email. Otherwise, the program first announces that it
+intends to finish reading email, and then redefines `RS' in order to
+read the entire email as multiline input in one record. From the POP
+RFC, we know that the body of the email always ends with a single line
+containing a single dot.  The program looks for this using `RS =
+"\r\n\\.\r\n"'.  When it finds this sequence in the mail message, it
+quits.  You can invoke this program as often as you like; it does not
+delete the message it reads, but instead leaves it on the server.
 
 
 File: gawkinet.info,  Node: Web page,  Next: Primitive Service,  Prev: Email,  Up: Using Networking
@@ -1095,12 +1081,12 @@ As in the preceding node, ask your administrator about the name of your
 local web server or proxy web server and its port number for HTTP
 requests.
 
-The following program employs a rather crude approach toward retrieving
-a web page. It uses the prehistoric syntax of HTTP 0.9, which almost all
-web servers still support. The most noticeable thing about it is that
-the program directs the request to the local proxy server whose name
-you insert in the special file name (which in turn calls
-`www.yahoo.com'):
+   The following program employs a rather crude approach toward
+retrieving a web page. It uses the prehistoric syntax of HTTP 0.9,
+which almost all web servers still support. The most noticeable thing
+about it is that the program directs the request to the local proxy
+server whose name you insert in the special file name (which in turn
+calls `www.yahoo.com'):
 
      BEGIN {
        RS = ORS = "\r\n"
@@ -1111,7 +1097,7 @@ you insert in the special file name (which in turn calls
        close(HttpService)
      }
 
-Again, lines are separated by a redefined `RS' and `ORS'.  The `GET'
+   Again, lines are separated by a redefined `RS' and `ORS'.  The `GET'
 request that we send to the server is the only kind of HTTP request
 that existed when the web was created in the early 1990s.  HTTP calls
 this `GET' request a "method," which tells the service to transmit a
@@ -1121,13 +1107,13 @@ HTTP is 1.1,(1) and knows the additional request methods `OPTIONS',
 `PUT', `DELETE', and `TRACE'.  You can fill in any valid web address,
 and the program prints the HTML code of that page to your screen.
 
-Notice the similarity between the responses of the POP and HTTP
+   Notice the similarity between the responses of the POP and HTTP
 services. First, you get a header that is terminated by an empty line,
 and then you get the body of the page in HTML.  The lines of the
 headers also have the same form as in POP. There is the name of a
 parameter, then a colon, and finally the value of that parameter.
 
-Images (`.png' or `.gif' files) can also be retrieved this way, but
+   Images (`.png' or `.gif' files) can also be retrieved this way, but
 then you get binary data that should be redirected into a file. Another
 application is calling a CGI (Common Gateway Interface) script on some
 server. CGI scripts are used when the contents of a web page are not
@@ -1139,11 +1125,11 @@ following:
      get = "GET http://quote.yahoo.com/q?s=MOT&d=t"
      print get |& HttpService
 
-You can also request weather reports this way.
+   You can also request weather reports this way.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Version 1.0 of HTTP was defined in RFC 1945.  HTTP 1.1 was
+   (1) Version 1.0 of HTTP was defined in RFC 1945.  HTTP 1.1 was
 initially specified in RFC 2068. In June 1999, RFC 2068 was made
 obsolete by RFC 2616, an update without any substantial changes.
 
@@ -1162,8 +1148,8 @@ number in the `localport' field of the special file name. The other two
 fields (HOSTNAME and REMOTEPORT) have to contain a `0' because we do
 not know in advance which host will connect to our service.
 
-In the early 1990s, all a server had to do was send an HTML document and
-close the connection. Here, we adhere to the modern syntax of HTTP.
+   In the early 1990s, all a server had to do was send an HTML document
+and close the connection. Here, we adhere to the modern syntax of HTTP.
 The steps are as follows:
 
   1. Send a status line telling the web browser that everything is okay.
@@ -1198,12 +1184,12 @@ The steps are as follows:
        close(HttpService)
      }
 
-Now, on the same machine, start your favorite browser and let it point
-to `http://localhost:8080' (the browser needs to know on which port our
-server is listening for requests). If this does not work, the browser
-probably tries to connect to a proxy server that does not know your
-machine.  If so, change the browser's configuration so that the browser
-does not try to use a proxy to connect to your machine.
+   Now, on the same machine, start your favorite browser and let it
+point to `http://localhost:8080' (the browser needs to know on which
+port our server is listening for requests). If this does not work, the
+browser probably tries to connect to a proxy server that does not know
+your machine.  If so, change the browser's configuration so that the
+browser does not try to use a proxy to connect to your machine.
 
 
 File: gawkinet.info,  Node: Interacting Service,  Next: Simple Server,  Prev: Primitive Service,  Up: Using Networking
@@ -1212,22 +1198,22 @@ File: gawkinet.info,  Node: Interacting Service,  Next: Simple Server,  Prev: Pr
 ==================================
 
 This node shows how to set up a simple web server.  The subnode is a
-library file that we will use with all the examples in *Note Some
+library file that we will use with all the examples in *note Some
 Applications and Techniques::.
 
 * Menu:
 
 * CGI Lib::                     A simple CGI library.
 
-Setting up a web service that allows user interaction is more difficult
-and shows us the limits of network access in `gawk'. In this node, we
-develop  a main program (a `BEGIN' pattern and its action) that will
-become the core of event-driven execution controlled by a graphical
-user interface (GUI).  Each HTTP event that the user triggers by some
-action within the browser is received in this central procedure.
-Parameters and menu choices are extracted from this request, and an
-appropriate measure is taken according to the user's choice.  For
-example:
+   Setting up a web service that allows user interaction is more
+difficult and shows us the limits of network access in `gawk'. In this
+node, we develop  a main program (a `BEGIN' pattern and its action)
+that will become the core of event-driven execution controlled by a
+graphical user interface (GUI).  Each HTTP event that the user triggers
+by some action within the browser is received in this central
+procedure. Parameters and menu choices are extracted from this request,
+and an appropriate measure is taken according to the user's choice.
+For example:
 
      BEGIN {
        if (MyHost == "") {
@@ -1274,7 +1260,7 @@ example:
        }
      }
 
-This web server presents menu choices in the form of HTML links.
+   This web server presents menu choices in the form of HTML links.
 Therefore, it has to tell the browser the name of the host it is
 residing on. When starting the server, the user may supply the name of
 the host from the command line with `gawk -v MyHost="Rumpelstilzchen"'.
@@ -1283,7 +1269,7 @@ it is running on for later use as a web address in HTML documents. The
 same applies to the port number. These values are inserted later into
 the HTML content of the web pages to refer to the home system.
 
-Each server that is built around this core has to initialize some
+   Each server that is built around this core has to initialize some
 application-dependent variables (such as the default home page) in a
 procedure `SetUpServer', which is called immediately before entering the
 infinite loop of the server. For now, we will write an instance that
@@ -1302,13 +1288,14 @@ in human-readable format or in seconds since 1970:
        TopFooter = "</BODY></HTML>"
      }
 
-On the first run through the main loop, the default line terminators are
-set and the default home page is copied to the actual home page. Since
-this is the first run, `GETARG["Method"]' is not initialized yet, hence
-the case selection over the method does nothing. Now that the home page
-is initialized, the server can start communicating to a client browser.
+   On the first run through the main loop, the default line terminators
+are set and the default home page is copied to the actual home page.
+Since this is the first run, `GETARG["Method"]' is not initialized yet,
+hence the case selection over the method does nothing. Now that the
+home page is initialized, the server can start communicating to a
+client browser.
 
-It does so by printing the HTTP header into the network connection
+   It does so by printing the HTTP header into the network connection
 (`print ... |& HttpService'). This command blocks execution of the
 server script until a client connects. If this server script is
 compared with the primitive one we wrote before, you will notice two
@@ -1320,14 +1307,14 @@ the browser retrieves the time of day in the previous example just once,
 and later it takes the web page from the cache, always displaying the
 same time of day although time advances each second.
 
-Having supplied the initial home page to the browser with a valid
+   Having supplied the initial home page to the browser with a valid
 document stored in the parameter `Prompt', it closes the connection and
 waits for the next request.  When the request comes, a log line is
 printed that allows us to see which request the server receives. The
 final step in the loop is to call the function `CGI_setup', which reads
 all the lines of the request (coming from the browser), processes them,
 and stores the transmitted parameters in the array `PARAM'. The complete
-text of these application-independent functions can be found in *Note A
+text of these application-independent functions can be found in *note A
 Simple CGI Library: CGI Lib.  For now, we use a simplified version of
 `CGI_setup':
 
@@ -1351,8 +1338,8 @@ Simple CGI Library: CGI Lib.  For now, we use a simplified version of
        }
      }
 
-At first, the function clears all variables used for global storage of
-request parameters. The rest of the function serves the purpose of
+   At first, the function clears all variables used for global storage
+of request parameters. The rest of the function serves the purpose of
 filling the global parameters with the extracted new values.  To
 accomplish this, the name of the requested resource is split into parts
 and stored for later evaluation. If the request contains a `?', then
@@ -1368,7 +1355,7 @@ working with the `POST' and `PUT' methods, reading the header and body
 becomes inevitable. Header parameters should then be stored in a global
 array as well as the body.
 
-On each subsequent run through the main loop, one request from a
+   On each subsequent run through the main loop, one request from a
 browser is received, evaluated, and answered according to the user's
 choice. This can be done by letting the value of the HTTP method guide
 the main loop into execution of the procedure `HandleGET', which
@@ -1385,7 +1372,7 @@ names. Notice how simple it is to construct menus of arbitrary depth:
        }
      }
 
-The disadvantage of this approach is that our server is slow and can
+   The disadvantage of this approach is that our server is slow and can
 handle only one request at a time. Its main advantage, however, is that
 the server consists of just one `gawk' program. No need for installing
 an `httpd', and no need for static separate HTML files, CGI scripts, or
@@ -1393,16 +1380,16 @@ an `httpd', and no need for static separate HTML files, CGI scripts, or
 started on the same host that runs your browser.  Then let your browser
 point to `http://localhost:8080'.
 
-It is also possible to include images into the HTML pages.  Most
+   It is also possible to include images into the HTML pages.  Most
 browsers support the not very well-known `.xbm' format, which may
 contain only monochrome pictures but is an ASCII format. Binary images
 are possible but not so easy to handle. Another way of including images
 is to generate them with a tool such as GNUPlot, by calling the tool
 with the `system' function or through a pipe.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) As defined in RFC 2068.
+   (1) As defined in RFC 2068.
 
 
 File: gawkinet.info,  Node: CGI Lib,  Prev: Interacting Service,  Up: Interacting Service
@@ -1415,7 +1402,7 @@ File: gawkinet.info,  Node: CGI Lib,  Prev: Interacting Service,  Up: Interactin
      Phil Smith III,
      `http://www.netfunny.com/rhf/jokes/99/Mar/http.html'
 
-In *Note A Web Service with Interaction: Interacting Service, we saw
+   In *note A Web Service with Interaction: Interacting Service, we saw
 the function `CGI_setup' as part of the web server "core logic"
 framework. The code presented there handles almost everything necessary
 for CGI requests.  One thing it doesn't do is handle encoded characters
@@ -1516,11 +1503,11 @@ is the code:
                  MENU[i] = _CGI_decode(MENU[i])
      }
 
-This isolates details in a single function, `CGI_setup'.  Decoding of
-encoded characters is pushed off to a helper function, `_CGI_decode'.
-The use of the leading underscore (`_') in the function name is
-intended to indicate that it is an "internal" function, although there
-is nothing to enforce this:
+   This isolates details in a single function, `CGI_setup'.  Decoding
+of encoded characters is pushed off to a helper function,
+`_CGI_decode'. The use of the leading underscore (`_') in the function
+name is intended to indicate that it is an "internal" function,
+although there is nothing to enforce this:
 
      function _CGI_decode(str,   hexdigs, i, pre, code1, code2,
                                  val, result)
@@ -1550,7 +1537,7 @@ is nothing to enforce this:
         return result
      }
 
-This works by splitting the string apart around an encoded character.
+   This works by splitting the string apart around an encoded character.
 The two digits are converted to lowercase characters and looked up in a
 string of hex digits.  Note that `0' is not in the string on purpose;
 `index' returns zero when it's not found, automatically giving the
@@ -1572,7 +1559,7 @@ above functions:
            printf "GETARG[\"%s\"] = %s\n", i, GETARG[i]
      }
 
-And this is the result when we run it:
+   And this is the result when we run it:
 
      $ gawk -f testserv.awk
      -| MENU["4"] = www.gnu.org
@@ -1603,11 +1590,11 @@ In this node, we finally extend the core to a real application.  No one
 would actually write a commercial web server in `gawk', but it is
 instructive to see that it is feasible in principle.
 
-The application is ELIZA, the famous program by Joseph Weizenbaum that
-mimics the behavior of a professional psychotherapist when talking to
-you.  Weizenbaum would certainly object to this description, but this
-is part of the legend around ELIZA.  Take the site-independent core
-logic and append the following code:
+   The application is ELIZA, the famous program by Joseph Weizenbaum
+that mimics the behavior of a professional psychotherapist when talking
+to you.  Weizenbaum would certainly object to this description, but
+this is part of the legend around ELIZA.  Take the site-independent
+core logic and append the following code:
 
      function SetUpServer() {
        SetUpEliza()
@@ -1631,24 +1618,24 @@ logic and append the following code:
        TopFooter = "</BODY></HTML>"
      }
 
-`SetUpServer' is similar to the previous example, except for calling
+   `SetUpServer' is similar to the previous example, except for calling
 another function, `SetUpEliza'.  This approach can be used to implement
 other kinds of servers.  The only changes needed to do so are hidden in
 the functions `SetUpServer' and `HandleGET'. Perhaps it might be
 necessary to implement other HTTP methods.  The `igawk' program that
 comes with `gawk' may be useful for this process.
 
-When extending this example to a complete application, the first thing
-to do is to implement the function `SetUpServer' to initialize the HTML
-pages and some variables. These initializations determine the way your
-HTML pages look (colors, titles, menu items, etc.).
+   When extending this example to a complete application, the first
+thing to do is to implement the function `SetUpServer' to initialize
+the HTML pages and some variables. These initializations determine the
+way your HTML pages look (colors, titles, menu items, etc.).
 
-The function `HandleGET' is a nested case selection that decides which
-page the user wants to see next.  Each nesting level refers to a menu
-level of the GUI. Each case implements a certain action of the menu. On
-the deepest level of case selection, the handler essentially knows what
-the user wants and stores the answer into the variable that holds the
-HTML page contents:
+   The function `HandleGET' is a nested case selection that decides
+which page the user wants to see next.  Each nesting level refers to a
+menu level of the GUI. Each case implements a certain action of the
+menu. On the deepest level of case selection, the handler essentially
+knows what the user wants and stores the answer into the variable that
+holds the HTML page contents:
 
      function HandleGET() {
        # A real HTTP server would treat some parts of the URI as a file name.
@@ -1679,7 +1666,7 @@ HTML page contents:
        }
      }
 
-Now we are down to the heart of ELIZA, so you can see how it works.
+   Now we are down to the heart of ELIZA, so you can see how it works.
 Initially the user does not say anything; then ELIZA resets its money
 counter and asks the user to tell what comes to mind open heartedly.
 The subsequent answers are converted to uppercase characters and stored
@@ -1732,7 +1719,7 @@ possible answers:
        return answer
      }
 
-In the long but simple function `SetUpEliza', you can see tables for
+   In the long but simple function `SetUpEliza', you can see tables for
 conjugation, keywords, and answers.(1) The associative array `k'
 contains indices into the array of answers `r'. To choose an answer,
 ELIZA just picks an index randomly:
@@ -1771,16 +1758,16 @@ ELIZA just picks an index randomly:
 
      }
 
-Some interesting remarks and details (including the original source code
-of ELIZA) are found on Mark Humphrys' home page.  Yahoo!  also has a
-page with a collection of ELIZA-like programs. Many of them are written
-in Java, some of them disclosing the Java source code, and a few even
-explain how to modify the Java source code.
+   Some interesting remarks and details (including the original source
+code of ELIZA) are found on Mark Humphrys' home page.  Yahoo!  also has
+a page with a collection of ELIZA-like programs. Many of them are
+written in Java, some of them disclosing the Java source code, and a
+few even explain how to modify the Java source code.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) The version shown here is abbreviated.  The full version comes with
-the `gawk' distribution.
+   (1) The version shown here is abbreviated.  The full version comes
+with the `gawk' distribution.
 
 
 File: gawkinet.info,  Node: Caveats,  Next: Challenges,  Prev: Simple Server,  Up: Using Networking
@@ -1800,13 +1787,14 @@ application works or not sometimes depends on the following:
 
    * The state of the party at the other end
 
-The most difficult problems for a beginner arise from the hidden states
-of the underlying network. After closing a TCP connection, it's often
-necessary to wait a short while before reopening the connection. Even
-more difficult is the establishment of a connection that previously
-ended with a "broken pipe."  Those connections have to "time out" for a
-minute or so before they can reopen.  Check this with the command
-`netstat -a', which provides a list of still "active" connections.
+   The most difficult problems for a beginner arise from the hidden
+states of the underlying network. After closing a TCP connection, it's
+often necessary to wait a short while before reopening the connection.
+Even more difficult is the establishment of a connection that
+previously ended with a "broken pipe."  Those connections have to "time
+out" for a minute or so before they can reopen.  Check this with the
+command `netstat -a', which provides a list of still "active"
+connections.
 
 
 File: gawkinet.info,  Node: Challenges,  Prev: Caveats,  Up: Using Networking
@@ -1867,16 +1855,16 @@ program of 1997:
      JUDGE02[10:49:01]I would enjoy all aspects of life no matter what my gender.
      PROGRAM[10:49:02]Do you think of yourself as being attractive?
 
-This program insists on always speaking about the same story around Bill
-Clinton. You see, even a program with a rather narrow mind can behave so
-much like a human being that it can win this prize. It is quite common
-to let these programs talk to each other via network connections. But
-during the competition itself, the program and its computer have to be
-present at the place the competition is held. We all would love to see
-a `gawk' program win in such an event. Maybe it is up to you to
-accomplish this?
+   This program insists on always speaking about the same story around
+Bill Clinton. You see, even a program with a rather narrow mind can
+behave so much like a human being that it can win this prize. It is
+quite common to let these programs talk to each other via network
+connections. But during the competition itself, the program and its
+computer have to be present at the place the competition is held. We
+all would love to see a `gawk' program win in such an event. Maybe it
+is up to you to accomplish this?
 
-Some other ideas for useful networked applications:
+   Some other ideas for useful networked applications:
    * Read the file `doc/awkforai.txt' in the `gawk' distribution.  It
      was written by Ronald P. Loui (Associate Professor of Computer
      Science, at Washington University in St. Louis,
@@ -1965,26 +1953,26 @@ networking world, show new techniques that broaden the scope of
 problems that can be solved with `gawk', and explore leading edge
 technology that may shape the future of networking.
 
-We often refer to the site-independent core of the server that we built
-in *Note A Simple Web Server: Simple Server.  When building new and
-nontrivial servers, we always copy this building block and append new
-instances of the two functions `SetUpServer' and `HandleGET'.
-
-This makes a lot of sense, since this scheme of event-driven execution
-provides `gawk' with an interface to the most widely accepted standard
-for GUIs: the web browser. Now, `gawk' can rival even Tcl/Tk.
-
-Tcl and `gawk' have much in common. Both are simple scripting languages
-that allow us to quickly solve problems with short programs. But Tcl
-has Tk on top of it, and `gawk' had nothing comparable up to now. While
-Tcl needs a large and ever-changing library (Tk, which was bound to the
-X Window System until recently), `gawk' needs just the networking
-interface and some kind of browser on the client's side. Besides better
-portability, the most important advantage of this approach (embracing
-well-established standards such HTTP and HTML) is that _we do not need
-to change the language_. We let others do the work of fighting over
-protocols and standards.  We can use HTML, JavaScript, VRML, or
-whatever else comes along to do our work.
+   We often refer to the site-independent core of the server that we
+built in *note A Simple Web Server: Simple Server.  When building new
+and nontrivial servers, we always copy this building block and append
+new instances of the two functions `SetUpServer' and `HandleGET'.
+
+   This makes a lot of sense, since this scheme of event-driven
+execution provides `gawk' with an interface to the most widely accepted
+standard for GUIs: the web browser. Now, `gawk' can rival even Tcl/Tk.
+
+   Tcl and `gawk' have much in common. Both are simple scripting
+languages that allow us to quickly solve problems with short programs.
+But Tcl has Tk on top of it, and `gawk' had nothing comparable up to
+now. While Tcl needs a large and ever-changing library (Tk, which was
+bound to the X Window System until recently), `gawk' needs just the
+networking interface and some kind of browser on the client's side.
+Besides better portability, the most important advantage of this
+approach (embracing well-established standards such HTTP and HTML) is
+that _we do not need to change the language_. We let others do the work
+of fighting over protocols and standards.  We can use HTML, JavaScript,
+VRML, or whatever else comes along to do our work.
 
 * Menu:
 
@@ -2005,11 +1993,11 @@ File: gawkinet.info,  Node: PANIC,  Next: GETURL,  Prev: Some Applications and T
 3.1 PANIC: An Emergency Web Server
 ==================================
 
-At first glance, the `"Hello, world"' example in *Note A Primitive Web
+At first glance, the `"Hello, world"' example in *note A Primitive Web
 Service: Primitive Service, seems useless. By adding just a few lines,
 we can turn it into something useful.
 
-The PANIC program tells everyone who connects that the local site is
+   The PANIC program tells everyone who connects that the local site is
 not working. When a web server breaks down, it makes a difference if
 customers get a strange "network unreachable" message, or a short
 message telling them that the server has a problem. In such an
@@ -2017,10 +2005,10 @@ emergency, the hard disk and everything on it (including the regular
 web service) may be unavailable. Rebooting the web server off a
 diskette makes sense in this setting.
 
-To use the PANIC program as an emergency web server, all you need are
-the `gawk' executable and the program below on a diskette. By default,
-it connects to port 8080. A different value may be supplied on the
-command line:
+   To use the PANIC program as an emergency web server, all you need
+are the `gawk' executable and the program below on a diskette. By
+default, it connects to port 8080. A different value may be supplied on
+the command line:
 
      BEGIN {
        RS = ORS = "\r\n"
@@ -2058,14 +2046,14 @@ straightforward to write on top of GETURL. On the Internet, you can find
 several programs of the same name that do the same job. They are usually
 much more complex internally and at least 10 times longer.
 
-At first, GETURL checks if it was called with exactly one web address.
-Then, it checks if the user chose to use a special proxy server whose
-name is handed over in a variable. By default, it is assumed that the
-local machine serves as proxy. GETURL uses the `GET' method by default
-to access the web page. By handing over the name of a different method
-(such as `HEAD'), it is possible to choose a different behavior. With
-the `HEAD' method, the user does not receive the body of the page
-content, but does receive the header:
+   At first, GETURL checks if it was called with exactly one web
+address.  Then, it checks if the user chose to use a special proxy
+server whose name is handed over in a variable. By default, it is
+assumed that the local machine serves as proxy. GETURL uses the `GET'
+method by default to access the web page. By handing over the name of a
+different method (such as `HEAD'), it is possible to choose a different
+behavior. With the `HEAD' method, the user does not receive the body of
+the page content, but does receive the header:
 
      BEGIN {
        if (ARGC != 2) {
@@ -2092,7 +2080,7 @@ content, but does receive the header:
        close(HttpService)
      }
 
-This program can be changed as needed, but be careful with the last
+   This program can be changed as needed, but be careful with the last
 lines.  Make sure transmission of binary data is not corrupted by
 additional line breaks. Even as it is now, the byte sequence
 `"\r\n\r\n"' would disappear if it were contained in binary data. Don't
@@ -2123,7 +2111,7 @@ up:
 
    * HTTP connections with HTML GUIs
 
-In this node, we look at a solution that uses HTTP connections to
+   In this node, we look at a solution that uses HTTP connections to
 control variables of an embedded system that are stored in a file.
 Since embedded systems have tight limits on resources like memory, it
 is difficult to employ advanced techniques such as SNMP and HTTP
@@ -2132,7 +2120,7 @@ needs just a short script to start working.  The following program
 stores the variables in a file, and a concurrent process in the
 embedded system may read the file. The program uses the
 site-independent part of the simple web server that we developed in
-*Note A Web Service with Interaction: Interacting Service.  As
+*note A Web Service with Interaction: Interacting Service.  As
 mentioned there, all we have to do is to write two new procedures
 `SetUpServer' and `HandleGET':
 
@@ -2151,14 +2139,14 @@ mentioned there, all we have to do is to write two new procedures
        if (ConfigFile == "") ConfigFile = "config.asc"
      }
 
-The function `SetUpServer' initializes the top level HTML texts as
+   The function `SetUpServer' initializes the top level HTML texts as
 usual. It also initializes the name of the file that contains the
 configuration parameters and their values. In case the user supplies a
 name from the command line, that name is used. The file is expected to
 contain one parameter per line, with the name of the parameter in
 column one and the value in column two.
 
-The function `HandleGET' reflects the structure of the menu tree as
+   The function `HandleGET' reflects the structure of the menu tree as
 usual. The first menu choice tells the user what this is all about. The
 second choice reads the configuration file line by line and stores the
 parameters and their values. Notice that the record separator for this
@@ -2209,7 +2197,7 @@ a file:
        }
      }
 
-We could also view the configuration file as a database. From this
+   We could also view the configuration file as a database. From this
 point of view, the previous program acts like a primitive database
 server.  Real SQL database systems also make a service available by
 providing a TCP port that clients can connect to. But the application
@@ -2229,7 +2217,7 @@ is needed to automatically look at the headers of web pages and tell
 which ones have changed. URLCHK does the comparison after using GETURL
 with the `HEAD' method to retrieve the header.
 
-Like GETURL, this program first checks that it is called with exactly
+   Like GETURL, this program first checks that it is called with exactly
 one command-line parameter. URLCHK also takes the same command-line
 variables `Proxy' and `ProxyPort' as GETURL, because these variables
 are handed over to GETURL for each URL that gets checked. The one and
@@ -2246,8 +2234,8 @@ times. Now, we follow this plan:
 
   4. If the most recent and the new length differ, tell the user
 
-It may seem a bit peculiar to read the URLs from a file together with
-their two most recent lengths, but this approach has several
+   It may seem a bit peculiar to read the URLs from a file together
+with their two most recent lengths, but this approach has several
 advantages. You can call the program again and again with the same
 file. After running the program, you can regenerate the changed URLs by
 extracting those lines that differ in their second and third columns:
@@ -2281,7 +2269,7 @@ extracting those lines that differ in their second and third columns:
        close(URLfile)
      }
 
-Another thing that may look strange is the way GETURL is called.
+   Another thing that may look strange is the way GETURL is called.
 Before calling GETURL, we have to check if the proxy variables need to
 be passed on. If so, we prepare strings that will become part of the
 command line later. In `GetHeader', we store these strings together
@@ -2291,7 +2279,7 @@ to form the command that reads the URL's header over the Internet.
 GETURL always produces the headers over `/dev/stderr'. That is the
 reason why we need the redirection operator to have the header piped in.
 
-This program is not perfect because it assumes that changing URLs
+   This program is not perfect because it assumes that changing URLs
 results in changed lengths, which is not necessarily true. A more
 advanced approach is to look at some other header line that holds time
 information. But, as always when things get a bit more complicated,
@@ -2315,21 +2303,21 @@ the Bourne shell:
         print command
      }
 
-Notice that the regular expression for URLs is rather crude. A precise
-regular expression is much more complex. But this one works rather
-well. One problem is that it is unable to find internal links of an
-HTML document.  Another problem is that `ftp', `telnet', `news',
+   Notice that the regular expression for URLs is rather crude. A
+precise regular expression is much more complex. But this one works
+rather well. One problem is that it is unable to find internal links of
+an HTML document.  Another problem is that `ftp', `telnet', `news',
 `mailto', and other kinds of links are missing in the regular
 expression.  However, it is straightforward to add them, if doing so is
 necessary for other tasks.
 
-This program reads an HTML file and prints all the HTTP links that it
-finds.  It relies on `gawk''s ability to use regular expressions as
+   This program reads an HTML file and prints all the HTTP links that
+it finds.  It relies on `gawk''s ability to use regular expressions as
 record separators. With `RS' set to a regular expression that matches
 links, the second action is executed each time a non-empty link is
 found.  We can find the matching link itself in `RT'.
 
-The action could use the `system' function to let another GETURL
+   The action could use the `system' function to let another GETURL
 retrieve the page, but here we use a different approach.  This simple
 program prints shell commands that can be piped into `sh' for
 execution.  This way it is possible to first extract the links, wrap
@@ -2340,7 +2328,7 @@ retrieve all the pages like this:
 
      gawk -f geturl.awk http://www.suse.de | gawk -f webgrab.awk | sh
 
-After this, you will find the contents of all referenced documents in
+   After this, you will find the contents of all referenced documents in
 files named `doc*.html' even if they do not contain HTML code.  The
 most annoying thing is that we always have to pass the proxy to GETURL.
 If you do not like to see the headers of the web pages appear on the
@@ -2350,13 +2338,13 @@ such as which web server the companies use.  Now, it is clear how the
 clever marketing people use web robots to determine the market shares
 of Microsoft and Netscape in the web server market.
 
-Port 80 of any web server is like a small hole in a repellent firewall.
-After attaching a browser to port 80, we usually catch a glimpse of the
-bright side of the server (its home page). With a tool like GETURL at
-hand, we are able to discover some of the more concealed or even
-"indecent" services (i.e., lacking conformity to standards of quality).
-It can be exciting to see the fancy CGI scripts that lie there,
-revealing the inner workings of the server, ready to be called:
+   Port 80 of any web server is like a small hole in a repellent
+firewall.  After attaching a browser to port 80, we usually catch a
+glimpse of the bright side of the server (its home page). With a tool
+like GETURL at hand, we are able to discover some of the more concealed
+or even "indecent" services (i.e., lacking conformity to standards of
+quality).  It can be exciting to see the fancy CGI scripts that lie
+there, revealing the inner workings of the server, ready to be called:
 
    * With a command such as:
 
@@ -2382,8 +2370,8 @@ revealing the inner workings of the server, ready to be called:
      server's log file--possibly containing customer data--or even the
      file `/etc/passwd'.  (We don't recommend this!)
 
-*Caution:* Although this may sound funny or simply irrelevant, we are
-talking about severe security holes. Try to explore your own system
+   *Caution:* Although this may sound funny or simply irrelevant, we
+are talking about severe security holes. Try to explore your own system
 this way and make sure that none of the above reveals too much
 information about your system.
 
@@ -2399,8 +2387,8 @@ Generating images that reflect some user input and presenting these
 dynamically generated images is another. In this node, we use GNUPlot
 for generating `.png', `.ps', or `.gif' files.(1)
 
-The program we develop takes the statistical parameters of two samples
-and computes the t-test statistics. As a result, we get the
+   The program we develop takes the statistical parameters of two
+samples and computes the t-test statistics. As a result, we get the
 probabilities that the means and the variances of both samples are the
 same. In order to let the user check plausibility, the program presents
 an image of the distributions. The statistical computation follows
@@ -2413,8 +2401,8 @@ comparison of means is done as in `tutest', paragraph 14.2, page 613,
 and the comparison of variances is done as in `ftest', page 611 in
 `Numerical Recipes'.  
 
-As usual, we take the site-independent code for servers and append our
-own functions `SetUpServer' and `HandleGET':
+   As usual, we take the site-independent code for servers and append
+our own functions `SetUpServer' and `HandleGET':
 
      function SetUpServer() {
        TopHeader = "<HTML><title>Statistics with GAWK</title>"
@@ -2429,27 +2417,27 @@ own functions `SetUpServer' and `HandleGET':
        m1=m2=0;    v1=v2=1;    n1=n2=10
      }
 
-Here, you see the menu structure that the user sees. Later, we will see
-how the program structure of the `HandleGET' function reflects the menu
-structure. What is missing here is the link for the image we generate.
-In an event-driven environment, request, generation, and delivery of
-images are separated.
-
-Notice the way we initialize the `GnuPlot' command string for the pipe.
-By default, GNUPlot outputs the generated image via standard output, as
-well as the results of `print'(ed) calculations via standard error.
-The redirection causes standard error to be mixed into standard output,
-enabling us to read results of calculations with `getline'.  By
+   Here, you see the menu structure that the user sees. Later, we will
+see how the program structure of the `HandleGET' function reflects the
+menu structure. What is missing here is the link for the image we
+generate. In an event-driven environment, request, generation, and
+delivery of images are separated.
+
+   Notice the way we initialize the `GnuPlot' command string for the
+pipe. By default, GNUPlot outputs the generated image via standard
+output, as well as the results of `print'(ed) calculations via standard
+error.  The redirection causes standard error to be mixed into standard
+output, enabling us to read results of calculations with `getline'.  By
 initializing the statistical parameters with some meaningful defaults,
 we make sure the user gets an image the first time he uses the program.
 
-Following is the rather long function `HandleGET', which implements the
-contents of this service by reacting to the different kinds of requests
-from the browser. Before you start playing with this script, make sure
-that your browser supports JavaScript and that it also has this option
-switched on. The script uses a short snippet of JavaScript code for
-delayed opening of a window with an image.  A more detailed explanation
-follows:
+   Following is the rather long function `HandleGET', which implements
+the contents of this service by reacting to the different kinds of
+requests from the browser. Before you start playing with this script,
+make sure that your browser supports JavaScript and that it also has
+this option switched on. The script uses a short snippet of JavaScript
+code for delayed opening of a window with an image.  A more detailed
+explanation follows:
 
      function HandleGET() {
        if(MENU[2] == "AboutServer") {
@@ -2525,27 +2513,27 @@ follows:
        }
      }
 
-As usual, we give a short description of the service in the first menu
-choice. The third menu choice shows us that generation and presentation
-of an image are two separate actions. While the latter takes place
-quite instantly in the third menu choice, the former takes place in the
-much longer second choice. Image data passes from the generating action
-to the presenting action via the variable `Image' that contains a
-complete `.png' image, which is otherwise stored in a file. If you
-prefer `.ps' or `.gif' images over the default `.png' images, you may
-select these options by uncommenting the appropriate lines. But
-remember to do so in two places: when telling GNUPlot which kind of
-images to generate, and when transmitting the image at the end of the
-program.
-
-Looking at the end of the program, the way we pass the `Content-type'
-to the browser is a bit unusual.  It is appended to the `OK' of the
-first header line to make sure the type information becomes part of the
-header.  The other variables that get transmitted across the network are
-made empty, because in this case we do not have an HTML document to
-transmit, but rather raw image data to contain in the body.
-
-Most of the work is done in the second menu choice. It starts with a
+   As usual, we give a short description of the service in the first
+menu choice. The third menu choice shows us that generation and
+presentation of an image are two separate actions. While the latter
+takes place quite instantly in the third menu choice, the former takes
+place in the much longer second choice. Image data passes from the
+generating action to the presenting action via the variable `Image'
+that contains a complete `.png' image, which is otherwise stored in a
+file. If you prefer `.ps' or `.gif' images over the default `.png'
+images, you may select these options by uncommenting the appropriate
+lines. But remember to do so in two places: when telling GNUPlot which
+kind of images to generate, and when transmitting the image at the end
+of the program.
+
+   Looking at the end of the program, the way we pass the
+`Content-type' to the browser is a bit unusual.  It is appended to the
+`OK' of the first header line to make sure the type information becomes
+part of the header.  The other variables that get transmitted across
+the network are made empty, because in this case we do not have an HTML
+document to transmit, but rather raw image data to contain in the body.
+
+   Most of the work is done in the second menu choice. It starts with a
 strange JavaScript code snippet. When first implementing this server,
 we used a short `"<IMG SRC=" MyPrefix "/Image>"' here. But then
 browsers got smarter and tried to improve on speed by requesting the
@@ -2559,9 +2547,9 @@ solved this problem by telling the browser to open a separate window
 for the image, but only after a delay of 1000 milliseconds.  By this
 time, the server should be ready for serving the next request.
 
-But there is one more subtlety in the JavaScript code.  Each time the
-JavaScript code opens a window for the image, the name of the image is
-appended with a timestamp (`systime').  Why this constant change of
+   But there is one more subtlety in the JavaScript code.  Each time
+the JavaScript code opens a window for the image, the name of the image
+is appended with a timestamp (`systime').  Why this constant change of
 name for the image? Initially, we always named the image `Image', but
 then the Netscape browser noticed the name had _not_ changed since the
 previous request and displayed the previous image (caching behavior).
@@ -2571,7 +2559,7 @@ way to circumvent the cache of such overly smart browsers is to change
 the name of the image with each request. These three lines of JavaScript
 caused us a lot of trouble.
 
-The rest can be broken down into two phases. At first, we check if
+   The rest can be broken down into two phases. At first, we check if
 there are statistical parameters. When the program is first started,
 there usually are no parameters because it enters the page coming from
 the top menu.  Then, we only have to present the user a form that he
@@ -2579,21 +2567,22 @@ can use to change statistical parameters and submit them. Subsequently,
 the submission of the form causes the execution of the first phase
 because _now_ there _are_ parameters to handle.
 
-Now that we have parameters, we know there will be an image available.
-Therefore we insert the JavaScript code here to initiate the opening of
-the image in a separate window. Then, we prepare some variables that
-will be passed to GNUPlot for calculation of the probabilities. Prior
-to reading the results, we must temporarily change `RS' because GNUPlot
-separates lines with newlines.  After instructing GNUPlot to generate a
-`.png' (or `.ps' or `.gif') image, we initiate the insertion of some
-text, explaining the resulting probabilities. The final `plot' command
-actually generates the image data. This raw binary has to be read in
-carefully without adding, changing, or deleting a single byte. Hence
-the unusual initialization of `Image' and completion with a `while'
-loop.
-
-When using this server, it soon becomes clear that it is far from being
-perfect. It mixes source code of six scripting languages or protocols:
+   Now that we have parameters, we know there will be an image
+available.  Therefore we insert the JavaScript code here to initiate
+the opening of the image in a separate window. Then, we prepare some
+variables that will be passed to GNUPlot for calculation of the
+probabilities. Prior to reading the results, we must temporarily change
+`RS' because GNUPlot separates lines with newlines.  After instructing
+GNUPlot to generate a `.png' (or `.ps' or `.gif') image, we initiate
+the insertion of some text, explaining the resulting probabilities. The
+final `plot' command actually generates the image data. This raw binary
+has to be read in carefully without adding, changing, or deleting a
+single byte. Hence the unusual initialization of `Image' and completion
+with a `while' loop.
+
+   When using this server, it soon becomes clear that it is far from
+being perfect. It mixes source code of six scripting languages or
+protocols:
 
    * GNU `awk' implements a server for the protocol:
 
@@ -2607,17 +2596,17 @@ perfect. It mixes source code of six scripting languages or protocols:
 
    * GNUPlot to generate the image to be opened.
 
-After all this work, the GNUPlot image opens in the JavaScript window
+   After all this work, the GNUPlot image opens in the JavaScript window
 where it can be viewed by the user.
 
-It is probably better not to mix up so many different languages.  The
-result is not very readable.  Furthermore, the statistical part of the
-server does not take care of invalid input.  Among others, using
+   It is probably better not to mix up so many different languages.
+The result is not very readable.  Furthermore, the statistical part of
+the server does not take care of invalid input.  Among others, using
 negative variances will cause invalid results.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) Due to licensing problems, the default installation of GNUPlot
+   (1) Due to licensing problems, the default installation of GNUPlot
 disables the generation of `.gif' files.  If your installed version
 does not accept `set term gif', just download and install the most
 recent version of GNUPlot and the GD library
@@ -2634,20 +2623,20 @@ File: gawkinet.info,  Node: MAZE,  Next: MOBAGWHO,  Prev: STATIST,  Up: Some App
      In the long run, every program becomes rococo, and then rubble.
      Alan Perlis
 
-By now, we know how to present arbitrary `Content-type's to a browser.
-In this node, our server will present a 3D world to our browser.  The
-3D world is described in a scene description language (VRML, Virtual
-Reality Modeling Language) that allows us to travel through a
-perspective view of a 2D maze with our browser. Browsers with a VRML
-plugin enable exploration of this technology. We could do one of those
-boring `Hello world' examples here, that are usually presented when
-introducing novices to VRML. If you have never written any VRML code,
-have a look at the VRML FAQ.  Presenting a static VRML scene is a bit
-trivial; in order to expose `gawk''s new capabilities, we will present
-a dynamically generated VRML scene. The function `SetUpServer' is very
-simple because it only sets the default HTML page and initializes the
-random number generator. As usual, the surrounding server lets you
-browse the maze.
+   By now, we know how to present arbitrary `Content-type's to a
+browser.  In this node, our server will present a 3D world to our
+browser.  The 3D world is described in a scene description language
+(VRML, Virtual Reality Modeling Language) that allows us to travel
+through a perspective view of a 2D maze with our browser. Browsers with
+a VRML plugin enable exploration of this technology. We could do one of
+those boring `Hello world' examples here, that are usually presented
+when introducing novices to VRML. If you have never written any VRML
+code, have a look at the VRML FAQ.  Presenting a static VRML scene is a
+bit trivial; in order to expose `gawk''s new capabilities, we will
+present a dynamically generated VRML scene. The function `SetUpServer'
+is very simple because it only sets the default HTML page and
+initializes the random number generator. As usual, the surrounding
+server lets you browse the maze.
 
      function SetUpServer() {
        TopHeader = "<HTML><title>Walk through a maze</title>"
@@ -2661,8 +2650,8 @@ browse the maze.
        srand()
      }
 
-The function `HandleGET' is a bit longer because it first computes the
-maze and afterwards generates the VRML code that is sent across the
+   The function `HandleGET' is a bit longer because it first computes
+the maze and afterwards generates the VRML code that is sent across the
 network. As shown in the STATIST example (*note STATIST::), we set the
 type of the content to VRML and then store the VRML representation of
 the maze as the page content. We assume that the maze is stored in a 2D
@@ -2718,24 +2707,24 @@ code for each wall field.
        }
      }
 
-Finally, we have a look at `MakeMaze', the function that generates the
-`Maze' array. When entered, this function assumes that the array has
-been initialized so that each element represents a wall element and the
-maze is initially full of wall elements. Only the entrance and the exit
-of the maze should have been left free. The parameters of the function
-tell us which element must be marked as not being a wall. After this,
-we take a look at the four neighbouring elements and remember which we
-have already treated. Of all the neighbouring elements, we take one at
-random and walk in that direction. Therefore, the wall element in that
-direction has to be removed and then, we call the function recursively
-for that element.  The maze is only completed if we iterate the above
-procedure for _all_ neighbouring elements (in random order) and for our
-present element by recursively calling the function for the present
-element. This last iteration could have been done in a loop, but it is
-done much simpler recursively.
-
-Notice that elements with coordinates that are both odd are assumed to
-be on our way through the maze and the generating process cannot
+   Finally, we have a look at `MakeMaze', the function that generates
+the `Maze' array. When entered, this function assumes that the array
+has been initialized so that each element represents a wall element and
+the maze is initially full of wall elements. Only the entrance and the
+exit of the maze should have been left free. The parameters of the
+function tell us which element must be marked as not being a wall.
+After this, we take a look at the four neighbouring elements and
+remember which we have already treated. Of all the neighbouring
+elements, we take one at random and walk in that direction. Therefore,
+the wall element in that direction has to be removed and then, we call
+the function recursively for that element.  The maze is only completed
+if we iterate the above procedure for _all_ neighbouring elements (in
+random order) and for our present element by recursively calling the
+function for the present element. This last iteration could have been
+done in a loop, but it is done much simpler recursively.
+
+   Notice that elements with coordinates that are both odd are assumed
+to be on our way through the maze and the generating process cannot
 terminate as long as there is such an element not being `delete'd. All
 other elements are potentially part of the wall.
 
@@ -2769,8 +2758,8 @@ File: gawkinet.info,  Node: MOBAGWHO,  Next: STOXPRED,  Prev: MAZE,  Up: Some Ap
      deficiencies.
      C. A. R. Hoare
 
-A "mobile agent" is a program that can be dispatched from a computer and
-transported to a remote server for execution. This is called
+   A "mobile agent" is a program that can be dispatched from a computer
+and transported to a remote server for execution. This is called
 "migration", which means that a process on another system is started
 that is independent from its originator. Ideally, it wanders through a
 network while working for its creator or owner. In places like the UMBC
@@ -2781,10 +2770,10 @@ between users and the networking world. For an unbiased view at this
 technology, see the remarkable paper `Mobile Agents: Are they a good
 idea?'.(1)
 
-When trying to migrate a process from one system to another, a server
-process is needed on the receiving side. Depending on the kind of
-server process, several ways of implementation come to mind.  How the
-process is implemented depends upon the kind of server process:
+   When trying to migrate a process from one system to another, a
+server process is needed on the receiving side. Depending on the kind
+of server process, several ways of implementation come to mind.  How
+the process is implemented depends upon the kind of server process:
 
    * HTTP can be used as the protocol for delivery of the migrating
      process. In this case, we use a common web server as the receiving
@@ -2809,12 +2798,12 @@ process is implemented depends upon the kind of server process:
      server process with a dedicated protocol specialized for receiving
      mobile agents.
 
-Our agent example abuses a common web server as a migration tool. So,
-it needs a universal CGI script on the receiving side (the web server).
-The receiving script is activated with a `POST' request when placed
-into a location like `/httpd/cgi-bin/PostAgent.sh'. Make sure that the
-server system uses a version of `gawk' that supports network access
-(Version 3.1 or later; verify with `gawk --version').
+   Our agent example abuses a common web server as a migration tool.
+So, it needs a universal CGI script on the receiving side (the web
+server). The receiving script is activated with a `POST' request when
+placed into a location like `/httpd/cgi-bin/PostAgent.sh'. Make sure
+that the server system uses a version of `gawk' that supports network
+access (Version 3.1 or later; verify with `gawk --version').
 
      #!/bin/sh
      MobAg=/tmp/MobileAgent.$$
@@ -2826,7 +2815,7 @@ server system uses a version of `gawk' that supports network access
      gawk 'BEGIN { print "\r\nAgent started" }'
      rm $MobAg      # delete script file of agent
 
-By making its process id (`$$') part of the unique file name, the
+   By making its process id (`$$') part of the unique file name, the
 script avoids conflicts between concurrent instances of the script.
 First, all lines from standard input (the mobile agent's source code)
 are copied into this unique file. Then, the agent is started as a
@@ -2855,17 +2844,17 @@ Independence
      way. By reporting `Agent started', it waves "Goodbye" to its
      origin. The originator may choose to terminate or not.
 
-The originating agent itself is started just like any other command-line
-script, and reports the results on standard output.  By letting the name
-of the original host migrate with the agent, the agent that migrates to
-a host far away from its origin can report the result back home.
-Having arrived at the end of the journey, the agent establishes a
-connection and reports the results.  This is the reason for determining
-the name of the host with `uname -n' and storing it in `MyOrigin' for
-later use.  We may also set variables with the `-v' option from the
-command line. This interactivity is only of importance in the context
-of starting a mobile agent; therefore this `BEGIN' pattern and its
-action do not take part in migration:
+   The originating agent itself is started just like any other
+command-line script, and reports the results on standard output.  By
+letting the name of the original host migrate with the agent, the agent
+that migrates to a host far away from its origin can report the result
+back home.  Having arrived at the end of the journey, the agent
+establishes a connection and reports the results.  This is the reason
+for determining the name of the host with `uname -n' and storing it in
+`MyOrigin' for later use.  We may also set variables with the `-v'
+option from the command line. This interactivity is only of importance
+in the context of starting a mobile agent; therefore this `BEGIN'
+pattern and its action do not take part in migration:
 
      BEGIN {
        if (ARGC != 2) {
@@ -2883,7 +2872,7 @@ action do not take part in migration:
        }
      }
 
-Since `gawk' cannot manipulate and transmit parts of the program
+   Since `gawk' cannot manipulate and transmit parts of the program
 directly, the source code is read and stored in strings.  Therefore,
 the program scans itself for the beginning and the ending of functions.
 Each line in between is appended to the code string until the end of
@@ -2901,7 +2890,7 @@ guarantee that the order of the functions is preserved during migration:
                                       { FUNC = "" }
      #EndOfMySelf
 
-The web server code in *Note A Web Service with Interaction:
+   The web server code in *note A Web Service with Interaction:
 Interacting Service, was first developed as a site-independent core.
 Likewise, the `gawk'-based mobile agent starts with an
 agent-independent core, to which can be appended application-dependent
@@ -2927,19 +2916,19 @@ needed for the mobile agent:
        close(HttpService)
      }
 
-The `migrate' function prepares the aforementioned strings containing
-the program code and transmits them to a server. A consequence of this
-modular approach is that the `migrate' function takes some parameters
-that aren't needed in this application, but that will be in future
-ones. Its mandatory parameter `Destination' holds the name (or IP
-address) of the server that the agent wants as a host for its code. The
-optional parameter `MobCode' may contain some `gawk' code that is
-inserted during migration in front of all other code.  The optional
-parameter `Label' may contain a string that tells the agent what to do
-in program execution after arrival at its new home site. One of the
-serious obstacles in implementing a framework for mobile agents is that
-it does not suffice to migrate the code. It is also necessary to
-migrate the state of execution of the agent. In contrast to `Agent
+   The `migrate' function prepares the aforementioned strings
+containing the program code and transmits them to a server. A
+consequence of this modular approach is that the `migrate' function
+takes some parameters that aren't needed in this application, but that
+will be in future ones. Its mandatory parameter `Destination' holds the
+name (or IP address) of the server that the agent wants as a host for
+its code. The optional parameter `MobCode' may contain some `gawk' code
+that is inserted during migration in front of all other code.  The
+optional parameter `Label' may contain a string that tells the agent
+what to do in program execution after arrival at its new home site. One
+of the serious obstacles in implementing a framework for mobile agents
+is that it does not suffice to migrate the code. It is also necessary
+to migrate the state of execution of the agent. In contrast to `Agent
 Tcl', this program does not try to migrate the complete set of
 variables. The following conventions are used:
 
@@ -2953,7 +2942,7 @@ variables. The following conventions are used:
      takes part in migration has to be an element of this array.
      `migrate' also takes care of this.
 
-Now it's clear what happens to the `Label' parameter of the function
+   Now it's clear what happens to the `Label' parameter of the function
 `migrate'. It is copied into `MOBVAR["Label"]' and travels alongside
 the other data. Since travelling takes place via HTTP, records must be
 separated with `"\r\n"' in `RS' and `ORS' as usual. The code assembly
@@ -2969,7 +2958,7 @@ for migration takes place in three steps:
      any reply over the network, it is read completely and echoed to
      standard output to avoid irritating the server.
 
-The application-independent framework is now almost complete. What
+   The application-independent framework is now almost complete. What
 follows is the `END' pattern that is executed  when the mobile agent has
 finished reading its own code. First, it checks whether it is already
 running on a remote host or not. In case initialization has not yet
@@ -2984,10 +2973,10 @@ starts `MyJob':
          MyJob()              # so we do our job
      }
 
-All that's left to extend the framework into a complete application is
-to write two application-specific functions: `MyInit' and `MyJob'. Keep
-in mind that the former is executed once on the originating host, while
-the latter is executed after each migration:
+   All that's left to extend the framework into a complete application
+is to write two application-specific functions: `MyInit' and `MyJob'.
+Keep in mind that the former is executed once on the originating host,
+while the latter is executed after each migration:
 
      function MyInit() {
        MOBVAR["MyOrigin"] = MyOrigin
@@ -2999,7 +2988,7 @@ the latter is executed after each migration:
        close("/inet/tcp/8080/0/0")
      }
 
-As mentioned earlier, this agent takes the name of its origin
+   As mentioned earlier, this agent takes the name of its origin
 (`MyOrigin') with it. Then, it takes the name of its first destination
 and goes there for further work. Notice that this name has the port
 number of the web server appended to the name of the server, because
@@ -3024,10 +3013,10 @@ function runs on the remote host:
        }
      }
 
-After migrating, the first thing to do in `MyJob' is to delete the name
-of the current host from the list of hosts to visit. Now, it is time to
-start the real work by appending the host's name to the result string,
-and reading line by line who is logged in on this host.  A very
+   After migrating, the first thing to do in `MyJob' is to delete the
+name of the current host from the list of hosts to visit. Now, it is
+time to start the real work by appending the host's name to the result
+string, and reading line by line who is logged in on this host.  A very
 annoying circumstance is the fact that the elements of `MOBVAR' cannot
 hold the newline character (`"\n"'). If they did, migration of this
 string did not work because the string didn't obey the syntax rule for
@@ -3038,9 +3027,9 @@ the `SUBSEP's with a newline character in the resulting string, and
 report it to the originating host, whose name is stored in
 `MOBVAR["MyOrigin"]'.
 
----------- Footnotes ----------
+   ---------- Footnotes ----------
 
-(1) `http://www.research.ibm.com/massive/mobag.ps'
+   (1) `http://www.research.ibm.com/massive/mobag.ps'
 
 
 File: gawkinet.info,  Node: STOXPRED,  Next: PROTBASE,  Prev: MOBAGWHO,  Up: Some Applications and Techniques
@@ -3065,7 +3054,7 @@ File: gawkinet.info,  Node: STOXPRED,  Next: PROTBASE,  Prev: MOBAGWHO,  Up: Som
      green pieces of paper that were unhappy.
      Douglas Adams, `The Hitch Hiker's Guide to the Galaxy'
 
-Valuable services on the Internet are usually _not_ implemented as
+   Valuable services on the Internet are usually _not_ implemented as
 mobile agents. There are much simpler ways of implementing services.
 All Unix systems provide, for example, the `cron' service.  Unix system
 users can write a list of tasks to be done each day, each week, twice a
@@ -3076,17 +3065,17 @@ For example, to distribute a newsletter on a daily basis this way, use
      # run at 8 am on weekdays, distribute the newsletter
      0 8 * * 1-5   $HOME/bin/daily.job >> $HOME/log/newsletter 2>&1
 
-The script first looks for interesting information on the Internet,
+   The script first looks for interesting information on the Internet,
 assembles it in a nice form and sends the results via email to the
 customers.
 
-The following is an example of a primitive newsletter on stock market
-prediction. It is a report which first tries to predict the change of
-each share in the Dow Jones Industrial Index for the particular day.
-Then it mentions some especially promising shares as well as some
-shares which look remarkably bad on that day. The report ends with the
-usual disclaimer which tells every child _not_ to try this at home and
-hurt anybody.  
+   The following is an example of a primitive newsletter on stock
+market prediction. It is a report which first tries to predict the
+change of each share in the Dow Jones Industrial Index for the
+particular day. Then it mentions some especially promising shares as
+well as some shares which look remarkably bad on that day. The report
+ends with the usual disclaimer which tells every child _not_ to try
+this at home and hurt anybody.  
 
      Good morning Uncle Scrooge,
 
@@ -3121,7 +3110,7 @@ hurt anybody.
              DD              http://biz.yahoo.com/n/d/dd.html
              ...
 
-The script as a whole is rather long. In order to ease the pain of
+   The script as a whole is rather long. In order to ease the pain of
 studying other people's source code, we have broken the script up into
 meaningful parts which are invoked one after the other.  The basic
 structure of the script is as follows:
@@ -3135,7 +3124,7 @@ structure of the script is as follows:
        SendMail()
      }
 
-The earlier parts store data into variables and arrays which are
+   The earlier parts store data into variables and arrays which are
 subsequently used by later parts of the script. The `Init' function
 first checks if the script is invoked correctly (without any
 parameters).  If not, it informs the user of the correct usage. What
@@ -3143,10 +3132,10 @@ follows are preparations for the retrieval of the historical quote
 data. The names of the 30 stock shares are stored in an array `name'
 along with the current date in `day', `month', and `year'.
 
-All users who are separated from the Internet by a firewall and have to
-direct their Internet accesses to a proxy must supply the name of the
-proxy to this script with the `-v Proxy=NAME' option. For most users,
-the default proxy and port number should suffice.
+   All users who are separated from the Internet by a firewall and have
+to direct their Internet accesses to a proxy must supply the name of
+the proxy to this script with the `-v Proxy=NAME' option. For most
+users, the default proxy and port number should suffice.
 
      function Init() {
        if (ARGC != 1) {
@@ -3170,7 +3159,7 @@ the default proxy and port number should suffice.
        YahooData = "/inet/tcp/0/" Proxy "/" ProxyPort
      }
 
-There are two really interesting parts in the script. One is the
+   There are two really interesting parts in the script. One is the
 function which reads the historical stock quotes from an Internet
 server. The other is the one that does the actual prediction. In the
 following function we see how the quotes are read from the Yahoo
@@ -3182,7 +3171,7 @@ server. The data which comes from the server is in CSV format
      6-Oct-00,23.8125,24.9375,21.5625,22,10701100
      5-Oct-00,24.4375,24.625,23.125,23.50,5810300
 
-Lines contain values of the same time instant, whereas columns are
+   Lines contain values of the same time instant, whereas columns are
 separated by commas and contain the kind of data that is described in
 the header (first) line. At first, `gawk' is instructed to separate
 columns by commas (`FS = ","'). In the loop that follows, a connection
@@ -3194,7 +3183,7 @@ ending date are chosen to be exactly the same, but one year apart in
 the past. All the action is initiated within the `printf' command which
 transmits the request for data to the Yahoo server.
 
-In the inner loop, the server's data is first read and then scanned
+   In the inner loop, the server's data is first read and then scanned
 line by line. Only lines which have six columns and the name of a month
 in the first column contain relevant data. This data is stored in the
 two-dimensional array `quote'; one dimension being time, the other
@@ -3223,9 +3212,9 @@ because we need them later.
        FS = " "
      }
 
-Now that we _have_ the data, it can be checked once again to make sure
-that no individual stock is missing or invalid, and that all the stock
-quotes are aligned correctly. Furthermore, we renumber the time
+   Now that we _have_ the data, it can be checked once again to make
+sure that no individual stock is missing or invalid, and that all the
+stock quotes are aligned correctly. Furthermore, we renumber the time
 instances. The most recent day gets day number 1 and all other days get
 consecutive numbers. All quotes are rounded toward the nearest whole
 number in US Dollars.
@@ -3246,16 +3235,16 @@ number in US Dollars.
        delete days
      }
 
-Now we have arrived at the second really interesting part of the whole
-affair.  What we present here is a very primitive prediction algorithm:
-_If a stock fell yesterday, assume it will also fall today; if it rose
-yesterday, assume it will rise today_.  (Feel free to replace this
-algorithm with a smarter one.) If a stock changed in the same direction
-on two consecutive days, this is an indication which should be
-highlighted.  Two-day advances are stored in `hot' and two-day declines
-in `avoid'.
+   Now we have arrived at the second really interesting part of the
+whole affair.  What we present here is a very primitive prediction
+algorithm: _If a stock fell yesterday, assume it will also fall today;
+if it rose yesterday, assume it will rise today_.  (Feel free to
+replace this algorithm with a smarter one.) If a stock changed in the
+same direction on two consecutive days, this is an indication which
+should be highlighted.  Two-day advances are stored in `hot' and
+two-day declines in `avoid'.
 
-The rest of the function is a sanity check. It counts the number of
+   The rest of the function is a sanity check. It counts the number of
 correct predictions in relation to the total number of predictions one
 could have made in the year before.
 
@@ -3292,9 +3281,10 @@ could have made in the year before.
        }
      }
 
-At this point the hard work has been done: the array `predict' contains
-the predictions for all the ticker symbols. It is up to the function
-`Report' to find some nice words to introduce the desired information.
+   At this point the hard work has been done: the array `predict'
+contains the predictions for all the ticker symbols. It is up to the
+function `Report' to find some nice words to introduce the desired
+information.
 
      function Report() {
        # Generate report
@@ -3330,10 +3320,10 @@ the predictions for all the ticker symbols. It is up to the function
        report = report "you should visit a doctor who can treat your ailment."
      }
 
-The function `SendMail' goes through the list of customers and opens a
-pipe to the `mail' command for each of them. Each one receives an email
-message with a proper subject heading and is addressed with his full
-name.
+   The function `SendMail' goes through the list of customers and opens
+a pipe to the `mail' command for each of them. Each one receives an
+email message with a proper subject heading and is addressed with his
+full name.
 
      function SendMail() {
        # send report to customers
@@ -3352,7 +3342,7 @@ name.
        }
      }
 
-Be patient when running the script by hand.  Retrieving the data for
+   Be patient when running the script by hand.  Retrieving the data for
 all the ticker symbols and sending the emails may take several minutes
 to complete, depending upon network traffic and the speed of the
 available Internet link.  The quality of the prediction algorithm is
@@ -3369,20 +3359,20 @@ File: gawkinet.info,  Node: PROTBASE,  Prev: STOXPRED,  Up: Some Applications an
      Hoare's Law of Large Problems: Inside every large problem is a
      small    problem struggling to get out.
 
-Yahoo's database of stock market data is just one among the many large
-databases on the Internet. Another one is located at NCBI (National
-Center for Biotechnology Information). Established in 1988 as a
-national resource for molecular biology information, NCBI creates
+   Yahoo's database of stock market data is just one among the many
+large databases on the Internet. Another one is located at NCBI
+(National Center for Biotechnology Information). Established in 1988 as
+a national resource for molecular biology information, NCBI creates
 public databases, conducts research in computational biology, develops
 software tools for analyzing genome data, and disseminates biomedical
 information. In this section, we look at one of NCBI's public services,
 which is called BLAST (Basic Local Alignment Search Tool).
 
-You probably know that the information necessary for reproducing living
-cells is encoded in the genetic material of the cells. The genetic
-material is a very long chain of four base nucleotides. It is the order
-of appearance (the sequence) of nucleotides which contains the
-information about the substance to be produced. Scientists in
+   You probably know that the information necessary for reproducing
+living cells is encoded in the genetic material of the cells. The
+genetic material is a very long chain of four base nucleotides. It is
+the order of appearance (the sequence) of nucleotides which contains
+the information about the substance to be produced. Scientists in
 biotechnology often find a specific fragment, determine the nucleotide
 sequence, and need to know where the sequence at hand comes from. This
 is where the large databases enter the game. At NCBI, databases store
@@ -3421,14 +3411,14 @@ services:
      you can send a message consisting of the word "HELP" to the same
      address, <blast@ncbi.nlm.nih.gov>.
 
-Our starting point is the demonstration client mentioned in the first
-option.  The `README' file that comes along with the client explains
-the whole process in a nutshell. In the rest of this section, we first
-show what such requests look like. Then we show how to use `gawk' to
-implement a client in about 10 lines of code. Finally, we show how to
-interpret the result returned from the service.
+   Our starting point is the demonstration client mentioned in the
+first option.  The `README' file that comes along with the client
+explains the whole process in a nutshell. In the rest of this section,
+we first show what such requests look like. Then we show how to use
+`gawk' to implement a client in about 10 lines of code. Finally, we
+show how to interpret the result returned from the service.
 
-Sequences are expected to be represented in the standard IUB/IUPAC
+   Sequences are expected to be represented in the standard IUB/IUPAC
 amino acid and nucleic acid codes, with these exceptions:  lower-case
 letters are accepted and are mapped into upper-case; a single hyphen or
 dash can be used to represent a gap of indeterminate length; and in
@@ -3448,7 +3438,7 @@ residue).  The nucleic acid codes supported are:
      K --> G T (keto)              N --> A G C T (any)
                                    -  gap of indeterminate length
 
-Now you know the alphabet of nucleotide sequences. The last two lines
+   Now you know the alphabet of nucleotide sequences. The last two lines
 of the following example query show you such a sequence, which is
 obviously made up only of elements of the alphabet just described.
 Store this example query into a file named `protbase.request'. You are
@@ -3462,23 +3452,23 @@ now ready to send it to the server with the demonstration client.
      tgcttggctgaggagccataggacgagagcttcctggtgaagtgtgtttcttgaaatcat
      caccaccatggacagcaaa
 
-The actual search request begins with the mandatory parameter `PROGRAM'
-in the first column followed by the value `blastn' (the name of the
-program) for searching nucleic acids.  The next line contains the
-mandatory search parameter `DATALIB' with the value `month' for the
+   The actual search request begins with the mandatory parameter
+`PROGRAM' in the first column followed by the value `blastn' (the name
+of the program) for searching nucleic acids.  The next line contains
+the mandatory search parameter `DATALIB' with the value `month' for the
 newest nucleic acid sequences.  The third line contains an optional
 `EXPECT' parameter and the value desired for it. The fourth line
 contains the mandatory `BEGIN' directive, followed by the query
 sequence in FASTA/Pearson format.  Each line of information must be
 less than 80 characters in length.
 
-The "month" database contains all new or revised sequences released in
-the last 30 days and is useful for searching against new sequences.
+   The "month" database contains all new or revised sequences released
+in the last 30 days and is useful for searching against new sequences.
 There are five different blast programs, `blastn' being the one that
 compares a nucleotide  query  sequence  against a nucleotide sequence
 database.
 
-The last server directive that must appear in every request is the
+   The last server directive that must appear in every request is the
 `BEGIN' directive. The query sequence should immediately follow the
 `BEGIN' directive and must appear in FASTA/Pearson format.  A sequence
 in FASTA/Pearson format begins with a single-line description.  The
@@ -3487,13 +3477,13 @@ sequence data that follow it by having a greater-than (`>') symbol in
 the first column.  For the purposes of the BLAST server, the text of
 the description is arbitrary.
 
-If you prefer to use a client written in `gawk', just store the
+   If you prefer to use a client written in `gawk', just store the
 following 10 lines of code into a file named `protbase.awk' and use
 this client instead. Invoke it with `gawk -f protbase.awk
 protbase.request'.  Then wait a minute and watch the result coming in.
 In order to replicate the demonstration client's behaviour as closely
 as possible, this client does not use a proxy server. We could also
-have extended the client program in *Note Retrieving Web Pages: GETURL,
+have extended the client program in *note Retrieving Web Pages: GETURL,
 to implement the client request from `protbase.awk' as a special case.
 
      { request = request "\n" $0 }
@@ -3508,19 +3498,19 @@ to implement the client request from `protbase.awk' as a special case.
        close(BLASTService)
      }
 
-The demonstration client from NCBI is 214 lines long (written in C) and
-it is not immediately obvious what it does. Our client is so short that
-it _is_ obvious what it does. First it loops over all lines of the
+   The demonstration client from NCBI is 214 lines long (written in C)
+and it is not immediately obvious what it does. Our client is so short
+that it _is_ obvious what it does. First it loops over all lines of the
 query and stores the whole query into a variable. Then the script
 establishes an Internet connection to the NCBI server and transmits the
 query by framing it with a proper HTTP request. Finally it receives and
 prints the complete result coming from the server.
 
-Now, let us look at the result. It begins with an HTTP header, which you
-can ignore. Then there are some comments about the query having been
+   Now, let us look at the result. It begins with an HTTP header, which
+you can ignore. Then there are some comments about the query having been
 filtered to avoid spuriously high scores. After this, there is a
 reference to the paper that describes the software being used for
-searching the data base. After a repitition of the original query's
+searching the data base. After a repetition of the original query's
 description we find the list of significant alignments:
 
      Sequences producing significant alignments:                        (bits)  Value
@@ -3533,13 +3523,13 @@ description we find the list of significant alignments:
      emb|AL138812.9|AL138812 Homo sapiens chromosome 11 clone RP1-276...    38  0.20
      gb|AC073881.3|AC073881 Homo sapiens chromosome 15 clone CTD-2169...    38  0.20
 
-This means that the query sequence was found in seven human chromosomes.
-But the value 0.20 (20%) means that the probability of an accidental
-match is rather high (20%) in all cases and should be taken into
-account.  You may wonder what the first column means. It is a key to
-the specific database in which this occurence was found.  The unique
-sequence identifiers reported in the search results can be used as
-sequence retrieval keys via the NCBI server. The syntax of sequence
+   This means that the query sequence was found in seven human
+chromosomes.  But the value 0.20 (20%) means that the probability of an
+accidental match is rather high (20%) in all cases and should be taken
+into account.  You may wonder what the first column means. It is a key
+to the specific database in which this occurrence was found.  The
+unique sequence identifiers reported in the search results can be used
+as sequence retrieval keys via the NCBI server. The syntax of sequence
 header lines used by the NCBI BLAST server depends on the database from
 which each sequence was obtained.  The table below lists the
 identifiers for the databases from which the sequences were derived.
@@ -3557,13 +3547,13 @@ identifiers for the databases from which the sequences were derived.
      Patents                           pat|country|number
      GenInfo Backbone Id               bbs|number
 
-For example, an identifier might be `gb|AC021182.14|AC021182', where the
-`gb' tag indicates that the identifier refers to a GenBank sequence,
+   For example, an identifier might be `gb|AC021182.14|AC021182', where
+the `gb' tag indicates that the identifier refers to a GenBank sequence,
 `AC021182.14' is its GenBank ACCESSION, and `AC021182' is the GenBank
 LOCUS.  The identifier contains no spaces, so that a space indicates
 the end of the identifier.
 
-Let us continue in the result listing. Each of the seven alignments
+   Let us continue in the result listing. Each of the seven alignments
 mentioned above is subsequently described in detail. We will have a
 closer look at the first of them.
 
@@ -3579,20 +3569,20 @@ closer look at the first of them.
                   |||||||||||||||||||
      Sbjct: 69786 tggtgaagtgtgtttcttg 69804
 
-This alignment was located on the human chromosome 7. The fragment on
-which part of the query was found had a total length of 176383. Only 19
-of the nucleotides matched and the matching sequence ran from character
-35 to 53 in the query sequence and from 69786 to 69804 in the fragment
-on chromosome 7.  If you are still reading at this point, you are
-probably interested in finding out more about Computational Biology and
-you might appreciate the following hints.
+   This alignment was located on the human chromosome 7. The fragment
+on which part of the query was found had a total length of 176383. Only
+19 of the nucleotides matched and the matching sequence ran from
+character 35 to 53 in the query sequence and from 69786 to 69804 in the
+fragment on chromosome 7.  If you are still reading at this point, you
+are probably interested in finding out more about Computational Biology
+and you might appreciate the following hints.
 
   1. There is a book called `Introduction to Computational Biology' by
      Michael S. Waterman, which is worth reading if you are seriously
      interested. You can find a good book review on the Internet.
 
   2. While Waterman's book can explain to you the algorithms employed
-     internally in the database search engines, most practicioners
+     internally in the database search engines, most practitioners
      prefer to approach the subject differently. The applied side of
      Computational Biology is called Bioinformatics, and emphasizes the
      tools available for day-to-day work as well as how to actually
@@ -3740,6 +3730,7 @@ GNU Free Documentation License
 ******************************
 
                       Version 1.2, November 2002
+
      Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
      51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
@@ -4093,7 +4084,7 @@ GNU Free Documentation License
      translations of some or all Invariant Sections in addition to the
      original versions of these Invariant Sections.  You may include a
      translation of this License, and all the license notices in the
-     Document, and any Warrany Disclaimers, provided that you also
+     Document, and any Warranty Disclaimers, provided that you also
      include the original English version of this License and the
      original versions of those notices and disclaimers.  In case of a
      disagreement between the translation and the original version of
@@ -4148,18 +4139,18 @@ notices just after the title page:
        A copy of the license is included in the section entitled ``GNU
        Free Documentation License''.
 
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
+   If you have Invariant Sections, Front-Cover Texts and Back-Cover
+Texts, replace the "with...Texts." line with this:
 
          with the Invariant Sections being LIST THEIR TITLES, with
          the Front-Cover Texts being LIST, and with the Back-Cover Texts
          being LIST.
 
-If you have Invariant Sections without Cover Texts, or some other
+   If you have Invariant Sections without Cover Texts, or some other
 combination of the three, merge those two alternatives to suit the
 situation.
 
-If your document contains nontrivial examples of program code, we
+   If your document contains nontrivial examples of program code, we
 recommend releasing these examples in parallel under your choice of
 free software license, such as the GNU General Public License, to
 permit their use in free software.
@@ -4170,258 +4161,244 @@ File: gawkinet.info,  Node: Index,  Prev: GNU Free Documentation License,  Up: T
 Index
 *****
 
+
 * Menu:
 
-* /inet/ files (gawk):                   Gawk Special Files. (line  490)
-* /inet/raw special files (gawk):        File /inet/raw.     (line  712)
-* /inet/tcp special files (gawk):        File /inet/tcp.     (line  647)
-* /inet/udp special files (gawk):        File /inet/udp.     (line  679)
-* advanced features, network connections: Troubleshooting.   (line  834)
-* agent <1>:                             MOBAGWHO.           (line 2766)
-* agent:                                 Challenges.         (line 1887)
-* AI:                                    Challenges.         (line 1887)
-* apache <1>:                            MOBAGWHO.           (line 2802)
-* apache:                                WEBGRAB.            (line 2372)
-* Bioinformatics:                        PROTBASE.           (line 3590)
-* BLAST, Basic Local Alignment Search Tool: PROTBASE.        (line 3369)
-* blocking:                              Making Connections. (line  383)
-* Boutell, Thomas:                       STATIST.            (line 2396)
-* CGI (Common Gateway Interface):        MOBAGWHO.           (line 2802)
+* /inet/ files (gawk):                   Gawk Special Files.  (line  34)
+* /inet/raw special files (gawk):        File /inet/raw.      (line   6)
+* /inet/tcp special files (gawk):        File /inet/tcp.      (line   6)
+* /inet/udp special files (gawk):        File /inet/udp.      (line   6)
+* advanced features, network connections: Troubleshooting.    (line   6)
+* agent <1>:                             MOBAGWHO.            (line   6)
+* agent:                                 Challenges.          (line  76)
+* AI:                                    Challenges.          (line  76)
+* apache <1>:                            MOBAGWHO.            (line  42)
+* apache:                                WEBGRAB.             (line  72)
+* Bioinformatics:                        PROTBASE.            (line 227)
+* BLAST, Basic Local Alignment Search Tool: PROTBASE.         (line   6)
+* blocking:                              Making Connections.  (line  35)
+* Boutell, Thomas:                       STATIST.             (line   6)
+* CGI (Common Gateway Interface):        MOBAGWHO.            (line  42)
 * CGI (Common Gateway Interface), dynamic web pages and: Web page.
-                                                             (line 1130)
-* CGI (Common Gateway Interface), library: CGI Lib.          (line 1418)
-* clients:                               Making Connections. (line  369)
-* Clinton, Bill:                         Challenges.         (line 1870)
-* Common Gateway Interface, See CGI:     Web page.           (line 1130)
-* Computational Biology:                 PROTBASE.           (line 3590)
-* contest:                               Challenges.         (line 1817)
-* cron utility:                          STOXPRED.           (line 3068)
-* CSV format:                            STOXPRED.           (line 3173)
-* dark corner, RAW protocol:             File /inet/raw.     (line  719)
-* Dow Jones Industrial Index:            STOXPRED.           (line 3089)
-* ELIZA program:                         Simple Server.      (line 1606)
-* email:                                 Email.              (line 1045)
-* FASTA/Pearson format:                  PROTBASE.           (line 3465)
+                                                              (line  46)
+* CGI (Common Gateway Interface), library: CGI Lib.           (line  11)
+* clients:                               Making Connections.  (line  21)
+* Clinton, Bill:                         Challenges.          (line  59)
+* Common Gateway Interface, See CGI:     Web page.            (line  46)
+* Computational Biology:                 PROTBASE.            (line 227)
+* contest:                               Challenges.          (line   6)
+* cron utility:                          STOXPRED.            (line  23)
+* CSV format:                            STOXPRED.            (line 128)
+* dark corner, RAW protocol:             File /inet/raw.      (line  13)
+* Dow Jones Industrial Index:            STOXPRED.            (line  44)
+* ELIZA program:                         Simple Server.       (line  11)
+* email:                                 Email.               (line  11)
+* FASTA/Pearson format:                  PROTBASE.            (line 102)
 * FDL (Free Documentation License):      GNU Free Documentation License.
-                                                             (line 3742)
-* filenames, for network access:         Gawk Special Files. (line  485)
-* files, /inet/ (gawk):                  Gawk Special Files. (line  490)
-* files, /inet/raw (gawk):               File /inet/raw.     (line  712)
-* files, /inet/tcp (gawk):               File /inet/tcp.     (line  647)
-* files, /inet/udp (gawk):               File /inet/udp.     (line  679)
-* finger utility:                        Setting Up.         (line  981)
+                                                              (line   6)
+* filenames, for network access:         Gawk Special Files.  (line  29)
+* files, /inet/ (gawk):                  Gawk Special Files.  (line  34)
+* files, /inet/raw (gawk):               File /inet/raw.      (line   6)
+* files, /inet/tcp (gawk):               File /inet/tcp.      (line   6)
+* files, /inet/udp (gawk):               File /inet/udp.      (line   6)
+* finger utility:                        Setting Up.          (line  22)
 * Free Documentation License (FDL):      GNU Free Documentation License.
-                                                             (line 3742)
-* FTP (File Transfer Protocol):          Basic Protocols.    (line  316)
-* gawk, networking:                      Using Networking.   (line  414)
-* gawk, networking, connections <1>:     TCP Connecting.     (line  781)
-* gawk, networking, connections:         Special File Fields.
-                                                             (line  549)
-* gawk, networking, filenames:           Gawk Special Files. (line  485)
-* gawk, networking, See Also email:      Email.              (line 1040)
-* gawk, networking, service, establishing: Setting Up.       (line  965)
-* gawk, networking, troubleshooting:     Caveats.            (line 1791)
-* gawk, web and, See web service:        Interacting Service.
-                                                             (line 1214)
-* getline command:                       TCP Connecting.     (line  786)
-* GETURL program:                        GETURL.             (line 2050)
-* GIF image format <1>:                  STATIST.            (line 2396)
-* GIF image format:                      Web page.           (line 1130)
+                                                              (line   6)
+* FTP (File Transfer Protocol):          Basic Protocols.     (line  29)
+* gawk, networking:                      Using Networking.    (line   6)
+* gawk, networking, connections <1>:     TCP Connecting.      (line   6)
+* gawk, networking, connections:         Special File Fields. (line  49)
+* gawk, networking, filenames:           Gawk Special Files.  (line  29)
+* gawk, networking, See Also email:      Email.               (line   6)
+* gawk, networking, service, establishing: Setting Up.        (line   6)
+* gawk, networking, troubleshooting:     Caveats.             (line   6)
+* gawk, web and, See web service:        Interacting Service. (line   6)
+* getline command:                       TCP Connecting.      (line  11)
+* GETURL program:                        GETURL.              (line   6)
+* GIF image format <1>:                  STATIST.             (line   6)
+* GIF image format:                      Web page.            (line  46)
 * GNU Free Documentation License:        GNU Free Documentation License.
-                                                             (line 3742)
-* GNU/Linux <1>:                         REMCONF.            (line 2107)
-* GNU/Linux <2>:                         Interacting.        (line  931)
-* GNU/Linux:                             Troubleshooting.    (line  882)
-* GNUPlot utility <1>:                   STATIST.            (line 2396)
-* GNUPlot utility:                       Interacting Service.
-                                                             (line 1396)
-* Hoare, C.A.R. <1>:                     PROTBASE.           (line 3369)
-* Hoare, C.A.R.:                         MOBAGWHO.           (line 2766)
-* hostname field:                        Special File Fields.
-                                                             (line  529)
-* HTML (Hypertext Markup Language):      Web page.           (line 1114)
-* HTTP (Hypertext Transfer Protocol) <1>: Web page.          (line 1090)
-* HTTP (Hypertext Transfer Protocol):    Basic Protocols.    (line  316)
+                                                              (line   6)
+* GNU/Linux <1>:                         REMCONF.             (line   6)
+* GNU/Linux <2>:                         Interacting.         (line  27)
+* GNU/Linux:                             Troubleshooting.     (line  54)
+* GNUPlot utility <1>:                   STATIST.             (line   6)
+* GNUPlot utility:                       Interacting Service. (line 189)
+* Hoare, C.A.R. <1>:                     PROTBASE.            (line   6)
+* Hoare, C.A.R.:                         MOBAGWHO.            (line   6)
+* hostname field:                        Special File Fields. (line  29)
+* HTML (Hypertext Markup Language):      Web page.            (line  30)
+* HTTP (Hypertext Transfer Protocol) <1>: Web page.           (line   6)
+* HTTP (Hypertext Transfer Protocol):    Basic Protocols.     (line  29)
 * HTTP (Hypertext Transfer Protocol), record separators and: Web page.
-                                                             (line 1114)
-* HTTP server, core logic:               Interacting Service.
-                                                             (line 1214)
-* Humphrys, Mark:                        Simple Server.      (line 1774)
-* Hypertext Markup Language (HTML):      Web page.           (line 1114)
-* Hypertext Transfer Protocol, See HTTP: Web page.           (line 1090)
-* image format:                          STATIST.            (line 2396)
-* images, in web pages:                  Interacting Service.
-                                                             (line 1396)
-* images, retrieving over networks:      Web page.           (line 1130)
+                                                              (line  30)
+* HTTP server, core logic:               Interacting Service. (line   6)
+* Humphrys, Mark:                        Simple Server.       (line 179)
+* Hypertext Markup Language (HTML):      Web page.            (line  30)
+* Hypertext Transfer Protocol, See HTTP: Web page.            (line   6)
+* image format:                          STATIST.             (line   6)
+* images, in web pages:                  Interacting Service. (line 189)
+* images, retrieving over networks:      Web page.            (line  46)
 * input/output, two-way, See Also gawk, networking: Gawk Special Files.
-                                                             (line  475)
-* Internet, See networks:                Interacting.        (line  952)
-* JavaScript:                            STATIST.            (line 2446)
-* Linux <1>:                             REMCONF.            (line 2107)
-* Linux <2>:                             Interacting.        (line  931)
-* Linux:                                 Troubleshooting.    (line  882)
-* Lisp:                                  MOBAGWHO.           (line 2858)
-* localport field:                       Gawk Special Files. (line  490)
-* Loebner, Hugh:                         Challenges.         (line 1817)
-* Loui, Ronald:                          Challenges.         (line 1887)
-* MAZE:                                  MAZE.               (line 2634)
-* Microsoft Windows:                     WEBGRAB.            (line 2343)
-* Microsoft Windows, networking:         Troubleshooting.    (line  882)
-* Microsoft Windows, networking, ports:  Setting Up.         (line  996)
-* MiniSQL:                               REMCONF.            (line 2212)
-* MOBAGWHO program:                      MOBAGWHO.           (line 2766)
+                                                              (line  19)
+* Internet, See networks:                Interacting.         (line  48)
+* JavaScript:                            STATIST.             (line  56)
+* Linux <1>:                             REMCONF.             (line   6)
+* Linux <2>:                             Interacting.         (line  27)
+* Linux:                                 Troubleshooting.     (line  54)
+* Lisp:                                  MOBAGWHO.            (line  98)
+* localport field:                       Gawk Special Files.  (line  34)
+* Loebner, Hugh:                         Challenges.          (line   6)
+* Loui, Ronald:                          Challenges.          (line  76)
+* MAZE:                                  MAZE.                (line   6)
+* Microsoft Windows:                     WEBGRAB.             (line  43)
+* Microsoft Windows, networking:         Troubleshooting.     (line  54)
+* Microsoft Windows, networking, ports:  Setting Up.          (line  37)
+* MiniSQL:                               REMCONF.             (line 111)
+* MOBAGWHO program:                      MOBAGWHO.            (line   6)
 * NCBI, National Center for Biotechnology Information: PROTBASE.
-                                                             (line 3369)
-* networks, gawk and:                    Using Networking.   (line  414)
-* networks, gawk and, connections <1>:   TCP Connecting.     (line  781)
-* networks, gawk and, connections:       Special File Fields.
-                                                             (line  549)
-* networks, gawk and, filenames:         Gawk Special Files. (line  485)
-* networks, gawk and, See Also email:    Email.              (line 1040)
-* networks, gawk and, service, establishing: Setting Up.     (line  965)
-* networks, gawk and, troubleshooting:   Caveats.            (line 1791)
-* networks, ports, reserved:             Setting Up.         (line  996)
-* networks, ports, specifying:           Special File Fields.
-                                                             (line  518)
-* networks, See Also web pages:          PANIC.              (line 2008)
-* Numerical Recipes:                     STATIST.            (line 2414)
-* ORS variable, HTTP and:                Web page.           (line 1114)
-* ORS variable, POP and:                 Email.              (line 1070)
-* PANIC program:                         PANIC.              (line 2008)
-* Perl:                                  Using Networking.   (line  422)
-* Perl, gawk networking and:             Using Networking.   (line  432)
-* Perlis, Alan:                          MAZE.               (line 2634)
-* pipes, networking and:                 TCP Connecting.     (line  805)
-* PNG image format <1>:                  STATIST.            (line 2396)
-* PNG image format:                      Web page.           (line 1130)
-* POP (Post Office Protocol):            Email.              (line 1040)
-* Post Office Protocol (POP):            Email.              (line 1040)
-* PostScript:                            STATIST.            (line 2528)
-* PROLOG:                                Challenges.         (line 1887)
-* PROTBASE:                              PROTBASE.           (line 3369)
-* protocol field:                        Special File Fields.
-                                                             (line  511)
-* PS image format:                       STATIST.            (line 2396)
-* Python:                                Using Networking.   (line  422)
-* Python, gawk networking and:           Using Networking.   (line  432)
-* RAW protocol:                          File /inet/raw.     (line  712)
-* record separators, HTTP and:           Web page.           (line 1114)
-* record separators, POP and:            Email.              (line 1070)
-* REMCONF program:                       REMCONF.            (line 2107)
-* remoteport field:                      Gawk Special Files. (line  490)
-* robot <1>:                             WEBGRAB.            (line 2306)
-* robot:                                 Challenges.         (line 1896)
-* RS variable, HTTP and:                 Web page.           (line 1114)
-* RS variable, POP and:                  Email.              (line 1070)
-* servers <1>:                           Setting Up.         (line  981)
-* servers:                               Making Connections. (line  362)
-* servers, as hosts:                     Special File Fields.
-                                                             (line  529)
-* servers, HTTP:                         Interacting Service.
-                                                             (line 1214)
-* servers, web:                          Simple Server.      (line 1601)
-* Simple Mail Transfer Protocol (SMTP):  Email.              (line 1040)
-* SMTP (Simple Mail Transfer Protocol) <1>: Email.           (line 1040)
-* SMTP (Simple Mail Transfer Protocol):  Basic Protocols.    (line  316)
-* SPAK utility:                          File /inet/raw.     (line  727)
-* STATIST program:                       STATIST.            (line 2396)
-* STOXPRED program:                      STOXPRED.           (line 3051)
-* synchronous communications:            Making Connections. (line  383)
-* Tcl/Tk:                                Using Networking.   (line  422)
+                                                              (line   6)
+* networks, gawk and:                    Using Networking.    (line   6)
+* networks, gawk and, connections <1>:   TCP Connecting.      (line   6)
+* networks, gawk and, connections:       Special File Fields. (line  49)
+* networks, gawk and, filenames:         Gawk Special Files.  (line  29)
+* networks, gawk and, See Also email:    Email.               (line   6)
+* networks, gawk and, service, establishing: Setting Up.      (line   6)
+* networks, gawk and, troubleshooting:   Caveats.             (line   6)
+* networks, ports, reserved:             Setting Up.          (line  37)
+* networks, ports, specifying:           Special File Fields. (line  18)
+* networks, See Also web pages:          PANIC.               (line   6)
+* Numerical Recipes:                     STATIST.             (line  24)
+* ORS variable, HTTP and:                Web page.            (line  30)
+* ORS variable, POP and:                 Email.               (line  36)
+* PANIC program:                         PANIC.               (line   6)
+* Perl:                                  Using Networking.    (line  14)
+* Perl, gawk networking and:             Using Networking.    (line  24)
+* Perlis, Alan:                          MAZE.                (line   6)
+* pipes, networking and:                 TCP Connecting.      (line  30)
+* PNG image format <1>:                  STATIST.             (line   6)
+* PNG image format:                      Web page.            (line  46)
+* POP (Post Office Protocol):            Email.               (line   6)
+* Post Office Protocol (POP):            Email.               (line   6)
+* PostScript:                            STATIST.             (line 138)
+* PROLOG:                                Challenges.          (line  76)
+* PROTBASE:                              PROTBASE.            (line   6)
+* protocol field:                        Special File Fields. (line  11)
+* PS image format:                       STATIST.             (line   6)
+* Python:                                Using Networking.    (line  14)
+* Python, gawk networking and:           Using Networking.    (line  24)
+* RAW protocol:                          File /inet/raw.      (line   6)
+* record separators, HTTP and:           Web page.            (line  30)
+* record separators, POP and:            Email.               (line  36)
+* REMCONF program:                       REMCONF.             (line   6)
+* remoteport field:                      Gawk Special Files.  (line  34)
+* robot <1>:                             WEBGRAB.             (line   6)
+* robot:                                 Challenges.          (line  85)
+* RS variable, HTTP and:                 Web page.            (line  30)
+* RS variable, POP and:                  Email.               (line  36)
+* servers <1>:                           Setting Up.          (line  22)
+* servers:                               Making Connections.  (line  14)
+* servers, as hosts:                     Special File Fields. (line  29)
+* servers, HTTP:                         Interacting Service. (line   6)
+* servers, web:                          Simple Server.       (line   6)
+* Simple Mail Transfer Protocol (SMTP):  Email.               (line   6)
+* SMTP (Simple Mail Transfer Protocol) <1>: Email.            (line   6)
+* SMTP (Simple Mail Transfer Protocol):  Basic Protocols.     (line  29)
+* SPAK utility:                          File /inet/raw.      (line  21)
+* STATIST program:                       STATIST.             (line   6)
+* STOXPRED program:                      STOXPRED.            (line   6)
+* synchronous communications:            Making Connections.  (line  35)
+* Tcl/Tk:                                Using Networking.    (line  14)
 * Tcl/Tk, gawk and <1>:                  Some Applications and Techniques.
-                                                             (line 1977)
-* Tcl/Tk, gawk and:                      Using Networking.   (line  432)
-* TCP (Transmission Control Protocol) <1>: File /inet/tcp.   (line  647)
-* TCP (Transmission Control Protocol):   Using Networking.   (line  437)
+                                                              (line  22)
+* Tcl/Tk, gawk and:                      Using Networking.    (line  24)
+* TCP (Transmission Control Protocol) <1>: File /inet/tcp.    (line   6)
+* TCP (Transmission Control Protocol):   Using Networking.    (line  29)
 * TCP (Transmission Control Protocol), connection, establishing: TCP Connecting.
-                                                             (line  781)
-* TCP (Transmission Control Protocol), UDP and: Interacting. (line  952)
-* TCP/IP, protocols, selecting:          Special File Fields.
-                                                             (line  511)
-* TCP/IP, sockets and:                   Gawk Special Files. (line  475)
-* Transmission Control Protocol, See TCP: Using Networking.  (line  437)
-* troubleshooting, gawk, networks:       Caveats.            (line 1791)
-* troubleshooting, networks, connections: Troubleshooting.   (line  834)
-* troubleshooting, networks, timeouts:   Caveats.            (line 1803)
-* UDP (User Datagram Protocol):          File /inet/udp.     (line  679)
-* UDP (User Datagram Protocol), TCP and: Interacting.        (line  952)
-* Unix, network ports and:               Setting Up.         (line  996)
-* URLCHK program:                        URLCHK.             (line 2225)
-* User Datagram Protocol, See UDP:       File /inet/udp.     (line  679)
-* vertical bar (|), |& operator (I/O):   TCP Connecting.     (line  800)
-* VRML:                                  MAZE.               (line 2634)
-* web browsers, See web service:         Interacting Service.
-                                                             (line 1214)
-* web pages:                             Web page.           (line 1090)
-* web pages, images in:                  Interacting Service.
-                                                             (line 1396)
-* web pages, retrieving:                 GETURL.             (line 2050)
-* web servers:                           Simple Server.      (line 1601)
-* web service <1>:                       PANIC.              (line 2008)
-* web service:                           Primitive Service.  (line 1156)
-* WEBGRAB program:                       WEBGRAB.            (line 2306)
-* Weizenbaum, Joseph:                    Simple Server.      (line 1606)
-* XBM image format:                      Interacting Service.
-                                                             (line 1396)
-* Yahoo! <1>:                            STOXPRED.           (line 3051)
-* Yahoo!:                                REMCONF.            (line 2107)
-* | (vertical bar), |& operator (I/O):   TCP Connecting.     (line  800)
+                                                              (line   6)
+* TCP (Transmission Control Protocol), UDP and: Interacting.  (line  48)
+* TCP/IP, protocols, selecting:          Special File Fields. (line  11)
+* TCP/IP, sockets and:                   Gawk Special Files.  (line  19)
+* Transmission Control Protocol, See TCP: Using Networking.   (line  29)
+* troubleshooting, gawk, networks:       Caveats.             (line   6)
+* troubleshooting, networks, connections: Troubleshooting.    (line   6)
+* troubleshooting, networks, timeouts:   Caveats.             (line  18)
+* UDP (User Datagram Protocol):          File /inet/udp.      (line   6)
+* UDP (User Datagram Protocol), TCP and: Interacting.         (line  48)
+* Unix, network ports and:               Setting Up.          (line  37)
+* URLCHK program:                        URLCHK.              (line   6)
+* User Datagram Protocol, See UDP:       File /inet/udp.      (line   6)
+* vertical bar (|), |& operator (I/O):   TCP Connecting.      (line  25)
+* VRML:                                  MAZE.                (line   6)
+* web browsers, See web service:         Interacting Service. (line   6)
+* web pages:                             Web page.            (line   6)
+* web pages, images in:                  Interacting Service. (line 189)
+* web pages, retrieving:                 GETURL.              (line   6)
+* web servers:                           Simple Server.       (line   6)
+* web service <1>:                       PANIC.               (line   6)
+* web service:                           Primitive Service.   (line   6)
+* WEBGRAB program:                       WEBGRAB.             (line   6)
+* Weizenbaum, Joseph:                    Simple Server.       (line  11)
+* XBM image format:                      Interacting Service. (line 189)
+* Yahoo! <1>:                            STOXPRED.            (line   6)
+* Yahoo!:                                REMCONF.             (line   6)
+* | (vertical bar), |& operator (I/O):   TCP Connecting.      (line  25)
 
 
 
 Tag Table:
-Node: Top2000
-Node: Preface5688
-Node: Introduction7063
-Node: Stream Communications8088
-Node: Datagram Communications9261
-Node: The TCP/IP Protocols10892
-Ref: The TCP/IP Protocols-Footnote-111576
-Node: Basic Protocols11733
-Node: Ports13055
-Node: Making Connections14460
-Ref: Making Connections-Footnote-117027
-Ref: Making Connections-Footnote-217074
-Node: Using Networking17255
-Node: Gawk Special Files19609
-Node: Special File Fields21609
-Ref: table-inet-components25353
-Node: Comparing Protocols28235
-Node: File /inet/tcp28824
-Node: File /inet/udp29844
-Node: File /inet/raw30959
-Ref: File /inet/raw-Footnote-133974
-Node: TCP Connecting34051
-Node: Troubleshooting36380
-Ref: Troubleshooting-Footnote-139424
-Node: Interacting39964
-Node: Setting Up42684
-Node: Email46166
-Node: Web page48485
-Ref: Web page-Footnote-151272
-Node: Primitive Service51466
-Node: Interacting Service54194
-Ref: Interacting Service-Footnote-163291
-Node: CGI Lib63320
-Node: Simple Server70269
-Ref: Simple Server-Footnote-177975
-Node: Caveats78073
-Node: Challenges79213
-Node: Some Applications and Techniques87874
-Node: PANIC90322
-Node: GETURL92034
-Node: REMCONF94650
-Node: URLCHK100114
-Node: WEBGRAB103937
-Node: STATIST108367
-Ref: STATIST-Footnote-1120029
-Node: MAZE120471
-Node: MOBAGWHO126646
-Ref: MOBAGWHO-Footnote-1140547
-Node: STOXPRED140599
-Node: PROTBASE154809
-Node: Links167844
-Node: GNU Free Documentation License171278
-Node: Index193671
+Node: Top2007
+Node: Preface5697
+Node: Introduction7072
+Node: Stream Communications8098
+Node: Datagram Communications9271
+Node: The TCP/IP Protocols10902
+Ref: The TCP/IP Protocols-Footnote-111586
+Node: Basic Protocols11743
+Node: Ports13065
+Node: Making Connections14470
+Ref: Making Connections-Footnote-117051
+Ref: Making Connections-Footnote-217098
+Node: Using Networking17279
+Node: Gawk Special Files19633
+Node: Special File Fields21637
+Ref: table-inet-components25387
+Node: Comparing Protocols27299
+Node: File /inet/tcp27888
+Node: File /inet/udp28914
+Node: File /inet/raw30035
+Ref: File /inet/raw-Footnote-133068
+Node: TCP Connecting33148
+Node: Troubleshooting35486
+Ref: Troubleshooting-Footnote-138537
+Node: Interacting39081
+Node: Setting Up41811
+Node: Email45305
+Node: Web page47631
+Ref: Web page-Footnote-150436
+Node: Primitive Service50633
+Node: Interacting Service53367
+Ref: Interacting Service-Footnote-162496
+Node: CGI Lib62528
+Node: Simple Server69489
+Ref: Simple Server-Footnote-177219
+Node: Caveats77320
+Node: Challenges78463
+Node: Some Applications and Techniques87130
+Node: PANIC89587
+Node: GETURL91305
+Node: REMCONF93928
+Node: URLCHK99404
+Node: WEBGRAB103239
+Node: STATIST107689
+Ref: STATIST-Footnote-1119397
+Node: MAZE119842
+Node: MOBAGWHO126030
+Ref: MOBAGWHO-Footnote-1139974
+Node: STOXPRED140029
+Node: PROTBASE154284
+Node: Links167366
+Node: GNU Free Documentation License170800
+Node: Index193204
 
 End Tag Table
diff --git a/doc/gawkinet.texi b/doc/gawkinet.texi
index 9ddabc04..f1b66073 100644
--- a/doc/gawkinet.texi
+++ b/doc/gawkinet.texi
@@ -152,7 +152,7 @@ version 3.1 and later.
 
 @menu
 * Preface::                          About this document.
-* Introduction::                     About networkiing.
+* Introduction::                     About networking.
 * Using Networking::                 Some examples.
 * Some Applications and Techniques:: More extended examples.
 * Links::                            Where to find the stuff mentioned in this
@@ -240,7 +240,7 @@ March, 2001
 @node Introduction, Using Networking, Preface, Top
 @chapter Networking Concepts
 
-This @value{CHAPTER} provides a (necessarily) brief intoduction to
+This @value{CHAPTER} provides a (necessarily) brief introduction to
 computer networking concepts.  For many applications of @command{gawk}
 to TCP/IP networking, we hope that this is enough.  For more
 advanced tasks, you will need deeper background, and it may be necessary
@@ -1008,7 +1008,7 @@ look like this:
 @ignore
 @multitable {1234567890123} {1234567890123} {123456789012345678901234567890123456789012}
 @item Service @strong{name} @tab Service @strong{number}
-@item echo @tab 7/tcp @tab echo sends back each line it receivces
+@item echo @tab 7/tcp @tab echo sends back each line it receives
 @item echo @tab 7/udp @tab echo is good for testing purposes
 @item discard @tab 9/tcp @tab discard behaves like @file{/dev/null}
 @item discard @tab 9/udp @tab discard just throws away each line
@@ -1071,7 +1071,7 @@ services are switched off in some startup script. Systems running some
 flavor of Microsoft Windows usually do @emph{not} support these services.
 Nevertheless, it @emph{is} possible to do networking with @command{gawk} on
 Microsoft
-Windows.@footnote{Microsoft prefered to ignore the TCP/IP
+Windows.@footnote{Microsoft preferred to ignore the TCP/IP
 family of protocols until 1995. Then came the rise of the Netscape browser
 as a landmark ``killer application.'' Microsoft added TCP/IP support and
 their own browser to Microsoft Windows 95 at the last minute. They even back-ported
@@ -4476,7 +4476,7 @@ Now, let us look at the result. It begins with an HTTP header, which you
 can ignore. Then there are some comments about the query having been
 filtered to avoid spuriously high scores. After this, there is a reference
 to the paper that describes the software being used for searching the data
-base. After a repitition of the original query's description we find the
+base. After a repetition of the original query's description we find the
 list of significant alignments:
 
 @smallexample
@@ -4497,7 +4497,7 @@ This means that the query sequence was found in seven human chromosomes.
 But the value 0.20 (20%) means that the probability of an accidental match
 is rather high (20%) in all cases and should be taken into account.
 You may wonder what the first column means. It is a key to the specific
-database in which this occurence was found.  The unique sequence identifiers
+database in which this occurrence was found.  The unique sequence identifiers
 reported in the search results can be used as sequence retrieval keys
 via the NCBI server. The syntax of sequence header lines used by the NCBI
 BLAST server depends on the database from which each sequence was obtained.
@@ -4581,7 +4581,7 @@ on the Internet.
 
 @item
 While Waterman's book can explain to you the algorithms employed internally
-in the database search engines, most practicioners prefer to approach
+in the database search engines, most practitioners prefer to approach
 the subject differently. The applied side of Computational Biology is
 called Bioinformatics, and emphasizes the tools available for day-to-day
 work as well as how to actually @emph{use} them. One of the very few affordable
@@ -5092,7 +5092,7 @@ permission from their copyright holders, but you may include
 translations of some or all Invariant Sections in addition to the
 original versions of these Invariant Sections.  You may include a
 translation of this License, and all the license notices in the
-Document, and any Warrany Disclaimers, provided that you also include
+Document, and any Warranty Disclaimers, provided that you also include
 the original English version of this License and the original versions
 of those notices and disclaimers.  In case of a disagreement between
 the translation and the original version of this License or a notice
diff --git a/doc/lflashlight.pdf b/doc/lflashlight.pdf
new file mode 100644
index 00000000..4432fdd0
--- /dev/null
+++ b/doc/lflashlight.pdf
@@ -0,0 +1,56 @@
+%PDF-1.3
+%Çì�¢
+6 0 obj
+<</Length 7 0 R/Filter /FlateDecode>>
+stream
+xœU�A!E÷=EO€¥¯ànôÄ“™ÅèÂëÛ51„P¿Ÿß)D$[ól;pº
+>ÞÀ�3~ âE÷*ò²à¹äXpƒ±Z)IwZyBêÈš¢Èl·jFœBæ3fI¡–aáV
¤HàTúMÿÔV›‡*´R‘ÔÈèjÂñowU¢¹Î4ÍEÔì
¼îImä‘tÐ>’Á1ÒªëŸO>endstream
+endobj
+7 0 obj
+168
+endobj
+5 0 obj
+<</Type/Page/MediaBox [0 0 72 28.8]
+/Rotate 0/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 6 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+5 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+>>
+endobj
+4 0 obj
+<</Type/ExtGState/Name/R4/TR/Identity/OPM 1/SM 0.02>>
+endobj
+8 0 obj
+<</R4
+4 0 R>>
+endobj
+2 0 obj
+<</Producer(GNU Ghostscript 7.07)>>endobj
+xref
+0 9
+0000000000 65535 f 
+0000000471 00000 n 
+0000000617 00000 n 
+0000000412 00000 n 
+0000000519 00000 n 
+0000000272 00000 n 
+0000000015 00000 n 
+0000000253 00000 n 
+0000000588 00000 n 
+trailer
+<< /Size 9 /Root 1 0 R /Info 2 0 R
+>>
+startxref
+667
+%%EOF
diff --git a/doc/rflashlight.pdf b/doc/rflashlight.pdf
new file mode 100644
index 00000000..72c8561e
--- /dev/null
+++ b/doc/rflashlight.pdf
@@ -0,0 +1,57 @@
+%PDF-1.3
+%Çì�¢
+6 0 obj
+<</Length 7 0 R/Filter /FlateDecode>>
+stream
+xœE�Qà †ß9'pBQ»+ì­ÛšeYRº%Ûõ'(]‚ð£îaÔ5üZa‡ÓUðñœð„—fOàyFÁzD›EÌSH|FN)”,hŒ²ù¨äÀS?i�Wk¬Ö*Úž%H!F¯Ž¦Ð®®MÁë\m…ø¬
+2±õmƒÆÁ
+òt‡”gÉÏH–¿ðëÞXTR»Û쬊š>@ÿŒ2{¤MéWV¶´õó'E€endstream
+endobj
+7 0 obj
+175
+endobj
+5 0 obj
+<</Type/Page/MediaBox [0 0 72 28.8]
+/Rotate 0/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 6 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+5 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+>>
+endobj
+4 0 obj
+<</Type/ExtGState/Name/R4/TR/Identity/OPM 1/SM 0.02>>
+endobj
+8 0 obj
+<</R4
+4 0 R>>
+endobj
+2 0 obj
+<</Producer(GNU Ghostscript 7.07)>>endobj
+xref
+0 9
+0000000000 65535 f 
+0000000478 00000 n 
+0000000624 00000 n 
+0000000419 00000 n 
+0000000526 00000 n 
+0000000279 00000 n 
+0000000015 00000 n 
+0000000260 00000 n 
+0000000595 00000 n 
+trailer
+<< /Size 9 /Root 1 0 R /Info 2 0 R
+>>
+startxref
+674
+%%EOF
diff --git a/doc/statist.pdf b/doc/statist.pdf
new file mode 100644
index 00000000..2122a33a
--- /dev/null
+++ b/doc/statist.pdf
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index e0fbe635..c49e670b 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,16 +3,16 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2005-01-30.17}
+\def\texinfoversion{2007-09-03.05}
 %
-% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-% Foundation, Inc.
+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+% 2007 Free Software Foundation, Inc.
 %
-% This texinfo.tex file is free software; you can redistribute it and/or
+% This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
-% published by the Free Software Foundation; either version 2, or (at
-% your option) any later version.
+% published by the Free Software Foundation, either version 3 of the
+% License, or (at your option) any later version.
 %
 % This texinfo.tex file is distributed in the hope that it will be
 % useful, but WITHOUT ANY WARRANTY; without even the implied warranty
@@ -20,9 +20,7 @@
 % General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
@@ -67,7 +65,7 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
-\message{Basics,}
+
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
@@ -153,20 +151,22 @@
 \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
 \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
 
-% In some macros, we cannot use the `\? notation---the left quote is
-% in some cases the escape char.
+% Since the category of space is not known, we have to be careful.
+\chardef\spacecat = 10
+\def\spaceisspace{\catcode`\ =\spacecat}
+
+% sometimes characters are active, so we need control sequences.
 \chardef\colonChar = `\:
 \chardef\commaChar = `\,
+\chardef\dashChar  = `\-
 \chardef\dotChar   = `\.
 \chardef\exclamChar= `\!
+\chardef\lquoteChar= `\`
 \chardef\questChar = `\?
+\chardef\rquoteChar= `\'
 \chardef\semiChar  = `\;
 \chardef\underChar = `\_
 
-\chardef\spaceChar = `\ %
-\chardef\spacecat = 10
-\def\spaceisspace{\catcode\spaceChar=\spacecat}
-
 % Ignore a token.
 %
 \def\gobble#1{}
@@ -277,6 +277,50 @@
 \newdimen\cornerthick \cornerthick=.3pt
 \newdimen\topandbottommargin \topandbottommargin=.75in
 
+% Output a mark which sets \thischapter, \thissection and \thiscolor.
+% We dump everything together because we only have one kind of mark.
+% This works because we only use \botmark / \topmark, not \firstmark.
+%
+% A mark contains a subexpression of the \ifcase ... \fi construct.
+% \get*marks macros below extract the needed part using \ifcase.
+%
+% Another complication is to let the user choose whether \thischapter
+% (\thissection) refers to the chapter (section) in effect at the top
+% of a page, or that at the bottom of a page.  The solution is
+% described on page 260 of The TeXbook.  It involves outputting two
+% marks for the sectioning macros, one before the section break, and
+% one after.  I won't pretend I can describe this better than DEK...
+\def\domark{%
+  \toks0=\expandafter{\lastchapterdefs}%
+  \toks2=\expandafter{\lastsectiondefs}%
+  \toks4=\expandafter{\prevchapterdefs}%
+  \toks6=\expandafter{\prevsectiondefs}%
+  \toks8=\expandafter{\lastcolordefs}%
+  \mark{%
+                   \the\toks0 \the\toks2
+      \noexpand\or \the\toks4 \the\toks6
+    \noexpand\else \the\toks8
+  }%
+}
+% \topmark doesn't work for the very first chapter (after the title
+% page or the contents), so we use \firstmark there -- this gets us
+% the mark with the chapter defs, unless the user sneaks in, e.g.,
+% @setcolor (or @url, or @link, etc.) between @contents and the very
+% first @chapter.
+\def\gettopheadingmarks{%
+  \ifcase0\topmark\fi
+  \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
+}
+\def\getbottomheadingmarks{\ifcase1\botmark\fi}
+\def\getcolormarks{\ifcase2\topmark\fi}
+
+% Avoid "undefined control sequence" errors.
+\def\lastchapterdefs{}
+\def\lastsectiondefs{}
+\def\prevchapterdefs{}
+\def\prevsectiondefs{}
+\def\lastcolordefs{}
+
 % Main output routine.
 \chardef\PAGE = 255
 \output = {\onepageout{\pagecontents\PAGE}}
@@ -294,7 +338,9 @@
   %
   % Do this outside of the \shipout so @code etc. will be expanded in
   % the headline as they should be, not taken literally (outputting ''code).
+  \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
   \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+  \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
   \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
   %
   {%
@@ -302,10 +348,14 @@
     % take effect in \write's, yet the group defined by the \vbox ends
     % before the \shipout runs.
     %
-    \escapechar = `\\     % use backslash in output files.
     \indexdummies         % don't expand commands in the output.
     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
-                   % the page break happens to be in the middle of an example.
+               % the page break happens to be in the middle of an example.
+               % We don't want .vr (or whatever) entries like this:
+               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
+               % "\acronym" won't work when it's read back in;
+               % it needs to be 
+               % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
       \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
@@ -333,9 +383,9 @@
       \pagebody{#1}%
       \ifdim\ht\footlinebox > 0pt
         % Only leave this space if the footline is nonempty.
-        % (We lessened \vsize for it in \oddfootingxxx.)
+        % (We lessened \vsize for it in \oddfootingyyy.)
         % The \baselineskip=24pt in plain's \makefootline has no effect.
-        \vskip 2\baselineskip
+        \vskip 24pt
         \unvbox\footlinebox
       \fi
       %
@@ -356,7 +406,7 @@
       \egroup % \vbox from first cropmarks clause
       \fi
     }% end of \shipout\vbox
-  }% end of group with \normalturnoffactive
+  }% end of group with \indexdummies
   \advancepageno
   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
@@ -369,7 +419,7 @@
 % marginal hacks, juha@viisa.uucp (Juha Takala)
 \ifvoid\margin\else % marginal info is present
   \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
-\dimen@=\dp#1 \unvbox#1
+\dimen@=\dp#1\relax \unvbox#1\relax
 \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
 \ifr@ggedbottom \kern-\dimen@ \vfil \fi}
 }
@@ -391,7 +441,7 @@
 %
 \def\parsearg{\parseargusing{}}
 \def\parseargusing#1#2{%
-  \def\next{#2}%
+  \def\argtorun{#2}%
   \begingroup
     \obeylines
     \spaceisspace
@@ -422,8 +472,7 @@
 \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
   \def\temp{#3}%
   \ifx\temp\empty
-    % We cannot use \next here, as it holds the macro to run;
-    % thus we reuse \temp.
+    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
     \let\temp\finishparsearg
   \else
     \let\temp\argcheckspaces
@@ -435,14 +484,14 @@
 % If a _delimited_ argument is enclosed in braces, they get stripped; so
 % to get _exactly_ the rest of the line, we had to prevent such situation.
 % We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \next.
+% just before passing the control to \argtorun.
 % (Similarily, we have to think about #3 of \argcheckspacesY above: it is
 % either the null string, or it ends with \^^M---thus there is no danger
 % that a pair of braces would be stripped.
 %
 % But first, we have to remove the trailing space token.
 %
-\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
+\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
 
 % \parseargdef\foo{...}
 %	is roughly equivalent to
@@ -566,7 +615,7 @@
 \let\}=\myrbrace
 \begingroup
   % Definitions to produce \{ and \} commands for indices,
-  % and @{ and @} for the aux file.
+  % and @{ and @} for the aux/toc files.
   \catcode`\{ = \other \catcode`\} = \other
   \catcode`\[ = 1 \catcode`\] = 2
   \catcode`\! = 0 \catcode`\\ = \other
@@ -647,13 +696,28 @@
 \let\/=\allowbreak
 
 % @. is an end-of-sentence period.
-\def\.{.\spacefactor=3000 }
+\def\.{.\spacefactor=\endofsentencespacefactor\space}
 
 % @! is an end-of-sentence bang.
-\def\!{!\spacefactor=3000 }
+\def\!{!\spacefactor=\endofsentencespacefactor\space}
 
 % @? is an end-of-sentence query.
-\def\?{?\spacefactor=3000 }
+\def\?{?\spacefactor=\endofsentencespacefactor\space}
+
+% @frenchspacing on|off  says whether to put extra space after punctuation.
+% 
+\def\onword{on}
+\def\offword{off}
+%
+\parseargdef\frenchspacing{%
+  \def\temp{#1}%
+  \ifx\temp\onword \plainfrenchspacing
+  \else\ifx\temp\offword \plainnonfrenchspacing
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
+  \fi\fi
+}
 
 % @w prevents a word break.  Without the \leavevmode, @w at the
 % beginning of a paragraph, when TeX is still in vertical mode, would
@@ -1031,9 +1095,9 @@ where each line of input produces a line of output.}
 % _ active, and distinguish by seeing if the current family is \slfam,
 % which is what @var uses.
 {
-  \catcode\underChar = \active
+  \catcode`\_ = \active
   \gdef\mathunderscore{%
-    \catcode\underChar=\active
+    \catcode`\_=\active
     \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
   }
 }
@@ -1076,15 +1140,24 @@ where each line of input produces a line of output.}
 \def\minus{$-$}
 
 % @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in a typewriter
-% font as three actual period characters.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em.  So do
+% whichever is larger.
 %
 \def\dots{%
   \leavevmode
-  \hbox to 1.5em{%
-    \hskip 0pt plus 0.25fil
-    .\hfil.\hfil.%
-    \hskip 0pt plus 0.5fil
+  \setbox0=\hbox{...}% get width of three periods
+  \ifdim\wd0 > 1.5em
+    \dimen0 = \wd0
+  \else
+    \dimen0 = 1.5em
+  \fi
+  \hbox to \dimen0{%
+    \hskip 0pt plus.25fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus.5fil
   }%
 }
 
@@ -1092,7 +1165,7 @@ where each line of input produces a line of output.}
 %
 \def\enddots{%
   \dots
-  \spacefactor=3000
+  \spacefactor=\endofsentencespacefactor
 }
 
 % @comma{} is so commas can be inserted into text without messing up
@@ -1176,13 +1249,134 @@ where each line of input produces a line of output.}
     \fi
   \fi
 \fi
-%
+
+% PDF uses PostScript string constants for the names of xref targets,
+% for display in the outlines, and in other places.  Thus, we have to
+% double any backslashes.  Otherwise, a name like "\node" will be
+% interpreted as a newline (\n), followed by o, d, e.  Not good.
+% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
+% (and related messages, the final outcome is that it is up to the TeX
+% user to double the backslashes and otherwise make the string valid, so
+% that's what we do).
+
+% double active backslashes.
+% 
+{\catcode`\@=0 \catcode`\\=\active
+ @gdef@activebackslashdouble{%
+   @catcode`@\=@active
+   @let\=@doublebackslash}
+}
+
+% To handle parens, we must adopt a different approach, since parens are
+% not active characters.  hyperref.dtx (which has the same problem as
+% us) handles it with this amazing macro to replace tokens, with minor
+% changes for Texinfo.  It is included here under the GPL by permission
+% from the author, Heiko Oberdiek.
+% 
+% #1 is the tokens to replace.
+% #2 is the replacement.
+% #3 is the control sequence with the string.
+% 
+\def\HyPsdSubst#1#2#3{%
+  \def\HyPsdReplace##1#1##2\END{%
+    ##1%
+    \ifx\\##2\\%
+    \else
+      #2%
+      \HyReturnAfterFi{%
+        \HyPsdReplace##2\END
+      }%
+    \fi
+  }%
+  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
+}
+\long\def\HyReturnAfterFi#1\fi{\fi#1}
+
+% #1 is a control sequence in which to do the replacements.
+\def\backslashparens#1{%
+  \xdef#1{#1}% redefine it as its expansion; the definition is simply
+             % \lastnode when called from \setref -> \pdfmkdest.
+  \HyPsdSubst{(}{\realbackslash(}{#1}%
+  \HyPsdSubst{)}{\realbackslash)}{#1}%
+}
+
+\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
+with PDF output, and none of those formats could be found.  (.eps cannot
+be supported due to the design of the PDF format; use regular TeX (DVI
+output) for that.)}
+
 \ifpdf
-  \input pdfcolor
-  \pdfcatalog{/PageMode /UseOutlines}%
+  %
+  % Color manipulation macros based on pdfcolor.tex.
+  \def\cmykDarkRed{0.28 1 1 0.35}
+  \def\cmykBlack{0 0 0 1}
+  %
+  \def\pdfsetcolor#1{\pdfliteral{#1 k}}
+  % Set color, and create a mark which defines \thiscolor accordingly,
+  % so that \makeheadline knows which color to restore.
+  \def\setcolor#1{%
+    \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+    \domark
+    \pdfsetcolor{#1}%
+  }
+  %
+  \def\maincolor{\cmykBlack}
+  \pdfsetcolor{\maincolor}
+  \edef\thiscolor{\maincolor}
+  \def\lastcolordefs{}
+  %
+  \def\makefootline{%
+    \baselineskip24pt
+    \line{\pdfsetcolor{\maincolor}\the\footline}%
+  }
+  %
+  \def\makeheadline{%
+    \vbox to 0pt{%
+      \vskip-22.5pt
+      \line{%
+        \vbox to8.5pt{}%
+        % Extract \thiscolor definition from the marks.
+        \getcolormarks
+        % Typeset the headline with \maincolor, then restore the color.
+        \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
+      }%
+      \vss
+    }%
+    \nointerlineskip
+  }
+  %
+  %
+  \pdfcatalog{/PageMode /UseOutlines}
+  %
+  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}%
-    \def\imageheight{#3}%
+    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+    %
+    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
+    % others).  Let's try in that order.
+    \let\pdfimgext=\empty
+    \begingroup
+      \openin 1 #1.png \ifeof 1
+        \openin 1 #1.jpg \ifeof 1
+          \openin 1 #1.jpeg \ifeof 1
+            \openin 1 #1.JPG \ifeof 1
+              \openin 1 #1.pdf \ifeof 1
+                \errhelp = \nopdfimagehelp
+                \errmessage{Could not find image file #1 for pdf}%
+              \else \gdef\pdfimgext{pdf}%
+              \fi
+            \else \gdef\pdfimgext{JPG}%
+            \fi
+          \else \gdef\pdfimgext{jpeg}%
+          \fi
+        \else \gdef\pdfimgext{jpg}%
+        \fi
+      \else \gdef\pdfimgext{png}%
+      \fi
+      \closein 1
+    \endgroup
+    %
     % without \immediate, pdftex seg faults when the same image is
     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
@@ -1190,26 +1384,38 @@ where each line of input produces a line of output.}
     \else
       \immediate\pdfximage
     \fi
-      \ifx\empty\imagewidth\else width \imagewidth \fi
-      \ifx\empty\imageheight\else height \imageheight \fi
+      \ifdim \wd0 >0pt width \imagewidth \fi
+      \ifdim \wd2 >0pt height \imageheight \fi
       \ifnum\pdftexversion<13
-         #1.pdf%
+         #1.\pdfimgext
        \else
-         {#1.pdf}%
+         {#1.\pdfimgext}%
        \fi
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
     \fi}
+  %
   \def\pdfmkdest#1{{%
-    % We have to set dummies so commands such as @code in a section title
-    % aren't expanded.
-    \atdummies
-    \normalturnoffactive
-    \pdfdest name{#1} xyz%
+    % We have to set dummies so commands such as @code, and characters
+    % such as \, aren't expanded when present in a section title.
+    \indexnofonts
+    \turnoffactive
+    \activebackslashdouble
+    \makevalueexpandable
+    \def\pdfdestname{#1}%
+    \backslashparens\pdfdestname
+    \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
   }}
+  %
+  % used to mark target names; must be expandable.
   \def\pdfmkpgn#1{#1}
-  \let\linkcolor = \Blue  % was Cyan, but that seems light?
-  \def\endlink{\Black\pdfendlink}
+  %
+  % by default, use a color that is dark enough to print on paper as
+  % nearly black, but still distinguishable for online viewing.
+  \def\urlcolor{\cmykDarkRed}
+  \def\linkcolor{\cmykDarkRed}
+  \def\endlink{\setcolor{\maincolor}\pdfendlink}
+  %
   % Adding outlines to PDF; macros for calculating structure of outlines
   % come from Petr Olsak
   \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
@@ -1218,20 +1424,31 @@ where each line of input produces a line of output.}
     \advance\tempnum by 1
     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
   %
-  % #1 is the section text.  #2 is the pdf expression for the number
-  % of subentries (or empty, for subsubsections).  #3 is the node
-  % text, which might be empty if this toc entry had no
-  % corresponding node.  #4 is the page number.
+  % #1 is the section text, which is what will be displayed in the
+  % outline by the pdf viewer.  #2 is the pdf expression for the number
+  % of subentries (or empty, for subsubsections).  #3 is the node text,
+  % which might be empty if this toc entry had no corresponding node.
+  % #4 is the page number
   %
   \def\dopdfoutline#1#2#3#4{%
     % Generate a link to the node text if that exists; else, use the
     % page number.  We could generate a destination for the section
     % text in the case where a section has no node, but it doesn't
-    % seem worthwhile, since most documents are normally structured.
+    % seem worth the trouble, since most documents are normally structured.
     \def\pdfoutlinedest{#3}%
-    \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi
+    \ifx\pdfoutlinedest\empty
+      \def\pdfoutlinedest{#4}%
+    \else
+      % Doubled backslashes in the name.
+      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
+       \backslashparens\pdfoutlinedest}%
+    \fi
     %
-    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}%
+    % Also double the backslashes in the display string.
+    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
+     \backslashparens\pdfoutlinetext}%
+    %
+    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
   }
   %
   \def\pdfmakeoutlines{%
@@ -1272,7 +1489,7 @@ where each line of input produces a line of output.}
       \def\unnsecentry{\numsecentry}%
       \def\unnsubsecentry{\numsubsecentry}%
       \def\unnsubsubsecentry{\numsubsubsecentry}%
-      \input \jobname.toc
+      \readdatafile{toc}%
       %
       % Read toc second time, this time actually producing the outlines.
       % The `-' means take the \expnumber as the absolute number of
@@ -1298,41 +1515,12 @@ where each line of input produces a line of output.}
       % their "best" equivalent, based on the @documentencoding.  Right
       % now, I guess we'll just let the pdf reader have its way.
       \indexnofonts
-      \turnoffactive
-      \input \jobname.toc
+      \setupdatafile
+      \catcode`\\=\active \otherbackslash
+      \input \tocreadfilename
     \endgroup
   }
   %
-  \def\makelinks #1,{%
-    \def\params{#1}\def\E{END}%
-    \ifx\params\E
-      \let\nextmakelinks=\relax
-    \else
-      \let\nextmakelinks=\makelinks
-      \ifnum\lnkcount>0,\fi
-      \picknum{#1}%
-      \startlink attr{/Border [0 0 0]}
-        goto name{\pdfmkpgn{\the\pgn}}%
-      \linkcolor #1%
-      \advance\lnkcount by 1%
-      \endlink
-    \fi
-    \nextmakelinks
-  }
-  \def\picknum#1{\expandafter\pn#1}
-  \def\pn#1{%
-    \def\p{#1}%
-    \ifx\p\lbrace
-      \let\nextpn=\ppn
-    \else
-      \let\nextpn=\ppnn
-      \def\first{#1}
-    \fi
-    \nextpn
-  }
-  \def\ppn#1{\pgn=#1\gobble}
-  \def\ppnn{\pgn=\first}
-  \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
     \ifx\PP\D\let\nextsp\relax
     \else\let\nextsp\skipspaces
@@ -1347,11 +1535,19 @@ where each line of input produces a line of output.}
   \else
     \let \startlink \pdfstartlink
   \fi
+  % make a live url in pdf output.
   \def\pdfurl#1{%
     \begingroup
-      \normalturnoffactive\def\@{@}%
+      % it seems we really need yet another set of dummies; have not
+      % tried to figure out what each command should do in the context
+      % of @url.  for now, just make @/ a no-op, that's the only one
+      % people have actually reported a problem with.
+      % 
+      \normalturnoffactive
+      \def\@{@}%
+      \let\/=\empty
       \makevalueexpandable
-      \leavevmode\Red
+      \leavevmode\setcolor{\urlcolor}%
       \startlink attr{/Border [0 0 0]}%
         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
     \endgroup}
@@ -1378,13 +1574,14 @@ where each line of input produces a line of output.}
     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
   \def\pdflink#1{%
     \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
-    \linkcolor #1\endlink}
+    \setcolor{\linkcolor}#1\endlink}
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 \else
   \let\pdfmkdest = \gobble
   \let\pdfurl = \gobble
   \let\endlink = \relax
-  \let\linkcolor = \relax
+  \let\setcolor = \gobble
+  \let\pdfsetcolor = \gobble
   \let\pdfmakeoutlines = \relax
 \fi  % \ifx\pdfoutput
 
@@ -1419,6 +1616,7 @@ where each line of input produces a line of output.}
 % We don't need math for this font style.
 \def\ttsl{\setfontstyle{ttsl}}
 
+
 % Default leading.
 \newdimen\textleading  \textleading = 13.2pt
 
@@ -1430,8 +1628,12 @@ where each line of input produces a line of output.}
 \def\strutheightpercent{.70833}
 \def\strutdepthpercent {.29167}
 %
+% can get a sort of poor man's double spacing by redefining this.
+\def\baselinefactor{1}
+%
 \def\setleading#1{%
-  \normalbaselineskip = #1\relax
+  \dimen0 = #1\relax
+  \normalbaselineskip = \baselinefactor\dimen0
   \normallineskip = \lineskipfactor\normalbaselineskip
   \normalbaselines
   \setbox\strutbox =\hbox{%
@@ -1440,10 +1642,277 @@ where each line of input produces a line of output.}
   }%
 }
 
+%
+% PDF CMaps.  See also LaTeX's t1.cmap.
+%
+% \cmapOT1
+\ifpdf
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1-0)
+%%Title: (TeX-OT1-0 TeX OT1 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<23> <26> <0023>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+40 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+%
+% \cmapOT1IT
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1IT-0)
+%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1IT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1IT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<25> <26> <0025>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+42 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<23> <0023>
+<24> <00A3>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1IT\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+%
+% \cmapOT1TT
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1TT-0)
+%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1TT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1TT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+5 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<21> <26> <0021>
+<28> <5F> <0028>
+<61> <7E> <0061>
+endbfrange
+32 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <2191>
+<0C> <2193>
+<0D> <0027>
+<0E> <00A1>
+<0F> <00BF>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<20> <2423>
+<27> <2019>
+<60> <2018>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1TT\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+\else
+  \expandafter\let\csname cmapOT1\endcsname\gobble
+  \expandafter\let\csname cmapOT1IT\endcsname\gobble
+  \expandafter\let\csname cmapOT1TT\endcsname\gobble
+\fi
+
+
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
-% #3 is the font's design size, #4 is a scale factor
-\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
+% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
+% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
+% empty to omit).
+\def\setfont#1#2#3#4#5{%
+  \font#1=\fontprefix#2#3 scaled #4
+  \csname cmap#5\endcsname#1%
+}
+% This is what gets called when #5 of \setfont is empty.
+\let\cmap\gobble
+
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
@@ -1468,118 +1937,297 @@ where each line of input produces a line of output.}
 \def\scshape{csc}
 \def\scbshape{csc}
 
+% Definitions for a main text size of 11pt.  This is the default in
+% Texinfo.
+% 
+\def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
 \edef\mainmagstep{\magstephalf}
-\setfont\textrm\rmshape{10}{\mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
-\setfont\textbf\bfshape{10}{\mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep
+\def\textecsize{1095}
 
 % A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstep1}
-\setfont\deftt\ttshape{10}{\magstep1}
-\setfont\defttsl\ttslshape{10}{\magstep1}
+\setfont\defbf\bfshape{10}{\magstep1}{OT1}
+\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
 \def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}
-\setfont\smalltt\ttshape{9}{1000}
-\setfont\smallbf\bfshape{10}{900}
-\setfont\smallit\itshape{9}{1000}
-\setfont\smallsl\slshape{9}{1000}
-\setfont\smallsf\sfshape{9}{1000}
-\setfont\smallsc\scshape{10}{900}
-\setfont\smallttsl\ttslshape{10}{900}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
 \font\smalli=cmmi9
 \font\smallsy=cmsy9
+\def\smallecsize{0900}
 
 % Fonts for small examples (8pt).
 \def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
 \font\smalleri=cmmi8
 \font\smallersy=cmsy8
+\def\smallerecsize{0800}
 
 % Fonts for title page (20.4pt):
 \def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\setfont\titleit\itbshape{10}{\magstep4}
-\setfont\titlesl\slbshape{10}{\magstep4}
-\setfont\titlett\ttbshape{12}{\magstep3}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
-\setfont\titlesf\sfbshape{17}{\magstep1}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
 \let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
 \font\titlei=cmmi12 scaled \magstep3
 \font\titlesy=cmsy10 scaled \magstep4
 \def\authorrm{\secrm}
 \def\authortt{\sectt}
+\def\titleecsize{2074}
 
 % Chapter (and unnumbered) fonts (17.28pt).
 \def\chapnominalsize{17pt}
-\setfont\chaprm\rmbshape{12}{\magstep2}
-\setfont\chapit\itbshape{10}{\magstep3}
-\setfont\chapsl\slbshape{10}{\magstep3}
-\setfont\chaptt\ttbshape{12}{\magstep2}
-\setfont\chapttsl\ttslshape{10}{\magstep3}
-\setfont\chapsf\sfbshape{17}{1000}
+\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
+\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
+\setfont\chapsf\sfbshape{17}{1000}{OT1}
 \let\chapbf=\chaprm
-\setfont\chapsc\scbshape{10}{\magstep3}
+\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3
+\def\chapecsize{1728}
 
 % Section fonts (14.4pt).
 \def\secnominalsize{14pt}
-\setfont\secrm\rmbshape{12}{\magstep1}
-\setfont\secit\itbshape{10}{\magstep2}
-\setfont\secsl\slbshape{10}{\magstep2}
-\setfont\sectt\ttbshape{12}{\magstep1}
-\setfont\secttsl\ttslshape{10}{\magstep2}
-\setfont\secsf\sfbshape{12}{\magstep1}
+\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
+\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep2}{OT1}
+\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
 \let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep2}
+\setfont\secsc\scbshape{10}{\magstep2}{OT1}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
+\def\sececsize{1440}
 
 % Subsection fonts (13.15pt).
 \def\ssecnominalsize{13pt}
-\setfont\ssecrm\rmbshape{12}{\magstephalf}
-\setfont\ssecit\itbshape{10}{1315}
-\setfont\ssecsl\slbshape{10}{1315}
-\setfont\ssectt\ttbshape{12}{\magstephalf}
-\setfont\ssecttsl\ttslshape{10}{1315}
-\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
+\setfont\ssecit\itbshape{10}{1315}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1315}{OT1}
+\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
+\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
 \let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1315}
+\setfont\ssecsc\scbshape{10}{1315}{OT1}
 \font\sseci=cmmi12 scaled \magstephalf
 \font\ssecsy=cmsy10 scaled 1315
+\def\ssececsize{1200}
 
 % Reduced fonts for @acro in text (10pt).
 \def\reducednominalsize{10pt}
-\setfont\reducedrm\rmshape{10}{1000}
-\setfont\reducedtt\ttshape{10}{1000}
-\setfont\reducedbf\bfshape{10}{1000}
-\setfont\reducedit\itshape{10}{1000}
-\setfont\reducedsl\slshape{10}{1000}
-\setfont\reducedsf\sfshape{10}{1000}
-\setfont\reducedsc\scshape{10}{1000}
-\setfont\reducedttsl\ttslshape{10}{1000}
+\setfont\reducedrm\rmshape{10}{1000}{OT1}
+\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{1000}{OT1}
+\setfont\reducedit\itshape{10}{1000}{OT1IT}
+\setfont\reducedsl\slshape{10}{1000}{OT1}
+\setfont\reducedsf\sfshape{10}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{1000}{OT1}
+\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
 \font\reducedi=cmmi10
 \font\reducedsy=cmsy10
+\def\reducedecsize{1000}
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 11pt text font size definitions
+
+
+% Definitions to make the main text be 10pt Computer Modern, with
+% section, chapter, etc., sizes following suit.  This is for the GNU
+% Press printing of the Emacs 22 manual.  Maybe other manuals in the
+% future.  Used with @smallbook, which sets the leading to 12pt.
+% 
+\def\definetextfontsizex{%
+% Text fonts (10pt).
+\def\textnominalsize{10pt}
+\edef\mainmagstep{1000}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
+\font\texti=cmmi10 scaled \mainmagstep
+\font\textsy=cmsy10 scaled \mainmagstep
+\def\textecsize{1000}
+
+% A few fonts for @defun names and args.
+\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
+\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\def\smallnominalsize{9pt}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
+\def\smallecsize{0900}
+
+% Fonts for small examples (8pt).
+\def\smallernominalsize{8pt}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
+\font\smalleri=cmmi8
+\font\smallersy=cmsy8
+\def\smallerecsize{0800}
+
+% Fonts for title page (20.4pt):
+\def\titlenominalsize{20pt}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+\def\titleecsize{2074}
+
+% Chapter fonts (14.4pt).
+\def\chapnominalsize{14pt}
+\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
+\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
+\let\chapbf\chaprm
+\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
+\font\chapi=cmmi12 scaled \magstep1
+\font\chapsy=cmsy10 scaled \magstep2
+\def\chapecsize{1440}
+
+% Section fonts (12pt).
+\def\secnominalsize{12pt}
+\setfont\secrm\rmbshape{12}{1000}{OT1}
+\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep1}{OT1}
+\setfont\sectt\ttbshape{12}{1000}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
+\setfont\secsf\sfbshape{12}{1000}{OT1}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep1}{OT1}
+\font\seci=cmmi12 
+\font\secsy=cmsy10 scaled \magstep1
+\def\sececsize{1200}
+
+% Subsection fonts (10pt).
+\def\ssecnominalsize{10pt}
+\setfont\ssecrm\rmbshape{10}{1000}{OT1}
+\setfont\ssecit\itbshape{10}{1000}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1000}{OT1}
+\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
+\setfont\ssecsf\sfbshape{10}{1000}{OT1}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{1000}{OT1}
+\font\sseci=cmmi10
+\font\ssecsy=cmsy10
+\def\ssececsize{1000}
+
+% Reduced fonts for @acro in text (9pt).
+\def\reducednominalsize{9pt}
+\setfont\reducedrm\rmshape{9}{1000}{OT1}
+\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{900}{OT1}
+\setfont\reducedit\itshape{9}{1000}{OT1IT}
+\setfont\reducedsl\slshape{9}{1000}{OT1}
+\setfont\reducedsf\sfshape{9}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{900}{OT1}
+\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
+\font\reducedi=cmmi9
+\font\reducedsy=cmsy9
+\def\reducedecsize{0900}
+
+% reduce space between paragraphs
+\divide\parskip by 2
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 10pt text font size definitions
+
+
+% We provide the user-level command
+%   @fonttextsize 10
+% (or 11) to redefine the text font size.  pt is assumed.
+% 
+\def\xword{10}
+\def\xiword{11}
+%
+\parseargdef\fonttextsize{%
+  \def\textsizearg{#1}%
+  \wlog{doing @fonttextsize \textsizearg}%
+  %
+  % Set \globaldefs so that documents can use this inside @tex, since
+  % makeinfo 4.8 does not support it, but we need it nonetheless.
+  % 
+ \begingroup \globaldefs=1
+  \ifx\textsizearg\xword \definetextfontsizex
+  \else \ifx\textsizearg\xiword \definetextfontsizexi
+  \else
+    \errhelp=\EMsimple
+    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
+  \fi\fi
+ \endgroup
+}
+
 
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
@@ -1691,7 +2339,7 @@ where each line of input produces a line of output.}
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
-\textfonts \rm
+\definetextfontsizexi
 
 % Define these so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
@@ -1701,10 +2349,10 @@ where each line of input produces a line of output.}
 \newcount\fontdepth \fontdepth=0
 
 % Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}
-\setfont\shortcontbf\bfshape{10}{\magstep1}  % no cmb12
-\setfont\shortcontsl\slshape{12}{1000}
-\setfont\shortconttt\ttshape{12}{1000}
+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1}  % no cmb12
+\setfont\shortcontsl\slshape{12}{1000}{OT1}
+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
 
 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
 %% serif) and @ii for TeX italic
@@ -1749,18 +2397,25 @@ where each line of input produces a line of output.}
 % sometimes \x has an active definition that messes things up.
 %
 \catcode`@=11
-  \def\frenchspacing{%
+  \def\plainfrenchspacing{%
     \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
     \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
+    \def\endofsentencespacefactor{1000}% for @. and friends
+  }
+  \def\plainnonfrenchspacing{%
+    \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
+    \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
+    \def\endofsentencespacefactor{3000}% for @. and friends
   }
 \catcode`@=\other
+\def\endofsentencespacefactor{3000}% default
 
 \def\t#1{%
-  {\tt \rawbackslash \frenchspacing #1}%
+  {\tt \rawbackslash \plainfrenchspacing #1}%
   \null
 }
 \def\samp#1{`\tclose{#1}'\null}
-\setfont\keyrm\rmshape{8}{1000}
+\setfont\keyrm\rmshape{8}{1000}{OT1}
 \font\keysy=cmsy9
 \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
   \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
@@ -1768,6 +2423,7 @@ where each line of input produces a line of output.}
      \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
     \kern-0.4pt\hrule}%
   \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+\def\key #1{{\nohyphenation \uppercase{#1}}\null}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
@@ -1793,7 +2449,7 @@ where each line of input produces a line of output.}
     \nohyphenation
     %
     \rawbackslash
-    \frenchspacing
+    \plainfrenchspacing
     #1%
   }%
   \null
@@ -1809,12 +2465,21 @@ where each line of input produces a line of output.}
 % and arrange explicitly to hyphenate at a dash.
 %  -- rms.
 {
-  \catcode`\-=\active
-  \catcode`\_=\active
+  \catcode`\-=\active \catcode`\_=\active
+  \catcode`\'=\active \catcode`\`=\active
   %
   \global\def\code{\begingroup
-    \catcode`\-=\active \let-\codedash
-    \catcode`\_=\active \let_\codeunder
+    \catcode\rquoteChar=\active \catcode\lquoteChar=\active
+    \let'\codequoteright \let`\codequoteleft
+    %
+    \catcode\dashChar=\active  \catcode\underChar=\active
+    \ifallowcodebreaks
+     \let-\codedash
+     \let_\codeunder
+    \else
+     \let-\realdash
+     \let_\realunder
+    \fi
     \codex
   }
 }
@@ -1834,6 +2499,28 @@ where each line of input produces a line of output.}
 }
 \def\codex #1{\tclose{#1}\endgroup}
 
+% An additional complication: the above will allow breaks after, e.g.,
+% each of the four underscores in __typeof__.  This is undesirable in
+% some manuals, especially if they don't have long identifiers in
+% general.  @allowcodebreaks provides a way to control this.
+% 
+\newif\ifallowcodebreaks  \allowcodebreakstrue
+
+\def\keywordtrue{true}
+\def\keywordfalse{false}
+
+\parseargdef\allowcodebreaks{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\keywordtrue
+    \allowcodebreakstrue
+  \else\ifx\txiarg\keywordfalse
+    \allowcodebreaksfalse
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
+  \fi\fi
+}
+
 % @kbd is like @code, except that if the argument is just one @key command,
 % then @kbd has no effect.
 
@@ -1841,16 +2528,16 @@ where each line of input produces a line of output.}
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
 \parseargdef\kbdinputstyle{%
-  \def\arg{#1}%
-  \ifx\arg\worddistinct
+  \def\txiarg{#1}%
+  \ifx\txiarg\worddistinct
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-  \else\ifx\arg\wordexample
+  \else\ifx\txiarg\wordexample
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-  \else\ifx\arg\wordcode
+  \else\ifx\txiarg\wordcode
     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\arg'}%
+    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
   \fi\fi\fi
 }
 \def\worddistinct{distinct}
@@ -1962,7 +2649,7 @@ where each line of input produces a line of output.}
 % 
 \def\abbr#1{\doabbr #1,,\finish}
 \def\doabbr#1,#2,#3\finish{%
-  {\frenchspacing #1}%
+  {\plainfrenchspacing #1}%
   \def\temp{#2}%
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
@@ -2021,6 +2708,35 @@ where each line of input produces a line of output.}
   \thiseurofont
 }
 
+% Hacks for glyphs from the EC fonts similar to \euro.  We don't
+% use \let for the aliases, because sometimes we redefine the original
+% macro, and the alias should reflect the redefinition.
+\def\guillemetleft{{\ecfont \char"13}}
+\def\guillemotleft{\guillemetleft}
+\def\guillemetright{{\ecfont \char"14}}
+\def\guillemotright{\guillemetright}
+\def\guilsinglleft{{\ecfont \char"0E}}
+\def\guilsinglright{{\ecfont \char"0F}}
+\def\quotedblbase{{\ecfont \char"12}}
+\def\quotesinglbase{{\ecfont \char"0D}}
+%
+\def\ecfont{%
+  % We can't distinguish serif/sanserif and italic/slanted, but this
+  % is used for crude hacks anyway (like adding French and German
+  % quotes to documents typeset with CM, where we lose kerning), so
+  % hopefully nobody will notice/care.
+  \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
+  \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
+  \ifx\curfontstyle\bfstylename
+    % bold:
+    \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+  \else
+    % regular:
+    \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+  \fi
+  \thisecfont
+}
+
 % @registeredsymbol - R in a circle.  The font for the R should really
 % be smaller yet, but lllsize is the best we can do for now.
 % Adapted from the plain.tex definition of \copyright.
@@ -2031,6 +2747,10 @@ where each line of input produces a line of output.}
     }$%
 }
 
+% @textdegree - the normal degrees sign.
+%
+\def\textdegree{$^\circ$}
+
 % Laurent Siebenmann reports \Orb undefined with:
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
 % so we'll define it if necessary.
@@ -2039,6 +2759,11 @@ where each line of input produces a line of output.}
 \def\Orb{\mathhexbox20D}
 \fi
 
+% Quotes.
+\chardef\quotedblleft="5C
+\chardef\quotedblright=`\"
+\chardef\quoteleft=`\`
+\chardef\quoteright=`\'
 
 \message{page headings,}
 
@@ -2202,12 +2927,39 @@ where each line of input produces a line of output.}
   %
   % Leave some space for the footline.  Hopefully ok to assume
   % @evenfooting will not be used by itself.
-  \global\advance\pageheight by -\baselineskip
-  \global\advance\vsize by -\baselineskip
+  \global\advance\pageheight by -12pt
+  \global\advance\vsize by -12pt
 }
 
 \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
 
+% @evenheadingmarks top     \thischapter <- chapter at the top of a page
+% @evenheadingmarks bottom  \thischapter <- chapter at the bottom of a page
+%
+% The same set of arguments for:
+%
+% @oddheadingmarks
+% @evenfootingmarks
+% @oddfootingmarks
+% @everyheadingmarks
+% @everyfootingmarks
+
+\def\evenheadingmarks{\headingmarks{even}{heading}}
+\def\oddheadingmarks{\headingmarks{odd}{heading}}
+\def\evenfootingmarks{\headingmarks{even}{footing}}
+\def\oddfootingmarks{\headingmarks{odd}{footing}}
+\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
+                          \headingmarks{odd}{heading}{#1} }
+\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
+                          \headingmarks{odd}{footing}{#1} }
+% #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
+\def\headingmarks#1#2#3 {%
+  \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname
+  \global\expandafter\let\csname get#1#2marks\endcsname \temp
+}
+
+\everyheadingmarks bottom
+\everyfootingmarks bottom
 
 % @headings double      turns headings on for double-sided printing.
 % @headings single      turns headings on for single-sided printing.
@@ -2862,6 +3614,7 @@ where each line of input produces a line of output.}
 
 \def\doignore#1{\begingroup
   % Scan in ``verbatim'' mode:
+  \obeylines
   \catcode`\@ = \other
   \catcode`\{ = \other
   \catcode`\} = \other
@@ -2882,16 +3635,16 @@ where each line of input produces a line of output.}
   \gdef\dodoignore#1{%
     % #1 contains the command name as a string, e.g., `ifinfo'.
     %
-    % Define a command to find the next `@end #1', which must be on a line
-    % by itself.
-    \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
+    % Define a command to find the next `@end #1'.
+    \long\def\doignoretext##1^^M@end #1{%
+      \doignoretextyyy##1^^M@#1\_STOP_}%
+    %
     % And this command to find another #1 command, at the beginning of a
     % line.  (Otherwise, we would consider a line `@c @ifset', for
     % example, to count as an @ifset for nesting.)
     \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
     %
     % And now expand that command.
-    \obeylines %
     \doignoretext ^^M%
   }%
 }
@@ -2921,7 +3674,12 @@ where each line of input produces a line of output.}
 }
 
 % Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
+{ \obeylines%
+  % Ignore anything after the last `@end #1'; this matters in verbatim
+  % environments, where otherwise the newline after an ignored conditional
+  % would result in a blank line in the output.
+  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
+}
 
 
 % @set VAR sets the variable VAR to an empty value.
@@ -3121,42 +3879,50 @@ where each line of input produces a line of output.}
 % we have to laboriously prevent expansion for those that we don't.
 %
 \def\indexdummies{%
+  \escapechar = `\\     % use backslash in output files.
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
+  %
   % Need these in case \tex is in effect and \{ is a \delimiter again.
   % But can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.
   \let\{ = \mylbrace
   \let\} = \myrbrace
   %
-  % \definedummyword defines \#1 as \realbackslash #1\space, thus
-  % effectively preventing its expansion.  This is used only for control
-  % words, not control letters, because the \space would be incorrect
-  % for control characters, but is needed to separate the control word
-  % from whatever follows.
-  %
-  % For control letters, we have \definedummyletter, which omits the
-  % space.
-  %
-  % These can be used both for control words that take an argument and
-  % those that do not.  If it is followed by {arg} in the input, then
-  % that will dutifully get written to the index (or wherever).
-  %
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
-  }%
-  \let\definedummyaccent\definedummyletter
+  % I don't entirely understand this, but when an index entry is
+  % generated from a macro call, the \endinput which \scanmacro inserts
+  % causes processing to be prematurely terminated.  This is,
+  % apparently, because \indexsorttmp is fully expanded, and \endinput
+  % is an expandable command.  The redefinition below makes \endinput
+  % disappear altogether for that purpose -- although logging shows that
+  % processing continues to some further point.  On the other hand, it
+  % seems \endinput does not hurt in the printed index arg, since that
+  % is still getting written without apparent harm.
+  % 
+  % Sample source (mac-idx3.tex, reported by Graham Percival to
+  % help-texinfo, 22may06):
+  % @macro funindex {WORD}
+  % @findex xyz
+  % @end macro
+  % ...
+  % @funindex commtest
+  % 
+  % The above is not enough to reproduce the bug, but it gives the flavor.
+  % 
+  % Sample whatsit resulting:
+  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
+  % 
+  % So:
+  \let\endinput = \empty
   %
   % Do the redefinitions.
   \commondummies
 }
 
-% For the aux file, @ is the escape character.  So we want to redefine
-% everything using @ instead of \realbackslash.  When everything uses
-% @, this will be simpler.
+% For the aux and toc files, @ is the escape character.  So we want to
+% redefine everything using @ as the escape character (instead of
+% \realbackslash, still used for index files).  When everything uses @,
+% this will be simpler.
 %
 \def\atdummies{%
   \def\@{@@}%
@@ -3164,147 +3930,162 @@ where each line of input produces a line of output.}
   \let\{ = \lbraceatcmd
   \let\} = \rbraceatcmd
   %
-  % (See comments in \indexdummies.)
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{@##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{@##1}%
-  }%
-  \let\definedummyaccent\definedummyletter
-  %
   % Do the redefinitions.
   \commondummies
+  \otherbackslash
 }
 
-% Called from \indexdummies and \atdummies.  \definedummyword and
-% \definedummyletter must be defined first.
+% Called from \indexdummies and \atdummies.
 %
 \def\commondummies{%
   %
-  \normalturnoffactive
+  % \definedummyword defines \#1 as \string\#1\space, thus effectively
+  % preventing its expansion.  This is used only for control% words,
+  % not control letters, because the \space would be incorrect for
+  % control characters, but is needed to separate the control word
+  % from whatever follows.
+  %
+  % For control letters, we have \definedummyletter, which omits the
+  % space.
+  %
+  % These can be used both for control words that take an argument and
+  % those that do not.  If it is followed by {arg} in the input, then
+  % that will dutifully get written to the index (or wherever).
+  %
+  \def\definedummyword  ##1{\def##1{\string##1\space}}%
+  \def\definedummyletter##1{\def##1{\string##1}}%
+  \let\definedummyaccent\definedummyletter
   %
   \commondummiesnofonts
   %
-  \definedummyletter{_}%
+  \definedummyletter\_%
   %
   % Non-English letters.
-  \definedummyword{AA}%
-  \definedummyword{AE}%
-  \definedummyword{L}%
-  \definedummyword{OE}%
-  \definedummyword{O}%
-  \definedummyword{aa}%
-  \definedummyword{ae}%
-  \definedummyword{l}%
-  \definedummyword{oe}%
-  \definedummyword{o}%
-  \definedummyword{ss}%
-  \definedummyword{exclamdown}%
-  \definedummyword{questiondown}%
-  \definedummyword{ordf}%
-  \definedummyword{ordm}%
+  \definedummyword\AA
+  \definedummyword\AE
+  \definedummyword\L
+  \definedummyword\OE
+  \definedummyword\O
+  \definedummyword\aa
+  \definedummyword\ae
+  \definedummyword\l
+  \definedummyword\oe
+  \definedummyword\o
+  \definedummyword\ss
+  \definedummyword\exclamdown
+  \definedummyword\questiondown
+  \definedummyword\ordf
+  \definedummyword\ordm
   %
   % Although these internal commands shouldn't show up, sometimes they do.
-  \definedummyword{bf}%
-  \definedummyword{gtr}%
-  \definedummyword{hat}%
-  \definedummyword{less}%
-  \definedummyword{sf}%
-  \definedummyword{sl}%
-  \definedummyword{tclose}%
-  \definedummyword{tt}%
-  %
-  \definedummyword{LaTeX}%
-  \definedummyword{TeX}%
+  \definedummyword\bf
+  \definedummyword\gtr
+  \definedummyword\hat
+  \definedummyword\less
+  \definedummyword\sf
+  \definedummyword\sl
+  \definedummyword\tclose
+  \definedummyword\tt
+  %
+  \definedummyword\LaTeX
+  \definedummyword\TeX
   %
   % Assorted special characters.
-  \definedummyword{bullet}%
-  \definedummyword{comma}%
-  \definedummyword{copyright}%
-  \definedummyword{registeredsymbol}%
-  \definedummyword{dots}%
-  \definedummyword{enddots}%
-  \definedummyword{equiv}%
-  \definedummyword{error}%
-  \definedummyword{euro}%
-  \definedummyword{expansion}%
-  \definedummyword{minus}%
-  \definedummyword{pounds}%
-  \definedummyword{point}%
-  \definedummyword{print}%
-  \definedummyword{result}%
+  \definedummyword\bullet
+  \definedummyword\comma
+  \definedummyword\copyright
+  \definedummyword\registeredsymbol
+  \definedummyword\dots
+  \definedummyword\enddots
+  \definedummyword\equiv
+  \definedummyword\error
+  \definedummyword\euro
+  \definedummyword\guillemetleft
+  \definedummyword\guillemetright
+  \definedummyword\guilsinglleft
+  \definedummyword\guilsinglright
+  \definedummyword\expansion
+  \definedummyword\minus
+  \definedummyword\pounds
+  \definedummyword\point
+  \definedummyword\print
+  \definedummyword\quotedblbase
+  \definedummyword\quotedblleft
+  \definedummyword\quotedblright
+  \definedummyword\quoteleft
+  \definedummyword\quoteright
+  \definedummyword\quotesinglbase
+  \definedummyword\result
+  \definedummyword\textdegree
+  %
+  % We want to disable all macros so that they are not expanded by \write.
+  \macrolist
+  %
+  \normalturnoffactive
   %
   % Handle some cases of @value -- where it does not contain any
   % (non-fully-expandable) commands.
   \makevalueexpandable
-  %
-  % Normal spaces, not active ones.
-  \unsepspaces
-  %
-  % No macro expansion.
-  \turnoffmacros
 }
 
 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
 %
-% Better have this without active chars.
-{
-  \catcode`\~=\other
-  \gdef\commondummiesnofonts{%
-    % Control letters and accents.
-    \definedummyletter{!}%
-    \definedummyaccent{"}%
-    \definedummyaccent{'}%
-    \definedummyletter{*}%
-    \definedummyaccent{,}%
-    \definedummyletter{.}%
-    \definedummyletter{/}%
-    \definedummyletter{:}%
-    \definedummyaccent{=}%
-    \definedummyletter{?}%
-    \definedummyaccent{^}%
-    \definedummyaccent{`}%
-    \definedummyaccent{~}%
-    \definedummyword{u}%
-    \definedummyword{v}%
-    \definedummyword{H}%
-    \definedummyword{dotaccent}%
-    \definedummyword{ringaccent}%
-    \definedummyword{tieaccent}%
-    \definedummyword{ubaraccent}%
-    \definedummyword{udotaccent}%
-    \definedummyword{dotless}%
-    %
-    % Texinfo font commands.
-    \definedummyword{b}%
-    \definedummyword{i}%
-    \definedummyword{r}%
-    \definedummyword{sc}%
-    \definedummyword{t}%
-    %
-    % Commands that take arguments.
-    \definedummyword{acronym}%
-    \definedummyword{cite}%
-    \definedummyword{code}%
-    \definedummyword{command}%
-    \definedummyword{dfn}%
-    \definedummyword{emph}%
-    \definedummyword{env}%
-    \definedummyword{file}%
-    \definedummyword{kbd}%
-    \definedummyword{key}%
-    \definedummyword{math}%
-    \definedummyword{option}%
-    \definedummyword{samp}%
-    \definedummyword{strong}%
-    \definedummyword{tie}%
-    \definedummyword{uref}%
-    \definedummyword{url}%
-    \definedummyword{var}%
-    \definedummyword{verb}%
-    \definedummyword{w}%
-  }
+\def\commondummiesnofonts{%
+  % Control letters and accents.
+  \definedummyletter\!%
+  \definedummyaccent\"%
+  \definedummyaccent\'%
+  \definedummyletter\*%
+  \definedummyaccent\,%
+  \definedummyletter\.%
+  \definedummyletter\/%
+  \definedummyletter\:%
+  \definedummyaccent\=%
+  \definedummyletter\?%
+  \definedummyaccent\^%
+  \definedummyaccent\`%
+  \definedummyaccent\~%
+  \definedummyword\u
+  \definedummyword\v
+  \definedummyword\H
+  \definedummyword\dotaccent
+  \definedummyword\ringaccent
+  \definedummyword\tieaccent
+  \definedummyword\ubaraccent
+  \definedummyword\udotaccent
+  \definedummyword\dotless
+  %
+  % Texinfo font commands.
+  \definedummyword\b
+  \definedummyword\i
+  \definedummyword\r
+  \definedummyword\sc
+  \definedummyword\t
+  %
+  % Commands that take arguments.
+  \definedummyword\acronym
+  \definedummyword\cite
+  \definedummyword\code
+  \definedummyword\command
+  \definedummyword\dfn
+  \definedummyword\emph
+  \definedummyword\env
+  \definedummyword\file
+  \definedummyword\kbd
+  \definedummyword\key
+  \definedummyword\math
+  \definedummyword\option
+  \definedummyword\pxref
+  \definedummyword\ref
+  \definedummyword\samp
+  \definedummyword\strong
+  \definedummyword\tie
+  \definedummyword\uref
+  \definedummyword\url
+  \definedummyword\var
+  \definedummyword\verb
+  \definedummyword\w
+  \definedummyword\xref
 }
 
 % \indexnofonts is used when outputting the strings to sort the index
@@ -3314,13 +4095,9 @@ where each line of input produces a line of output.}
 %
 \def\indexnofonts{%
   % Accent commands should become @asis.
-  \def\definedummyaccent##1{%
-    \expandafter\let\csname ##1\endcsname\asis
-  }%
+  \def\definedummyaccent##1{\let##1\asis}%
   % We can just ignore other control letters.
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{}%
-  }%
+  \def\definedummyletter##1{\let##1\empty}%
   % Hopefully, all control words can become @asis.
   \let\definedummyword\definedummyaccent
   %
@@ -3367,15 +4144,35 @@ where each line of input produces a line of output.}
   \def\equiv{==}%
   \def\error{error}%
   \def\euro{euro}%
+  \def\guillemetleft{<<}%
+  \def\guillemetright{>>}%
+  \def\guilsinglleft{<}%
+  \def\guilsinglright{>}%
   \def\expansion{==>}%
   \def\minus{-}%
   \def\pounds{pounds}%
   \def\point{.}%
   \def\print{-|}%
+  \def\quotedblbase{"}%
+  \def\quotedblleft{"}%
+  \def\quotedblright{"}%
+  \def\quoteleft{`}%
+  \def\quoteright{'}%
+  \def\quotesinglbase{,}%
   \def\result{=>}%
+  \def\textdegree{degrees}%
   %
-  % Don't write macro names.
-  \emptyusermacros
+  % We need to get rid of all macros, leaving only the arguments (if present).
+  % Of course this is not nearly correct, but it is the best we can do for now.
+  % makeinfo does not expand macros in the argument to @deffn, which ends up
+  % writing an index entry, and texindex isn't prepared for an index sort entry
+  % that starts with \.
+  % 
+  % Since macro invocations are followed by braces, we can just redefine them
+  % to take a single TeX argument.  The case of a macro invocation that
+  % goes to end-of-line is not handled.
+  % 
+  \macrolist
 }
 
 \let\indexbackslash=0  %overridden during \printindex.
@@ -3403,11 +4200,7 @@ where each line of input produces a line of output.}
     %
     \edef\writeto{\csname#1indfile\endcsname}%
     %
-    \ifvmode
-      \dosubindsanitize
-    \else
-      \dosubindwrite
-    \fi
+    \safewhatsit\dosubindwrite
   }%
   \fi
 }
@@ -3422,7 +4215,6 @@ where each line of input produces a line of output.}
   %
   % Remember, we are within a group.
   \indexdummies % Must do this here, since \bf, etc expand at this stage
-  \escapechar=`\\
   \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
       % so it will be output as is; and it will print as backslash.
   %
@@ -3445,13 +4237,13 @@ where each line of input produces a line of output.}
   \temp
 }
 
-% Take care of unwanted page breaks:
+% Take care of unwanted page breaks/skips around a whatsit:
 %
 % If a skip is the last thing on the list now, preserve it
 % by backing up by \lastskip, doing the \write, then inserting
 % the skip again.  Otherwise, the whatsit generated by the
-% \write will make \lastskip zero.  The result is that sequences
-% like this:
+% \write or \pdfdest will make \lastskip zero.  The result is that
+% sequences like this:
 % @end defun
 % @tindex whatever
 % @defun ...
@@ -3475,25 +4267,31 @@ where each line of input produces a line of output.}
 %
 \edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
 %
+\newskip\whatsitskip
+\newcount\whatsitpenalty
+%
 % ..., ready, GO:
 %
-\def\dosubindsanitize{%
+\def\safewhatsit#1{%
+\ifhmode
+  #1%
+\else
   % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
-  \skip0 = \lastskip
+  \whatsitskip = \lastskip
   \edef\lastskipmacro{\the\lastskip}%
-  \count255 = \lastpenalty
+  \whatsitpenalty = \lastpenalty
   %
   % If \lastskip is nonzero, that means the last item was a
   % skip.  And since a skip is discardable, that means this
-  % -\skip0 glue we're inserting is preceded by a
+  % -\whatsitskip glue we're inserting is preceded by a
   % non-discardable item, therefore it is not a potential
   % breakpoint, therefore no \nobreak needed.
   \ifx\lastskipmacro\zeroskipmacro
   \else
-    \vskip-\skip0
+    \vskip-\whatsitskip
   \fi
   %
-  \dosubindwrite
+  #1%
   %
   \ifx\lastskipmacro\zeroskipmacro
     % If \lastskip was zero, perhaps the last item was a penalty, and
@@ -3507,13 +4305,14 @@ where each line of input produces a line of output.}
     %   Description.
     % would allow a break between the index-whatever whatsit
     % and the "Description." paragraph.
-    \ifnum\count255>9999 \penalty\count255 \fi
+    \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
   \else
     % On the other hand, if we had a nonzero \lastskip,
     % this make-up glue would be preceded by a non-discardable item
     % (the whatsit from the \write), so we must insert a \nobreak.
-    \nobreak\vskip\skip0
+    \nobreak\vskip\whatsitskip
   \fi
+\fi
 }
 
 % The index entry written in the file actually looks like
@@ -3556,6 +4355,7 @@ where each line of input produces a line of output.}
   %
   \smallfonts \rm
   \tolerance = 9500
+  \plainfrenchspacing
   \everypar = {}% don't want the \kern\-parindent from indentation suppression.
   %
   % See if the index file exists and is nonempty.
@@ -3685,11 +4485,8 @@ where each line of input produces a line of output.}
     % The following is kludged to not output a line of dots in the index if
     % there are no page numbers.  The next person who breaks this will be
     % cursed by a Unix daemon.
-    \def\tempa{{\rm }}%
-    \def\tempb{#1}%
-    \edef\tempc{\tempa}%
-    \edef\tempd{\tempb}%
-    \ifx\tempc\tempd
+    \setbox\boxA = \hbox{#1}%
+    \ifdim\wd\boxA = 0pt
       \ %
     \else
       %
@@ -3713,9 +4510,9 @@ where each line of input produces a line of output.}
   \endgroup
 }
 
-% Like \dotfill except takes at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 1 em.
 \def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
 
 \def\primary #1{\line{#1\hfil}}
 
@@ -3825,6 +4622,34 @@ where each line of input produces a line of output.}
 %
 % All done with double columns.
 \def\enddoublecolumns{%
+  % The following penalty ensures that the page builder is exercised
+  % _before_ we change the output routine.  This is necessary in the
+  % following situation:
+  %
+  % The last section of the index consists only of a single entry.
+  % Before this section, \pagetotal is less than \pagegoal, so no
+  % break occurs before the last section starts.  However, the last
+  % section, consisting of \initial and the single \entry, does not
+  % fit on the page and has to be broken off.  Without the following
+  % penalty the page builder will not be exercised until \eject
+  % below, and by that time we'll already have changed the output
+  % routine to the \balancecolumns version, so the next-to-last
+  % double-column page will be processed with \balancecolumns, which
+  % is wrong:  The two columns will go to the main vertical list, with
+  % the broken-off section in the recent contributions.  As soon as
+  % the output routine finishes, TeX starts reconsidering the page
+  % break.  The two columns and the broken-off section both fit on the
+  % page, because the two columns now take up only half of the page
+  % goal.  When TeX sees \eject from below which follows the final
+  % section, it invokes the new output routine that we've set after
+  % \balancecolumns below; \onepageout will try to fit the two columns
+  % and the final section into the vbox of \pageheight (see
+  % \pagebody), causing an overfull box.
+  %
+  % Note that glue won't work here, because glue does not exercise the
+  % page builder, unlike penalties (see The TeXbook, pp. 280-281).
+  \penalty0
+  %
   \output = {%
     % Split the last of the double-column material.  Leave it on the
     % current page, no automatic page break.
@@ -3934,11 +4759,15 @@ where each line of input produces a line of output.}
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
 
-% Each @chapter defines this as the name of the chapter.
-% page headings and footings can use it.  @section does likewise.
-% However, they are not reliable, because we don't use marks.
+% Each @chapter defines these (using marks) as the number+name, number
+% and name of the chapter.  Page headings and footings can use
+% these.  @section does likewise.
 \def\thischapter{}
+\def\thischapternum{}
+\def\thischaptername{}
 \def\thissection{}
+\def\thissectionnum{}
+\def\thissectionname{}
 
 \newcount\absseclevel % used to calculate proper heading level
 \newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
@@ -4239,7 +5068,20 @@ where each line of input produces a line of output.}
 
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
 \def\chappager{\par\vfill\supereject}
-\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
+% Because \domark is called before \chapoddpage, the filler page will
+% get the headings for the next chapter, which is wrong.  But we don't
+% care -- we just disable all headings on the filler page.
+\def\chapoddpage{%
+  \chappager
+  \ifodd\pageno \else
+    \begingroup
+      \evenheadline={\hfil}\evenfootline={\hfil}%
+      \oddheadline={\hfil}\oddfootline={\hfil}%
+      \hbox to 0pt{}%
+      \chappager
+    \endgroup
+  \fi
+}
 
 \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
 
@@ -4273,41 +5115,72 @@ where each line of input produces a line of output.}
 \def\Yappendixkeyword{Yappendix}
 %
 \def\chapmacro#1#2#3{%
+  % Insert the first mark before the heading break (see notes for \domark).
+  \let\prevchapterdefs=\lastchapterdefs
+  \let\prevsectiondefs=\lastsectiondefs
+  \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+                        \gdef\thissection{}}%
+  %
+  \def\temptype{#2}%
+  \ifx\temptype\Ynothingkeyword
+    \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+                          \gdef\thischapter{\thischaptername}}%
+  \else\ifx\temptype\Yomitfromtockeyword
+    \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+                          \gdef\thischapter{}}%
+  \else\ifx\temptype\Yappendixkeyword
+    \toks0={#1}%
+    \xdef\lastchapterdefs{%
+      \gdef\noexpand\thischaptername{\the\toks0}%
+      \gdef\noexpand\thischapternum{\appendixletter}%
+      \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum:
+                                 \noexpand\thischaptername}%
+    }%
+  \else
+    \toks0={#1}%
+    \xdef\lastchapterdefs{%
+      \gdef\noexpand\thischaptername{\the\toks0}%
+      \gdef\noexpand\thischapternum{\the\chapno}%
+      \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum:
+                                 \noexpand\thischaptername}%
+    }%
+  \fi\fi\fi
+  %
+  % Output the mark.  Pass it through \safewhatsit, to take care of
+  % the preceding space.
+  \safewhatsit\domark
+  %
+  % Insert the chapter heading break.
   \pchapsepmacro
+  %
+  % Now the second mark, after the heading break.  No break points
+  % between here and the heading.
+  \let\prevchapterdefs=\lastchapterdefs
+  \let\prevsectiondefs=\lastsectiondefs
+  \domark
+  %
   {%
     \chapfonts \rm
     %
-    % Have to define \thissection before calling \donoderef, because the
+    % Have to define \lastsection before calling \donoderef, because the
     % xref code eventually uses it.  On the other hand, it has to be called
     % after \pchapsepmacro, or the headline will change too soon.
-    \gdef\thissection{#1}%
-    \gdef\thischaptername{#1}%
+    \gdef\lastsection{#1}%
     %
     % Only insert the separating space if we have a chapter/appendix
     % number, and don't print the unnumbered ``number''.
-    \def\temptype{#2}%
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unnchap}%
-      \gdef\thischapter{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
       \def\toctype{omit}%
-      \gdef\thischapter{}%
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
       \def\toctype{app}%
-      % We don't substitute the actual chapter name into \thischapter
-      % because we don't want its macros evaluated now.  And we don't
-      % use \thissection because that changes with each section.
-      %
-      \xdef\thischapter{\putwordAppendix{} \appendixletter:
-                        \noexpand\thischaptername}%
     \else
       \setbox0 = \hbox{#3\enspace}%
       \def\toctype{numchap}%
-      \xdef\thischapter{\putwordChapter{} \the\chapno:
-                        \noexpand\thischaptername}%
     \fi\fi\fi
     %
     % Write the toc entry for this chapter.  Must come before the
@@ -4323,6 +5196,7 @@ where each line of input produces a line of output.}
     \donoderef{#2}%
     %
     % Typeset the actual heading.
+    \nobreak % Avoid page breaks at the interline glue.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0 \centerparametersmaybe
           \unhbox0 #1\par}%
@@ -4385,45 +5259,95 @@ where each line of input produces a line of output.}
 % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
 % section number.
 %
+\def\seckeyword{sec}
+%
 \def\sectionheading#1#2#3#4{%
   {%
     % Switch to the right set of fonts.
     \csname #2fonts\endcsname \rm
     %
+    \def\sectionlevel{#2}%
+    \def\temptype{#3}%
+    %
+    % Insert first mark before the heading break (see notes for \domark).
+    \let\prevsectiondefs=\lastsectiondefs
+    \ifx\temptype\Ynothingkeyword
+      \ifx\sectionlevel\seckeyword
+        \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+                              \gdef\thissection{\thissectionname}}%
+      \fi
+    \else\ifx\temptype\Yomitfromtockeyword
+      % Don't redefine \thissection.
+    \else\ifx\temptype\Yappendixkeyword
+      \ifx\sectionlevel\seckeyword
+        \toks0={#1}%
+        \xdef\lastsectiondefs{%
+          \gdef\noexpand\thissectionname{\the\toks0}%
+          \gdef\noexpand\thissectionnum{#4}%
+          \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
+                                     \noexpand\thissectionname}%
+        }%
+      \fi
+    \else
+      \ifx\sectionlevel\seckeyword
+        \toks0={#1}%
+        \xdef\lastsectiondefs{%
+          \gdef\noexpand\thissectionname{\the\toks0}%
+          \gdef\noexpand\thissectionnum{#4}%
+          \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
+                                     \noexpand\thissectionname}%
+        }%
+      \fi
+    \fi\fi\fi
+    %
+    % Output the mark.  Pass it through \safewhatsit, to take care of
+    % the preceding space.
+    \safewhatsit\domark
+    %
     % Insert space above the heading.
     \csname #2headingbreak\endcsname
     %
-    % Only insert the space after the number if we have a section number.
-    \def\sectionlevel{#2}%
-    \def\temptype{#3}%
+    % Now the second mark, after the heading break.  No break points
+    % between here and the heading.
+    \let\prevsectiondefs=\lastsectiondefs
+    \domark
     %
+    % Only insert the space after the number if we have a section number.
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unn}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       % for @headings -- no section number, don't include in toc,
-      % and don't redefine \thissection.
+      % and don't redefine \lastsection.
       \setbox0 = \hbox{}%
       \def\toctype{omit}%
       \let\sectionlevel=\empty
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{#4\enspace}%
       \def\toctype{app}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \else
       \setbox0 = \hbox{#4\enspace}%
       \def\toctype{num}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \fi\fi\fi
     %
-    % Write the toc entry (before \donoderef).  See comments in \chfplain.
+    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
     \writetocentry{\toctype\sectionlevel}{#1}{#4}%
     %
     % Write the node reference (= pdf destination for pdftex).
-    % Again, see comments in \chfplain.
+    % Again, see comments in \chapmacro.
     \donoderef{#3}%
     %
+    % Interline glue will be inserted when the vbox is completed.
+    % That glue will be a valid breakpoint for the page, since it'll be
+    % preceded by a whatsit (usually from the \donoderef, or from the
+    % \writetocentry if there was no node).  We don't want to allow that
+    % break, since then the whatsits could end up on page n while the
+    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
+    \nobreak
+    %
     % Output the actual section heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0  % zero if no section number
@@ -4482,11 +5406,11 @@ where each line of input produces a line of output.}
     \fi
     %
     \iflinks
-      \toks0 = {#2}%
-      \toks2 = \expandafter{\lastnode}%
-      \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}%
-                               {\the\toks2}{\noexpand\folio}}}%
-      \temp
+      {\atdummies
+       \edef\temp{%
+         \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
+       \temp
+      }%
     \fi
   \fi
   %
@@ -4499,6 +5423,31 @@ where each line of input produces a line of output.}
   \ifpdf \global\pdfmakepagedesttrue \fi
 }
 
+
+% These characters do not print properly in the Computer Modern roman
+% fonts, so we must take special care.  This is more or less redundant
+% with the Texinfo input format setup at the end of this file.
+% 
+\def\activecatcodes{%
+  \catcode`\"=\active
+  \catcode`\$=\active
+  \catcode`\<=\active
+  \catcode`\>=\active
+  \catcode`\\=\active
+  \catcode`\^=\active
+  \catcode`\_=\active
+  \catcode`\|=\active
+  \catcode`\~=\active
+}
+
+
+% Read the toc file, which is essentially Texinfo input.
+\def\readtocfile{%
+  \setupdatafile
+  \activecatcodes
+  \input \tocreadfilename
+}
+
 \newskip\contentsrightmargin \contentsrightmargin=1in
 \newcount\savepageno
 \newcount\lastnegativepageno \lastnegativepageno = -1
@@ -4515,29 +5464,29 @@ where each line of input produces a line of output.}
   %
   % Don't need to put `Contents' or `Short Contents' in the headline.
   % It is abundantly clear what they are.
-  \def\thischapter{}%
   \chapmacro{#1}{Yomitfromtoc}{}%
   %
   \savepageno = \pageno
   \begingroup                  % Set up to handle contents files properly.
-    \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
-    % We can't do this, because then an actual ^ in a section
-    % title fails, e.g., @chapter ^ -- exponentiation.  --karl, 9jul97.
-    %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
-    \raggedbottom             % Worry more about breakpoints than the bottom.
+    \raggedbottom              % Worry more about breakpoints than the bottom.
     \advance\hsize by -\contentsrightmargin % Don't use the full line length.
     %
     % Roman numerals for page numbers.
     \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
 }
 
+% redefined for the two-volume lispref.  We always output on
+% \jobname.toc even if this is redefined.
+% 
+\def\tocreadfilename{\jobname.toc}
 
 % Normal (long) toc.
+%
 \def\contents{%
   \startcontents{\putwordTOC}%
-    \openin 1 \jobname.toc
+    \openin 1 \tocreadfilename\space
     \ifeof 1 \else
-      \input \jobname.toc
+      \readtocfile
     \fi
     \vfill \eject
     \contentsalignmacro % in case @setchapternewpage odd is in effect
@@ -4573,9 +5522,9 @@ where each line of input produces a line of output.}
     \let\numsubsubsecentry = \numsecentry
     \let\appsubsubsecentry = \numsecentry
     \let\unnsubsubsecentry = \numsecentry
-    \openin 1 \jobname.toc
+    \openin 1 \tocreadfilename\space
     \ifeof 1 \else
-      \input \jobname.toc
+      \readtocfile
     \fi
     \closein 1
     \vfill \eject
@@ -4717,7 +5666,7 @@ where each line of input produces a line of output.}
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
 %
 \setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
@@ -4765,6 +5714,7 @@ where each line of input produces a line of output.}
   \let\/=\ptexslash
   \let\*=\ptexstar
   \let\t=\ptext
+  \let\frenchspacing=\plainfrenchspacing
   %
   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
   \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
@@ -4810,7 +5760,8 @@ where each line of input produces a line of output.}
 
 \let\afterenvbreak = \aboveenvbreak
 
-% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
+% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
+% also clear it, so that its embedded environments do the narrowing again.
 \let\nonarrowing=\relax
 
 % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
@@ -4847,7 +5798,7 @@ where each line of input produces a line of output.}
 				% each corner char, and rule thickness
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   % Flag to tell @lisp, etc., not to narrow margin.
-  \let\nonarrowing=\comment
+  \let\nonarrowing = t%
   \vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
@@ -4887,11 +5838,11 @@ where each line of input produces a line of output.}
   \parskip = 0pt
   \parindent = 0pt
   \emergencystretch = 0pt % don't try to avoid overfull boxes
-  % @cartouche defines \nonarrowing to inhibit narrowing
-  % at next level down.
   \ifx\nonarrowing\relax
     \advance \leftskip by \lispnarrowing
     \exdentamount=\lispnarrowing
+  \else
+    \let\nonarrowing = \relax
   \fi
   \let\exdent=\nofillexdent
 }
@@ -4906,12 +5857,18 @@ where each line of input produces a line of output.}
 \let\SETdispenvsize\relax
 \def\setnormaldispenv{%
   \ifx\SETdispenvsize\smallword
+    % end paragraph for sake of leading, in case document has no blank
+    % line.  This is redundant with what happens in \aboveenvbreak, but
+    % we need to do it before changing the fonts, and it's inconvenient
+    % to change the fonts afterward.
+    \ifnum \lastpenalty=10000 \else \endgraf \fi
     \smallexamplefonts \rm
   \fi
 }
 \def\setsmalldispenv{%
   \ifx\SETdispenvsize\nosmallword
   \else
+    \ifnum \lastpenalty=10000 \else \endgraf \fi
     \smallexamplefonts \rm
   \fi
 }
@@ -4938,11 +5895,10 @@ where each line of input produces a line of output.}
 %
 \maketwodispenvs {lisp}{example}{%
   \nonfillstart
-  \tt
+  \tt\quoteexpand
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
   \gobble       % eat return
 }
-
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
 \makedispenv {display}{%
@@ -4991,6 +5947,7 @@ where each line of input produces a line of output.}
     \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
     \exdentamount = \lispnarrowing
+  \else
     \let\nonarrowing = \relax
   \fi
   \parsearg\quotationlabel
@@ -5069,6 +6026,34 @@ where each line of input produces a line of output.}
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
 \def\starttabbox{\setbox0=\hbox\bgroup}
+
+% Allow an option to not replace quotes with a regular directed right
+% quote/apostrophe (char 0x27), but instead use the undirected quote
+% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
+% the default, but it works for pasting with more pdf viewers (at least
+% evince), the lilypond developers report.  xpdf does work with the
+% regular 0x27.  
+% 
+\def\codequoteright{%
+  \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+    \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+      '%
+    \else \char'15 \fi
+  \else \char'15 \fi
+}
+%
+% and a similar option for the left quote char vs. a grave accent.
+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
+% the code environments to do likewise.
+% 
+\def\codequoteleft{%
+  \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+    \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+      `%
+    \else \char'22 \fi
+  \else \char'22 \fi
+}
+%
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
@@ -5081,15 +6066,25 @@ where each line of input produces a line of output.}
       \wd0=\dimen0 \box0 \starttabbox
     }%
   }
+  \catcode`\'=\active
+  \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
+  %
+  \catcode`\`=\active
+  \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
+  %
+  \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
 \endgroup
+
+% start the verbatim environment.
 \def\setupverbatim{%
+  \let\nonarrowing = t%
   \nonfillstart
-  \advance\leftskip by -\defbodyindent
   % Easiest (and conventionally used) font for verbatim
   \tt
   \def\par{\leavevmode\egroup\box0\endgraf}%
   \catcode`\`=\active
   \tabexpand
+  \quoteexpand
   % Respect line breaks,
   % print special symbols as themselves, and
   % make each space count
@@ -5174,27 +6169,35 @@ where each line of input produces a line of output.}
   \endgroup
 }
 
+
 \message{defuns,}
 % @defun etc.
 
 \newskip\defbodyindent \defbodyindent=.4in
 \newskip\defargsindent \defargsindent=50pt
 \newskip\deflastargmargin \deflastargmargin=18pt
+\newcount\defunpenalty
 
 % Start the processing of @deffn:
 \def\startdefun{%
   \ifnum\lastpenalty<10000
     \medbreak
+    \defunpenalty=10003 % Will keep this @deffn together with the
+                        % following @def command, see below.
   \else
     % If there are two @def commands in a row, we'll have a \nobreak,
     % which is there to keep the function description together with its
     % header.  But if there's nothing but headers, we need to allow a
     % break somewhere.  Check specifically for penalty 10002, inserted
-    % by \defargscommonending, instead of 10000, since the sectioning
+    % by \printdefunline, instead of 10000, since the sectioning
     % commands also insert a nobreak penalty, and we don't want to allow
     % a break between a section heading and a defun.
-    % 
-    \ifnum\lastpenalty=10002 \penalty2000 \fi
+    %
+    % As a minor refinement, we avoid "club" headers by signalling
+    % with penalty of 10003 after the very first @deffn in the
+    % sequence (see above), and penalty of 10002 after any following
+    % @def command.
+    \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
     %
     % Similarly, after a section heading, do not allow a break.
     % But do insert the glue.
@@ -5212,7 +6215,7 @@ where each line of input produces a line of output.}
   %
   % As above, allow line break if we have multiple x headers in a row.
   % It's not a great place, though.
-  \ifnum\lastpenalty=10002 \penalty3000 \fi
+  \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
   %
   % And now, it's time to reuse the body of the original defun:
   \expandafter\gobbledefun#1%
@@ -5230,7 +6233,7 @@ where each line of input produces a line of output.}
     \advance\rightskip by 0pt plus 1fil
     \endgraf
     \nobreak\vskip -\parskip
-    \penalty 10002  % signal to \startdefun and \dodefunx
+    \penalty\defunpenalty  % signal to \startdefun and \dodefunx
     % Some of the @defun-type tags do not enable magic parentheses,
     % rendering the following check redundant.  But we don't optimize.
     \checkparencounts
@@ -5499,12 +6502,14 @@ where each line of input produces a line of output.}
   \ifnum\parencount=0 \else \badparencount \fi
   \ifnum\brackcount=0 \else \badbrackcount \fi
 }
+% these should not use \errmessage; the glibc manual, at least, actually
+% has such constructs (when documenting function pointers).
 \def\badparencount{%
-  \errmessage{Unbalanced parentheses in @def}%
+  \message{Warning: unbalanced parentheses in @def...}%
   \global\parencount=0
 }
 \def\badbrackcount{%
-  \errmessage{Unbalanced square braces in @def}%
+  \message{Warning: unbalanced square brackets in @def...}%
   \global\brackcount=0
 }
 
@@ -5539,7 +6544,6 @@ where each line of input produces a line of output.}
     \spaceisspace
     %
     % Append \endinput to make sure that TeX does not see the ending newline.
-    %
     % I've verified that it is necessary both for e-TeX and for ordinary TeX
     %							--kasal, 29nov03
     \scantokens{#1\endinput}%
@@ -5554,8 +6558,19 @@ where each line of input produces a line of output.}
 \newcount\paramno   % Count of parameters
 \newtoks\macname    % Macro name
 \newif\ifrecursive  % Is it recursive?
-\def\macrolist{}    % List of all defined macros in the form
-                    % \do\macro1\do\macro2...
+
+% List of all defined macros in the form
+%    \definedummyword\macro1\definedummyword\macro2...
+% Currently is also contains all @aliases; the list can be split
+% if there is a need.
+\def\macrolist{}
+
+% Add the macro to \macrolist
+\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
+\def\addtomacrolistxxx#1{%
+     \toks0 = \expandafter{\macrolist\definedummyword#1}%
+     \xdef\macrolist{\the\toks0}%
+}
 
 % Utility routines.
 % This does \let #1 = #2, with \csnames; that is,
@@ -5589,6 +6604,10 @@ where each line of input produces a line of output.}
 % all characters are catcode 10, 11 or 12, except \ which is active
 % (as in normal texinfo). It is necessary to change the definition of \.
 
+% Non-ASCII encodings make 8-bit characters active, so un-activate
+% them to avoid their expansion.  Must do this non-globally, to
+% confine the change to the current group.
+
 % It's necessary to have hard CRs when the macro is executed. This is
 % done by  making ^^M (\endlinechar) catcode 12 when reading the macro
 % body, and then making it the \newlinechar in \scanmacro.
@@ -5603,6 +6622,7 @@ where each line of input produces a line of output.}
   \catcode`\_=\other
   \catcode`\|=\other
   \catcode`\~=\other
+  \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
 }
 
 \def\scanargctxt{%
@@ -5653,10 +6673,7 @@ where each line of input produces a line of output.}
      \else \errmessage{Macro name \the\macname\space already defined}\fi
      \global\cslet{macsave.\the\macname}{\the\macname}%
      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
-     % Add the macroname to \macrolist
-     \toks0 = \expandafter{\macrolist\do}%
-     \xdef\macrolist{\the\toks0
-       \expandafter\noexpand\csname\the\macname\endcsname}%
+     \addtomacrolist{\the\macname}%
   \fi
   \begingroup \macrobodyctxt
   \ifrecursive \expandafter\parsermacbody
@@ -5670,7 +6687,7 @@ where each line of input produces a line of output.}
     % Remove the macro name from \macrolist:
     \begingroup
       \expandafter\let\csname#1\endcsname \relax
-      \let\do\unmacrodo
+      \let\definedummyword\unmacrodo
       \xdef\macrolist{\macrolist}%
     \endgroup
   \else
@@ -5682,10 +6699,10 @@ where each line of input produces a line of output.}
 % macro definitions that have been changed to \relax.
 %
 \def\unmacrodo#1{%
-  \ifx#1\relax
+  \ifx #1\relax
     % remove this
   \else
-    \noexpand\do \noexpand #1%
+    \noexpand\definedummyword \noexpand#1%
   \fi
 }
 
@@ -5798,30 +6815,11 @@ where each line of input produces a line of output.}
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
 % as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
     \expandafter\parsearg
-  \fi \next}
-
-% We want to disable all macros during \shipout so that they are not
-% expanded by \write.
-\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
-  \edef\next{\macrolist}\expandafter\endgroup\next}
-
-% For \indexnofonts, we need to get rid of all macros, leaving only the
-% arguments (if present).  Of course this is not nearly correct, but it
-% is the best we can do for now.  makeinfo does not expand macros in the
-% argument to @deffn, which ends up writing an index entry, and texindex
-% isn't prepared for an index sort entry that starts with \.
-% 
-% Since macro invocations are followed by braces, we can just redefine them
-% to take a single TeX argument.  The case of a macro invocation that
-% goes to end-of-line is not handled.
-% 
-\def\emptyusermacros{\begingroup
-  \def\do##1{\let\noexpand##1=\noexpand\asis}%
-  \edef\next{\macrolist}\expandafter\endgroup\next}
+  \fi \macnamexxx}
 
 
 % @alias.
@@ -5832,6 +6830,7 @@ where each line of input produces a line of output.}
 \def\aliasyyy #1=#2\relax{%
   {%
     \expandafter\let\obeyedspace=\empty
+    \addtomacrolist{#1}%
     \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
   }%
   \next
@@ -5841,7 +6840,6 @@ where each line of input produces a line of output.}
 \message{cross references,}
 
 \newwrite\auxfile
-
 \newif\ifhavexrefs    % True if xref values are known.
 \newif\ifwarnedxrefs  % True if we warned once that they aren't known.
 
@@ -5886,7 +6884,7 @@ where each line of input produces a line of output.}
 
 % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
 % anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \thissection,
+% 1) NAME-title - the current sectioning name taken from \lastsection,
 %                 or the anchor name.
 % 2) NAME-snt   - section number and type, passed as the SNT arg, or
 %                 empty for anchors.
@@ -5901,16 +6899,14 @@ where each line of input produces a line of output.}
   \iflinks
     {%
       \atdummies  % preserve commands, but don't expand them
-      \turnoffactive
-      \otherbackslash
       \edef\writexrdef##1##2{%
 	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
 	  ##1}{##2}}% these are parameters of \writexrdef
       }%
-      \toks0 = \expandafter{\thissection}%
+      \toks0 = \expandafter{\lastsection}%
       \immediate \writexrdef{title}{\the\toks0 }%
       \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-      \writexrdef{pg}{\folio}% will be written later, during \shipout
+      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
     }%
   \fi
 }
@@ -5956,16 +6952,21 @@ where each line of input produces a line of output.}
   \ifpdf
     \leavevmode
     \getfilename{#4}%
-    {\turnoffactive \otherbackslash
+    {\indexnofonts
+     \turnoffactive
+     % See comments at \activebackslashdouble.
+     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
+      \backslashparens\pdfxrefdest}%
+     %
      \ifnum\filenamelength>0
        \startlink attr{/Border [0 0 0]}%
-         goto file{\the\filename.pdf} name{#1}%
+         goto file{\the\filename.pdf} name{\pdfxrefdest}%
      \else
        \startlink attr{/Border [0 0 0]}%
-         goto name{\pdfmkpgn{#1}}%
+         goto name{\pdfmkpgn{\pdfxrefdest}}%
      \fi
     }%
-    \linkcolor
+    \setcolor{\linkcolor}%
   \fi
   %
   % Float references are printed completely differently: "Figure 1.2"
@@ -5976,7 +6977,6 @@ where each line of input produces a line of output.}
     % include an _ in the xref name, etc.
     \indexnofonts
     \turnoffactive
-    \otherbackslash
     \expandafter\global\expandafter\let\expandafter\Xthisreftitle
       \csname XR#1-title\endcsname
   }%
@@ -5984,7 +6984,7 @@ where each line of input produces a line of output.}
     % If the user specified the print name (third arg) to the ref,
     % print it instead of our usual "Figure 1.2".
     \ifdim\wd0 = 0pt
-      \refx{#1-snt}%
+      \refx{#1-snt}{}%
     \else
       \printedrefname
     \fi
@@ -6004,14 +7004,14 @@ where each line of input produces a line of output.}
     % is a loss.  Therefore, we give the text of the node name again, so it
     % is as if TeX is seeing it for the first time.
     \ifdim \wd1 > 0pt
-      \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+      \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
     \else
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
       % into the usual \leavevmode...\vrule stuff for purposes of
       % printing. So we \turnoffactive for the \refx-snt, back on for the
       % printing, back off for the \refx-pg.
-      {\turnoffactive \otherbackslash
+      {\turnoffactive
        % Only output a following space if the -snt ref is nonempty; for
        % @unnumbered and @anchor, it won't be.
        \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
@@ -6024,7 +7024,7 @@ where each line of input produces a line of output.}
       ,\space
       %
       % output the `page 3'.
-      \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
+      \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
     \fi
   \fi
   \endlink
@@ -6100,10 +7100,18 @@ where each line of input produces a line of output.}
 % collisions).  But if this is a float type, we have more work to do.
 %
 \def\xrdef#1#2{%
-  \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
+  {% The node name might contain 8-bit characters, which in our current
+   % implementation are changed to commands like @'e.  Don't let these
+   % mess up the control sequence name.
+    \indexnofonts
+    \turnoffactive
+    \xdef\safexrefname{#1}%
+  }%
+  %
+  \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
   %
   % Was that xref control sequence that we just defined for a float?
-  \expandafter\iffloat\csname XR#1\endcsname
+  \expandafter\iffloat\csname XR\safexrefname\endcsname
     % it was a float, and we have the (safe) float type in \iffloattype.
     \expandafter\let\expandafter\floatlist
       \csname floatlist\iffloattype\endcsname
@@ -6118,7 +7126,8 @@ where each line of input produces a line of output.}
     %
     % Remember this xref in the control sequence \floatlistFLOATTYPE,
     % for later use in \listoffloats.
-    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
+    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
+      {\safexrefname}}%
   \fi
 }
 
@@ -6127,13 +7136,13 @@ where each line of input produces a line of output.}
 \def\tryauxfile{%
   \openin 1 \jobname.aux
   \ifeof 1 \else
-    \readauxfile
+    \readdatafile{aux}%
     \global\havexrefstrue
   \fi
   \closein 1
 }
 
-\def\readauxfile{\begingroup
+\def\setupdatafile{%
   \catcode`\^^@=\other
   \catcode`\^^A=\other
   \catcode`\^^B=\other
@@ -6202,11 +7211,11 @@ where each line of input produces a line of output.}
   %
   % Make the characters 128-255 be printing characters.
   {%
-    \count 1=128
+    \count1=128
     \def\loop{%
-      \catcode\count 1=\other
-      \advance\count 1 by 1
-      \ifnum \count 1<256 \loop \fi
+      \catcode\count1=\other
+      \advance\count1 by 1
+      \ifnum \count1<256 \loop \fi
     }%
   }%
   %
@@ -6214,8 +7223,12 @@ where each line of input produces a line of output.}
   \catcode`\{=1
   \catcode`\}=2
   \catcode`\@=0
-  %
-  \input \jobname.aux
+}
+
+\def\readdatafile#1{%
+\begingroup
+  \setupdatafile
+  \input\jobname.#1
 \endgroup}
 
 
@@ -6411,7 +7424,7 @@ where each line of input produces a line of output.}
     % above and below.
     \nobreak\vskip\parskip
     \nobreak
-    \line\bgroup\hss
+    \line\bgroup
   \fi
   %
   % Output the image.
@@ -6424,7 +7437,7 @@ where each line of input produces a line of output.}
     \epsfbox{#1.eps}%
   \fi
   %
-  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
+  \ifimagevmode \egroup \bigbreak \fi  % space after the image
 \endgroup}
 
 
@@ -6491,13 +7504,13 @@ where each line of input produces a line of output.}
       \global\advance\floatno by 1
       %
       {%
-        % This magic value for \thissection is output by \setref as the
+        % This magic value for \lastsection is output by \setref as the
         % XREFLABEL-title value.  \xrefX uses it to distinguish float
         % labels (which have a completely different output format) from
         % node and anchor labels.  And \xrdef uses it to construct the
         % lists of floats.
         %
-        \edef\thissection{\floatmagic=\safefloattype}%
+        \edef\lastsection{\floatmagic=\safefloattype}%
         \setref{\floatlabel}{Yfloat}%
       }%
     \fi
@@ -6564,7 +7577,8 @@ where each line of input produces a line of output.}
       % \floatlabel-lof.  Besides \floatident, we include the short
       % caption if specified, else the full caption if specified, else nothing.
       {%
-        \atdummies \turnoffactive \otherbackslash
+        \atdummies
+        %
         % since we read the caption text in the macro world, where ^^M
         % is turned into a normal character, we have to scan it back, so
         % we don't write the literal three characters "^^M" into the aux file.
@@ -6585,8 +7599,9 @@ where each line of input produces a line of output.}
   %
   % place the captured inserts
   %
-  % BEWARE: when the floats start float, we have to issue warning whenever an
-  % insert appears inside a float which could possibly float. --kasal, 26may04
+  % BEWARE: when the floats start floating, we have to issue warning
+  % whenever an insert appears inside a float which could possibly
+  % float. --kasal, 26may04
   %
   \checkinserts
 }
@@ -6630,7 +7645,7 @@ where each line of input produces a line of output.}
 
 % #1 is the control sequence we are passed; we expand into a conditional
 % which is true if #1 represents a float ref.  That is, the magic
-% \thissection value which we \setref above.
+% \lastsection value which we \setref above.
 %
 \def\iffloat#1{\expandafter\doiffloat#1==\finish}
 %
@@ -6691,39 +7706,871 @@ where each line of input produces a line of output.}
   \writeentry
 }}
 
+
 \message{localization,}
-% and i18n.
 
 % @documentlanguage is usually given very early, just after
 % @setfilename.  If done too late, it may not override everything
-% properly.  Single argument is the language abbreviation.
-% It would be nice if we could set up a hyphenation file here.
+% properly.  Single argument is the language (de) or locale (de_DE)
+% abbreviation.  It would be nice if we could set up a hyphenation file.
 %
-\parseargdef\documentlanguage{%
+{
+  \catcode`\_ = \active
+  \globaldefs=1
+\parseargdef\documentlanguage{\begingroup
+  \let_=\normalunderscore  % normal _ character for filenames
   \tex % read txi-??.tex file in plain TeX.
-    % Read the file if it exists.
+    % Read the file by the name they passed if it exists.
     \openin 1 txi-#1.tex
     \ifeof 1
-      \errhelp = \nolanghelp
-      \errmessage{Cannot read language file txi-#1.tex}%
+      \documentlanguagetrywithoutunderscore{#1_\finish}%
     \else
       \input txi-#1.tex
     \fi
     \closein 1
   \endgroup
+\endgroup}
 }
+%
+% If they passed de_DE, and txi-de_DE.tex doesn't exist,
+% try txi-de.tex.
+% 
+\def\documentlanguagetrywithoutunderscore#1_#2\finish{%
+  \openin 1 txi-#1.tex
+  \ifeof 1
+    \errhelp = \nolanghelp
+    \errmessage{Cannot read language file txi-#1.tex}%
+  \else
+    \input txi-#1.tex
+  \fi
+  \closein 1
+}
+%
 \newhelp\nolanghelp{The given language definition file cannot be found or
 is empty.  Maybe you need to install it?  In the current directory
 should work if nowhere else does.}
 
+% Set the catcode of characters 128 through 255 to the specified number.
+%
+\def\setnonasciicharscatcode#1{%
+   \count255=128
+   \loop\ifnum\count255<256
+      \global\catcode\count255=#1\relax
+      \advance\count255 by 1
+   \repeat
+}
 
-% @documentencoding should change something in TeX eventually, most
-% likely, but for now just recognize it.
-\let\documentencoding = \comment
+\def\setnonasciicharscatcodenonglobal#1{%
+   \count255=128
+   \loop\ifnum\count255<256
+      \catcode\count255=#1\relax
+      \advance\count255 by 1
+   \repeat
+}
 
+% @documentencoding sets the definition of non-ASCII characters
+% according to the specified encoding.
+%
+\parseargdef\documentencoding{%
+  % Encoding being declared for the document.
+  \def\declaredencoding{\csname #1.enc\endcsname}%
+  %
+  % Supported encodings: names converted to tokens in order to be able
+  % to compare them with \ifx.
+  \def\ascii{\csname US-ASCII.enc\endcsname}%
+  \def\latnine{\csname ISO-8859-15.enc\endcsname}%
+  \def\latone{\csname ISO-8859-1.enc\endcsname}%
+  \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
+  \def\utfeight{\csname UTF-8.enc\endcsname}%
+  %
+  \ifx \declaredencoding \ascii
+     \asciichardefs
+  %
+  \else \ifx \declaredencoding \lattwo
+     \setnonasciicharscatcode\active
+     \lattwochardefs
+  %
+  \else \ifx \declaredencoding \latone 
+     \setnonasciicharscatcode\active
+     \latonechardefs
+  %
+  \else \ifx \declaredencoding \latnine
+     \setnonasciicharscatcode\active
+     \latninechardefs
+  %
+  \else \ifx \declaredencoding \utfeight
+     \setnonasciicharscatcode\active
+     \utfeightchardefs
+  %
+  \else 
+    \message{Unknown document encoding #1, ignoring.}%
+  %
+  \fi % utfeight
+  \fi % latnine
+  \fi % latone
+  \fi % lattwo
+  \fi % ascii
+}
+
+% A message to be logged when using a character that isn't available
+% the default font encoding (OT1).
+% 
+\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
+
+% Take account of \c (plain) vs. \, (Texinfo) difference.
+\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
+
+% First, make active non-ASCII characters in order for them to be
+% correctly categorized when TeX reads the replacement text of
+% macros containing the character definitions.
+\setnonasciicharscatcode\active
+%
+% Latin1 (ISO-8859-1) character definitions.
+\def\latonechardefs{%
+  \gdef^^a0{~} 
+  \gdef^^a1{\exclamdown}
+  \gdef^^a2{\missingcharmsg{CENT SIGN}} 
+  \gdef^^a3{{\pounds}}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\missingcharmsg{YEN SIGN}}
+  \gdef^^a6{\missingcharmsg{BROKEN BAR}} 
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}} 
+  \gdef^^a9{\copyright} 
+  \gdef^^aa{\ordf}
+  \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} 
+  \gdef^^ac{$\lnot$}
+  \gdef^^ad{\-} 
+  \gdef^^ae{\registeredsymbol} 
+  \gdef^^af{\={}}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{$\pm$}
+  \gdef^^b2{$^2$}
+  \gdef^^b3{$^3$}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{$\mu$}
+  \gdef^^b6{\P}
+  %
+  \gdef^^b7{$^.$}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{$^1$}
+  \gdef^^ba{\ordm}
+  %
+  \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}}
+  \gdef^^bc{$1\over4$}
+  \gdef^^bd{$1\over2$}
+  \gdef^^be{$3\over4$}
+  \gdef^^bf{\questiondown}
+  %
+  \gdef^^c0{\`A}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\~A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\ringaccent A} 
+  \gdef^^c6{\AE}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\`E}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\^E}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\`I}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\"I}
+  %
+  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
+  \gdef^^d1{\~N}
+  \gdef^^d2{\`O}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\~O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\O}
+  \gdef^^d9{\`U}
+  \gdef^^da{\'U}
+  \gdef^^db{\^U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\`a}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\~a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\ringaccent a}
+  \gdef^^e6{\ae}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\`e}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\^e}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\`{\dotless i}}
+  \gdef^^ed{\'{\dotless i}}
+  \gdef^^ee{\^{\dotless i}}
+  \gdef^^ef{\"{\dotless i}}
+  %
+  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
+  \gdef^^f1{\~n}
+  \gdef^^f2{\`o}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\~o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\o}
+  \gdef^^f9{\`u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\^u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
+  \gdef^^ff{\"y}
+}
+
+% Latin9 (ISO-8859-15) encoding character definitions.
+\def\latninechardefs{%
+  % Encoding is almost identical to Latin1.
+  \latonechardefs
+  %
+  \gdef^^a4{\euro}
+  \gdef^^a6{\v S}
+  \gdef^^a8{\v s}
+  \gdef^^b4{\v Z}
+  \gdef^^b8{\v z}
+  \gdef^^bc{\OE}
+  \gdef^^bd{\oe}
+  \gdef^^be{\"Y}
+}
+
+% Latin2 (ISO-8859-2) character definitions.
+\def\lattwochardefs{%
+  \gdef^^a0{~}
+  \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}}
+  \gdef^^a2{\u{}}
+  \gdef^^a3{\L}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\v L}
+  \gdef^^a6{\'S}
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\v S}
+  \gdef^^aa{\cedilla S}
+  \gdef^^ab{\v T}
+  \gdef^^ac{\'Z}
+  \gdef^^ad{\-}
+  \gdef^^ae{\v Z}
+  \gdef^^af{\dotaccent Z}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}}
+  \gdef^^b2{\missingcharmsg{OGONEK}}
+  \gdef^^b3{\l}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{\v l}
+  \gdef^^b6{\'s}
+  \gdef^^b7{\v{}}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{\v s}
+  \gdef^^ba{\cedilla s}
+  \gdef^^bb{\v t}
+  \gdef^^bc{\'z}
+  \gdef^^bd{\H{}}
+  \gdef^^be{\v z}
+  \gdef^^bf{\dotaccent z}
+  %
+  \gdef^^c0{\'R}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\u A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\'L}
+  \gdef^^c6{\'C}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\v C}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\v E}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\v D}
+  %
+  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
+  \gdef^^d1{\'N}
+  \gdef^^d2{\v N}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\H O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\v R}
+  \gdef^^d9{\ringaccent U} 
+  \gdef^^da{\'U}
+  \gdef^^db{\H U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\cedilla T}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\'r}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\u a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\'l}
+  \gdef^^e6{\'c}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\v c}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\v e}
+  \gdef^^ed{\'\i}
+  \gdef^^ee{\^\i}
+  \gdef^^ef{\v d}
+  %
+  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
+  \gdef^^f1{\'n}
+  \gdef^^f2{\v n}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\H o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\v r}
+  \gdef^^f9{\ringaccent u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\H u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\cedilla t}
+  \gdef^^ff{\dotaccent{}}
+}
+
+% UTF-8 character definitions.
+% 
+% This code to support UTF-8 is based on LaTeX's utf8.def, with some
+% changes for Texinfo conventions.  It is included here under the GPL by
+% permission from Frank Mittelbach and the LaTeX team.
+% 
+\newcount\countUTFx
+\newcount\countUTFy
+\newcount\countUTFz
 
-% Page size parameters.
+\gdef\UTFviiiTwoOctets#1#2{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\endcsname}
 %
+\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
+%
+\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
+
+\gdef\UTFviiiDefined#1{%
+  \ifx #1\relax
+    \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
+  \else
+    \expandafter #1%
+  \fi
+}
+
+\begingroup
+  \catcode`\~13
+  \catcode`\"12
+
+  \def\UTFviiiLoop{%
+    \global\catcode\countUTFx\active
+    \uccode`\~\countUTFx
+    \uppercase\expandafter{\UTFviiiTmp}%
+    \advance\countUTFx by 1
+    \ifnum\countUTFx < \countUTFy
+      \expandafter\UTFviiiLoop
+    \fi}
+
+  \countUTFx = "C2
+  \countUTFy = "E0
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
+  \UTFviiiLoop
+
+  \countUTFx = "E0
+  \countUTFy = "F0
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
+  \UTFviiiLoop
+
+  \countUTFx = "F0
+  \countUTFy = "F4
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiFourOctets\string~}}
+  \UTFviiiLoop
+\endgroup
+
+\begingroup
+  \catcode`\"=12
+  \catcode`\<=12
+  \catcode`\.=12
+  \catcode`\,=12
+  \catcode`\;=12
+  \catcode`\!=12
+  \catcode`\~=13
+
+  \gdef\DeclareUnicodeCharacter#1#2{%
+    \countUTFz = "#1\relax
+    \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
+    \begingroup
+      \parseXMLCharref
+      \def\UTFviiiTwoOctets##1##2{%
+        \csname u8:##1\string ##2\endcsname}%
+      \def\UTFviiiThreeOctets##1##2##3{%
+        \csname u8:##1\string ##2\string ##3\endcsname}%
+      \def\UTFviiiFourOctets##1##2##3##4{%
+        \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
+      \expandafter\expandafter\expandafter\expandafter
+       \expandafter\expandafter\expandafter
+       \gdef\UTFviiiTmp{#2}%
+    \endgroup}
+
+  \gdef\parseXMLCharref{%
+    \ifnum\countUTFz < "A0\relax
+      \errhelp = \EMsimple
+      \errmessage{Cannot define Unicode char value < 00A0}%
+    \else\ifnum\countUTFz < "800\relax
+      \parseUTFviiiA,%
+      \parseUTFviiiB C\UTFviiiTwoOctets.,%
+    \else\ifnum\countUTFz < "10000\relax
+      \parseUTFviiiA;%
+      \parseUTFviiiA,%
+      \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
+    \else
+      \parseUTFviiiA;%
+      \parseUTFviiiA,%
+      \parseUTFviiiA!%
+      \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
+    \fi\fi\fi
+  }
+
+  \gdef\parseUTFviiiA#1{%
+    \countUTFx = \countUTFz
+    \divide\countUTFz by 64
+    \countUTFy = \countUTFz
+    \multiply\countUTFz by 64
+    \advance\countUTFx by -\countUTFz
+    \advance\countUTFx by 128
+    \uccode `#1\countUTFx
+    \countUTFz = \countUTFy}
+
+  \gdef\parseUTFviiiB#1#2#3#4{%
+    \advance\countUTFz by "#10\relax
+    \uccode `#3\countUTFz
+    \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
+\endgroup
+
+\def\utfeightchardefs{%
+  \DeclareUnicodeCharacter{00A0}{\tie}
+  \DeclareUnicodeCharacter{00A1}{\exclamdown}
+  \DeclareUnicodeCharacter{00A3}{\pounds}
+  \DeclareUnicodeCharacter{00A8}{\"{ }}
+  \DeclareUnicodeCharacter{00A9}{\copyright}
+  \DeclareUnicodeCharacter{00AA}{\ordf}
+  \DeclareUnicodeCharacter{00AB}{\guillemetleft}
+  \DeclareUnicodeCharacter{00AD}{\-}
+  \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
+  \DeclareUnicodeCharacter{00AF}{\={ }}
+
+  \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
+  \DeclareUnicodeCharacter{00B4}{\'{ }}
+  \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
+  \DeclareUnicodeCharacter{00BA}{\ordm}
+  \DeclareUnicodeCharacter{00BB}{\guillemetright}
+  \DeclareUnicodeCharacter{00BF}{\questiondown}
+
+  \DeclareUnicodeCharacter{00C0}{\`A}
+  \DeclareUnicodeCharacter{00C1}{\'A}
+  \DeclareUnicodeCharacter{00C2}{\^A}
+  \DeclareUnicodeCharacter{00C3}{\~A}
+  \DeclareUnicodeCharacter{00C4}{\"A}
+  \DeclareUnicodeCharacter{00C5}{\AA}
+  \DeclareUnicodeCharacter{00C6}{\AE}
+  \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
+  \DeclareUnicodeCharacter{00C8}{\`E}
+  \DeclareUnicodeCharacter{00C9}{\'E}
+  \DeclareUnicodeCharacter{00CA}{\^E}
+  \DeclareUnicodeCharacter{00CB}{\"E}
+  \DeclareUnicodeCharacter{00CC}{\`I}
+  \DeclareUnicodeCharacter{00CD}{\'I}
+  \DeclareUnicodeCharacter{00CE}{\^I}
+  \DeclareUnicodeCharacter{00CF}{\"I}
+
+  \DeclareUnicodeCharacter{00D1}{\~N}
+  \DeclareUnicodeCharacter{00D2}{\`O}
+  \DeclareUnicodeCharacter{00D3}{\'O}
+  \DeclareUnicodeCharacter{00D4}{\^O}
+  \DeclareUnicodeCharacter{00D5}{\~O}
+  \DeclareUnicodeCharacter{00D6}{\"O}
+  \DeclareUnicodeCharacter{00D8}{\O}
+  \DeclareUnicodeCharacter{00D9}{\`U}
+  \DeclareUnicodeCharacter{00DA}{\'U}
+  \DeclareUnicodeCharacter{00DB}{\^U}
+  \DeclareUnicodeCharacter{00DC}{\"U}
+  \DeclareUnicodeCharacter{00DD}{\'Y}
+  \DeclareUnicodeCharacter{00DF}{\ss}
+
+  \DeclareUnicodeCharacter{00E0}{\`a}
+  \DeclareUnicodeCharacter{00E1}{\'a}
+  \DeclareUnicodeCharacter{00E2}{\^a}
+  \DeclareUnicodeCharacter{00E3}{\~a}
+  \DeclareUnicodeCharacter{00E4}{\"a}
+  \DeclareUnicodeCharacter{00E5}{\aa}
+  \DeclareUnicodeCharacter{00E6}{\ae}
+  \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
+  \DeclareUnicodeCharacter{00E8}{\`e}
+  \DeclareUnicodeCharacter{00E9}{\'e}
+  \DeclareUnicodeCharacter{00EA}{\^e}
+  \DeclareUnicodeCharacter{00EB}{\"e}
+  \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
+  \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
+
+  \DeclareUnicodeCharacter{00F1}{\~n}
+  \DeclareUnicodeCharacter{00F2}{\`o}
+  \DeclareUnicodeCharacter{00F3}{\'o}
+  \DeclareUnicodeCharacter{00F4}{\^o}
+  \DeclareUnicodeCharacter{00F5}{\~o}
+  \DeclareUnicodeCharacter{00F6}{\"o}
+  \DeclareUnicodeCharacter{00F8}{\o}
+  \DeclareUnicodeCharacter{00F9}{\`u}
+  \DeclareUnicodeCharacter{00FA}{\'u}
+  \DeclareUnicodeCharacter{00FB}{\^u}
+  \DeclareUnicodeCharacter{00FC}{\"u}
+  \DeclareUnicodeCharacter{00FD}{\'y}
+  \DeclareUnicodeCharacter{00FF}{\"y}
+
+  \DeclareUnicodeCharacter{0100}{\=A}
+  \DeclareUnicodeCharacter{0101}{\=a}
+  \DeclareUnicodeCharacter{0102}{\u{A}}
+  \DeclareUnicodeCharacter{0103}{\u{a}}
+  \DeclareUnicodeCharacter{0106}{\'C}
+  \DeclareUnicodeCharacter{0107}{\'c}
+  \DeclareUnicodeCharacter{0108}{\^C}
+  \DeclareUnicodeCharacter{0109}{\^c}
+  \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
+  \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
+  \DeclareUnicodeCharacter{010C}{\v{C}}
+  \DeclareUnicodeCharacter{010D}{\v{c}}
+  \DeclareUnicodeCharacter{010E}{\v{D}}
+
+  \DeclareUnicodeCharacter{0112}{\=E}
+  \DeclareUnicodeCharacter{0113}{\=e}
+  \DeclareUnicodeCharacter{0114}{\u{E}}
+  \DeclareUnicodeCharacter{0115}{\u{e}}
+  \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
+  \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
+  \DeclareUnicodeCharacter{011A}{\v{E}}
+  \DeclareUnicodeCharacter{011B}{\v{e}}
+  \DeclareUnicodeCharacter{011C}{\^G}
+  \DeclareUnicodeCharacter{011D}{\^g}
+  \DeclareUnicodeCharacter{011E}{\u{G}}
+  \DeclareUnicodeCharacter{011F}{\u{g}}
+
+  \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
+  \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
+  \DeclareUnicodeCharacter{0124}{\^H}
+  \DeclareUnicodeCharacter{0125}{\^h}
+  \DeclareUnicodeCharacter{0128}{\~I}
+  \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
+  \DeclareUnicodeCharacter{012A}{\=I}
+  \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
+  \DeclareUnicodeCharacter{012C}{\u{I}}
+  \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
+
+  \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
+  \DeclareUnicodeCharacter{0131}{\dotless{i}}
+  \DeclareUnicodeCharacter{0132}{IJ}
+  \DeclareUnicodeCharacter{0133}{ij}
+  \DeclareUnicodeCharacter{0134}{\^J}
+  \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
+  \DeclareUnicodeCharacter{0139}{\'L}
+  \DeclareUnicodeCharacter{013A}{\'l}
+
+  \DeclareUnicodeCharacter{0141}{\L}
+  \DeclareUnicodeCharacter{0142}{\l}
+  \DeclareUnicodeCharacter{0143}{\'N}
+  \DeclareUnicodeCharacter{0144}{\'n}
+  \DeclareUnicodeCharacter{0147}{\v{N}}
+  \DeclareUnicodeCharacter{0148}{\v{n}}
+  \DeclareUnicodeCharacter{014C}{\=O}
+  \DeclareUnicodeCharacter{014D}{\=o}
+  \DeclareUnicodeCharacter{014E}{\u{O}}
+  \DeclareUnicodeCharacter{014F}{\u{o}}
+
+  \DeclareUnicodeCharacter{0150}{\H{O}}
+  \DeclareUnicodeCharacter{0151}{\H{o}}
+  \DeclareUnicodeCharacter{0152}{\OE}
+  \DeclareUnicodeCharacter{0153}{\oe}
+  \DeclareUnicodeCharacter{0154}{\'R}
+  \DeclareUnicodeCharacter{0155}{\'r}
+  \DeclareUnicodeCharacter{0158}{\v{R}}
+  \DeclareUnicodeCharacter{0159}{\v{r}}
+  \DeclareUnicodeCharacter{015A}{\'S}
+  \DeclareUnicodeCharacter{015B}{\'s}
+  \DeclareUnicodeCharacter{015C}{\^S}
+  \DeclareUnicodeCharacter{015D}{\^s}
+  \DeclareUnicodeCharacter{015E}{\cedilla{S}}
+  \DeclareUnicodeCharacter{015F}{\cedilla{s}}
+
+  \DeclareUnicodeCharacter{0160}{\v{S}}
+  \DeclareUnicodeCharacter{0161}{\v{s}}
+  \DeclareUnicodeCharacter{0162}{\cedilla{t}}
+  \DeclareUnicodeCharacter{0163}{\cedilla{T}}
+  \DeclareUnicodeCharacter{0164}{\v{T}}
+
+  \DeclareUnicodeCharacter{0168}{\~U}
+  \DeclareUnicodeCharacter{0169}{\~u}
+  \DeclareUnicodeCharacter{016A}{\=U}
+  \DeclareUnicodeCharacter{016B}{\=u}
+  \DeclareUnicodeCharacter{016C}{\u{U}}
+  \DeclareUnicodeCharacter{016D}{\u{u}}
+  \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
+  \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
+
+  \DeclareUnicodeCharacter{0170}{\H{U}}
+  \DeclareUnicodeCharacter{0171}{\H{u}}
+  \DeclareUnicodeCharacter{0174}{\^W}
+  \DeclareUnicodeCharacter{0175}{\^w}
+  \DeclareUnicodeCharacter{0176}{\^Y}
+  \DeclareUnicodeCharacter{0177}{\^y}
+  \DeclareUnicodeCharacter{0178}{\"Y}
+  \DeclareUnicodeCharacter{0179}{\'Z}
+  \DeclareUnicodeCharacter{017A}{\'z}
+  \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
+  \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
+  \DeclareUnicodeCharacter{017D}{\v{Z}}
+  \DeclareUnicodeCharacter{017E}{\v{z}}
+
+  \DeclareUnicodeCharacter{01C4}{D\v{Z}}
+  \DeclareUnicodeCharacter{01C5}{D\v{z}}
+  \DeclareUnicodeCharacter{01C6}{d\v{z}}
+  \DeclareUnicodeCharacter{01C7}{LJ}
+  \DeclareUnicodeCharacter{01C8}{Lj}
+  \DeclareUnicodeCharacter{01C9}{lj}
+  \DeclareUnicodeCharacter{01CA}{NJ}
+  \DeclareUnicodeCharacter{01CB}{Nj}
+  \DeclareUnicodeCharacter{01CC}{nj}
+  \DeclareUnicodeCharacter{01CD}{\v{A}}
+  \DeclareUnicodeCharacter{01CE}{\v{a}}
+  \DeclareUnicodeCharacter{01CF}{\v{I}}
+
+  \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
+  \DeclareUnicodeCharacter{01D1}{\v{O}}
+  \DeclareUnicodeCharacter{01D2}{\v{o}}
+  \DeclareUnicodeCharacter{01D3}{\v{U}}
+  \DeclareUnicodeCharacter{01D4}{\v{u}}
+
+  \DeclareUnicodeCharacter{01E2}{\={\AE}}
+  \DeclareUnicodeCharacter{01E3}{\={\ae}}
+  \DeclareUnicodeCharacter{01E6}{\v{G}}
+  \DeclareUnicodeCharacter{01E7}{\v{g}}
+  \DeclareUnicodeCharacter{01E8}{\v{K}}
+  \DeclareUnicodeCharacter{01E9}{\v{k}}
+
+  \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
+  \DeclareUnicodeCharacter{01F1}{DZ}
+  \DeclareUnicodeCharacter{01F2}{Dz}
+  \DeclareUnicodeCharacter{01F3}{dz}
+  \DeclareUnicodeCharacter{01F4}{\'G}
+  \DeclareUnicodeCharacter{01F5}{\'g}
+  \DeclareUnicodeCharacter{01F8}{\`N}
+  \DeclareUnicodeCharacter{01F9}{\`n}
+  \DeclareUnicodeCharacter{01FC}{\'{\AE}}
+  \DeclareUnicodeCharacter{01FD}{\'{\ae}}
+  \DeclareUnicodeCharacter{01FE}{\'{\O}}
+  \DeclareUnicodeCharacter{01FF}{\'{\o}}
+
+  \DeclareUnicodeCharacter{021E}{\v{H}}
+  \DeclareUnicodeCharacter{021F}{\v{h}}
+
+  \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
+  \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
+  \DeclareUnicodeCharacter{0228}{\cedilla{E}}
+  \DeclareUnicodeCharacter{0229}{\cedilla{e}}
+  \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
+  \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
+
+  \DeclareUnicodeCharacter{0232}{\=Y}
+  \DeclareUnicodeCharacter{0233}{\=y}
+  \DeclareUnicodeCharacter{0237}{\dotless{j}}
+
+  \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
+  \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
+  \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
+  \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
+  \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
+  \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
+  \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
+  \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
+  \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
+  \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
+  \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
+  \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
+
+  \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
+  \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
+
+  \DeclareUnicodeCharacter{1E20}{\=G}
+  \DeclareUnicodeCharacter{1E21}{\=g}
+  \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
+  \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
+  \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
+  \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
+  \DeclareUnicodeCharacter{1E26}{\"H}
+  \DeclareUnicodeCharacter{1E27}{\"h}
+
+  \DeclareUnicodeCharacter{1E30}{\'K}
+  \DeclareUnicodeCharacter{1E31}{\'k}
+  \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
+  \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
+  \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
+  \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
+  \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
+  \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
+  \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
+  \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
+  \DeclareUnicodeCharacter{1E3E}{\'M}
+  \DeclareUnicodeCharacter{1E3F}{\'m}
+
+  \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
+  \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
+  \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
+  \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
+  \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
+  \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
+  \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
+  \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
+  \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
+  \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
+
+  \DeclareUnicodeCharacter{1E54}{\'P}
+  \DeclareUnicodeCharacter{1E55}{\'p}
+  \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
+  \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
+  \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
+  \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
+  \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
+  \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
+  \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
+  \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
+
+  \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
+  \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
+  \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
+  \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
+  \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
+  \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
+  \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
+  \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
+  \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
+  \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
+
+  \DeclareUnicodeCharacter{1E7C}{\~V}
+  \DeclareUnicodeCharacter{1E7D}{\~v}
+  \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
+  \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
+
+  \DeclareUnicodeCharacter{1E80}{\`W}
+  \DeclareUnicodeCharacter{1E81}{\`w}
+  \DeclareUnicodeCharacter{1E82}{\'W}
+  \DeclareUnicodeCharacter{1E83}{\'w}
+  \DeclareUnicodeCharacter{1E84}{\"W}
+  \DeclareUnicodeCharacter{1E85}{\"w}
+  \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
+  \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
+  \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
+  \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
+  \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
+  \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
+  \DeclareUnicodeCharacter{1E8C}{\"X}
+  \DeclareUnicodeCharacter{1E8D}{\"x}
+  \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
+  \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
+
+  \DeclareUnicodeCharacter{1E90}{\^Z}
+  \DeclareUnicodeCharacter{1E91}{\^z}
+  \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
+  \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
+  \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
+  \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
+  \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
+  \DeclareUnicodeCharacter{1E97}{\"t}
+  \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
+  \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
+
+  \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
+  \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
+
+  \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
+  \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
+  \DeclareUnicodeCharacter{1EBC}{\~E}
+  \DeclareUnicodeCharacter{1EBD}{\~e}
+
+  \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
+  \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
+  \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
+  \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
+
+  \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
+  \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
+
+  \DeclareUnicodeCharacter{1EF2}{\`Y}
+  \DeclareUnicodeCharacter{1EF3}{\`y}
+  \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
+
+  \DeclareUnicodeCharacter{1EF8}{\~Y}
+  \DeclareUnicodeCharacter{1EF9}{\~y}
+
+  \DeclareUnicodeCharacter{2013}{--}
+  \DeclareUnicodeCharacter{2014}{---}
+  \DeclareUnicodeCharacter{2018}{\quoteleft}
+  \DeclareUnicodeCharacter{2019}{\quoteright}
+  \DeclareUnicodeCharacter{201A}{\quotesinglbase}
+  \DeclareUnicodeCharacter{201C}{\quotedblleft}
+  \DeclareUnicodeCharacter{201D}{\quotedblright}
+  \DeclareUnicodeCharacter{201E}{\quotedblbase}
+  \DeclareUnicodeCharacter{2022}{\bullet}
+  \DeclareUnicodeCharacter{2026}{\dots}
+  \DeclareUnicodeCharacter{2039}{\guilsinglleft}
+  \DeclareUnicodeCharacter{203A}{\guilsinglright}
+  \DeclareUnicodeCharacter{20AC}{\euro}
+
+  \DeclareUnicodeCharacter{2192}{\expansion}
+  \DeclareUnicodeCharacter{21D2}{\result}
+
+  \DeclareUnicodeCharacter{2212}{\minus}
+  \DeclareUnicodeCharacter{2217}{\point}
+  \DeclareUnicodeCharacter{2261}{\equiv}
+}% end of \utfeightchardefs
+
+
+% US-ASCII character definitions.
+\def\asciichardefs{% nothing need be done
+   \relax
+}
+
+% Make non-ASCII characters printable again for compatibility with
+% existing Texinfo documents that may use them, even without declaring a
+% document encoding.
+%
+\setnonasciicharscatcode \other
+
+
+\message{formatting,}
+
 \newdimen\defaultparindent \defaultparindent = 15pt
 
 \chapheadingskip = 15pt plus 4pt minus 2pt
@@ -6736,7 +8583,7 @@ should work if nowhere else does.}
 % Don't be so finicky about underfull hboxes, either.
 \hbadness = 2000
 
-% Following George Bush, just get rid of widows and orphans.
+% Following George Bush, get rid of widows and orphans.
 \widowpenalty=10000
 \clubpenalty=10000
 
@@ -6754,9 +8601,9 @@ should work if nowhere else does.}
   \fi
 }
 
-% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
-% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
-% physical page width.
+% Parameters in order: 1) textheight; 2) textwidth;
+% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
+% 7) physical page height; 8) physical page width.
 %
 % We also call \setleading{\textleading}, so the caller should define
 % \textleading.  The caller should also set \parskip.
@@ -6783,6 +8630,10 @@ should work if nowhere else does.}
   \ifpdf
     \pdfpageheight #7\relax
     \pdfpagewidth #8\relax
+    % if we don't reset these, they will remain at "1 true in" of
+    % whatever layout pdftex was dumped with.
+    \pdfhorigin = 1 true in
+    \pdfvorigin = 1 true in
   \fi
   %
   \setleading{\textleading}
@@ -6797,19 +8648,19 @@ should work if nowhere else does.}
   \textleading = 13.2pt
   %
   % If page is nothing but text, make it come out even.
-  \internalpagesizes{46\baselineskip}{6in}%
+  \internalpagesizes{607.2pt}{6in}% that's 46 lines
                     {\voffset}{.25in}%
                     {\bindingoffset}{36pt}%
                     {11in}{8.5in}%
 }}
 
-% Use @smallbook to reset parameters for 7x9.5 (or so) format.
+% Use @smallbook to reset parameters for 7x9.25 trim size.
 \def\smallbook{{\globaldefs = 1
   \parskip = 2pt plus 1pt
   \textleading = 12pt
   %
   \internalpagesizes{7.5in}{5in}%
-                    {\voffset}{.25in}%
+                    {-.2in}{0in}%
                     {\bindingoffset}{16pt}%
                     {9.25in}{7in}%
   %
@@ -6820,6 +8671,24 @@ should work if nowhere else does.}
   \defbodyindent = .5cm
 }}
 
+% Use @smallerbook to reset parameters for 6x9 trim size.
+% (Just testing, parameters still in flux.)
+\def\smallerbook{{\globaldefs = 1
+  \parskip = 1.5pt plus 1pt
+  \textleading = 12pt
+  %
+  \internalpagesizes{7.4in}{4.8in}%
+                    {-.2in}{-.4in}%
+                    {0pt}{14pt}%
+                    {9in}{6in}%
+  %
+  \lispnarrowing = 0.25in
+  \tolerance = 700
+  \hfuzz = 1pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = .4cm
+}}
+
 % Use @afourpaper to print on European A4 paper.
 \def\afourpaper{{\globaldefs = 1
   \parskip = 3pt plus 2pt minus 1pt
@@ -6835,7 +8704,7 @@ should work if nowhere else does.}
   % \global\normaloffset = -6mm
   % \global\bindingoffset = 10mm
   % @end tex
-  \internalpagesizes{51\baselineskip}{160mm}
+  \internalpagesizes{673.2pt}{160mm}% that's 51 lines
                     {\voffset}{\hoffset}%
                     {\bindingoffset}{44pt}%
                     {297mm}{210mm}%
@@ -6900,7 +8769,7 @@ should work if nowhere else does.}
   \parskip = 3pt plus 2pt minus 1pt
   \setleading{\textleading}%
   %
-  \dimen0 = #1
+  \dimen0 = #1\relax
   \advance\dimen0 by \voffset
   %
   \dimen2 = \hsize
@@ -6972,6 +8841,7 @@ should work if nowhere else does.}
 
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
+\let\realunder=_
 % Subroutine for the previous macro.
 \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
 
@@ -6994,6 +8864,13 @@ should work if nowhere else does.}
 % \otherifyactive is called near the end of this file.
 \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
 
+% Used sometimes to turn off (effectively) the active characters even after
+% parsing them.
+\def\turnoffactive{%
+  \normalturnoffactive
+  \otherbackslash
+}
+
 \catcode`\@=0
 
 % \backslashcurfont outputs one backslash character in current font,
@@ -7001,27 +8878,29 @@ should work if nowhere else does.}
 \global\chardef\backslashcurfont=`\\
 \global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
 
+% \realbackslash is an actual character `\' with catcode other, and
+% \doublebackslash is two of them (for the pdf outlines).
+{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
+
+% In texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
+\catcode`\\=\active
+@def@normalbackslash{{@tt@backslashcurfont}}
+% On startup, @fixbackslash assigns:
+%  @let \ = @normalbackslash
+
 % \rawbackslash defines an active \ to do \backslashcurfont.
 % \otherbackslash defines an active \ to be a literal `\' character with
 % catcode other.
-{\catcode`\\=\active
- @gdef@rawbackslash{@let\=@backslashcurfont}
- @gdef@otherbackslash{@let\=@realbackslash}
-}
-
-% \realbackslash is an actual character `\' with catcode other.
-{\catcode`\\=\other @gdef@realbackslash{\}}
-
-% \normalbackslash outputs one backslash in fixed width font.
-\def\normalbackslash{{\tt\backslashcurfont}}
-
-\catcode`\\=\active
+@gdef@rawbackslash{@let\=@backslashcurfont}
+@gdef@otherbackslash{@let\=@realbackslash}
 
-% Used sometimes to turn off (effectively) the active characters
-% even after parsing them.
-@def@turnoffactive{%
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+% 
+@def@normalturnoffactive{%
+  @let\=@normalbackslash
   @let"=@normaldoublequote
-  @let\=@realbackslash
   @let~=@normaltilde
   @let^=@normalcaret
   @let_=@normalunderscore
@@ -7033,12 +8912,6 @@ should work if nowhere else does.}
   @unsepspaces
 }
 
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.  (Thus, \ is not expandable when this is in
-% effect.)
-%
-@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
-
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
 @otherifyactive
@@ -7051,9 +8924,9 @@ should work if nowhere else does.}
 @global@let\ = @eatinput
 
 % On the other hand, perhaps the file did not have a `\input texinfo'. Then
-% the first `\{ in the file would cause an error. This macro tries to fix
+% the first `\' in the file would cause an error. This macro tries to fix
 % that, assuming it is called before the first `\' could plausibly occur.
-% Also back turn on active characters that might appear in the input
+% Also turn back on active characters that might appear in the input
 % file name, in case not using a pre-dumped format.
 %
 @gdef@fixbackslash{%
diff --git a/eval.c b/eval.c
index 375dce4a..59077134 100644
--- a/eval.c
+++ b/eval.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -748,7 +748,7 @@ interpret(register NODE *volatile tree)
 			 * next. New ones catch it at parse time. Allow it if
 			 * do_traditional is on, and complain if lint.
 			 */
-			static int warned = FALSE;
+			static short warned = FALSE;
 
 			if (do_lint && ! warned) {
 				lintwarn(_("`break' outside a loop is not portable"));
@@ -769,7 +769,7 @@ interpret(register NODE *volatile tree)
 			 * next. New ones catch it at parse time. Allow it if
 			 * do_traditional is on, and complain if lint.
 			 */
-			static int warned = FALSE;
+			static short warned = FALSE;
 
 			if (do_lint && ! warned) {
 				lintwarn(_("`continue' outside a loop is not portable"));
@@ -1176,6 +1176,7 @@ r_tree_eval(register NODE *tree, int iscond)
 			memcpy(l->stptr + l->stlen, r->stptr, r->stlen);
 			l->stlen += r->stlen;
 			l->stptr[l->stlen] = '\0';
+			free_wstr(l);
 		} else {
 			char *nval;
 			size_t nlen = l->stlen + r->stlen + 2;
@@ -1186,6 +1187,7 @@ r_tree_eval(register NODE *tree, int iscond)
 			unref(*lhs);
 			*lhs = make_str_node(nval, l->stlen + r->stlen, ALREADY_MALLOCED);
 		}
+		(*lhs)->flags &= ~(NUMCUR|NUMBER);
 		free_temp(r);
 
 		if (after_assign)
@@ -2116,7 +2118,7 @@ match_op(register NODE *tree)
 void
 set_IGNORECASE()
 {
-	static int warned = FALSE;
+	static short warned = FALSE;
 
 	if ((do_lint || do_traditional) && ! warned) {
 		warned = TRUE;
@@ -2143,7 +2145,7 @@ set_IGNORECASE()
 void
 set_BINMODE()
 {
-	static int warned = FALSE;
+	static short warned = FALSE;
 	char *p, *cp, save;
 	NODE *v;
 	int digits = FALSE;
@@ -2167,7 +2169,7 @@ set_BINMODE()
 			}
 		}
 
-		if (! digits || (BINMODE_node->var_value->flags & MAYBE_NUM) == 0) {
+		if (! digits && (BINMODE_node->var_value->flags & MAYBE_NUM) == 0) {
 			BINMODE = 0;
 			if (strcmp(p, "r") == 0)
 				BINMODE = 1;
diff --git a/eval_p.c b/eval_p.c
index 143601ad..c8afe666 100644
--- a/eval_p.c
+++ b/eval_p.c
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/ext.c b/ext.c
index b8c18fd5..60ba61f2 100644
--- a/ext.c
+++ b/ext.c
@@ -7,14 +7,14 @@
  */
 
 /*
- * Copyright (C) 1995 - 2001, 2003-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1995 - 2001, 2003-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -49,6 +49,7 @@ do_ext(NODE *tree)
 	NODE *(*func) P((NODE *, void *));
 	void *dl;
 	int flags = RTLD_LAZY;
+	static short warned = FALSE;
 
 #ifdef __GNUC__
 	AWKNUM junk;
@@ -56,8 +57,10 @@ do_ext(NODE *tree)
 	junk = (AWKNUM) dummy;
 #endif
 
-	if (do_lint)
+	if (do_lint && ! warned) {
+		warned = TRUE;
 		lintwarn(_("`extension' is a gawk extension"));
+	}
 
 	if (do_traditional || do_posix) {
 		errcount++;
diff --git a/extension/ChangeLog b/extension/ChangeLog
index d62a561b..55c9f616 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/extension/arrayparm.c b/extension/arrayparm.c
index 732bf4d3..ddf1c8c4 100644
--- a/extension/arrayparm.c
+++ b/extension/arrayparm.c
@@ -17,7 +17,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/extension/dl.c b/extension/dl.c
index 8737420f..60f104fa 100644
--- a/extension/dl.c
+++ b/extension/dl.c
@@ -13,7 +13,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index f719f32d..5dfd1228 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -14,7 +14,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/extension/fork.c b/extension/fork.c
index 7438ba2f..7ffe857a 100644
--- a/extension/fork.c
+++ b/extension/fork.c
@@ -12,7 +12,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/extension/ordchr.c b/extension/ordchr.c
index 76cddb82..723edc70 100644
--- a/extension/ordchr.c
+++ b/extension/ordchr.c
@@ -15,7 +15,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/extension/readfile.c b/extension/readfile.c
index d5db8302..37f39a2c 100644
--- a/extension/readfile.c
+++ b/extension/readfile.c
@@ -17,7 +17,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/field.c b/field.c
index 99db3ac5..467cca8c 100644
--- a/field.c
+++ b/field.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -166,6 +166,7 @@ rebuild_record()
 	cops = ops;
 	ops[0] = '\0';
 	for (i = 1;  i <= NF; i++) {
+		free_wstr(fields_arr[i]);
 		tmp = fields_arr[i];
 		/* copy field */
 		if (tmp->stlen == 1)
@@ -212,6 +213,9 @@ rebuild_record()
 			n->stptr = cops;
 			unref(fields_arr[i]);
 			fields_arr[i] = n;
+#ifdef MBS_SUPPORT
+			assert((n->flags & WSTRCUR) == 0);
+#endif
 		}
 		cops += fields_arr[i]->stlen + ofslen;
 	}
@@ -897,7 +901,7 @@ set_FIELDWIDTHS()
 	char *end;
 	register int i;
 	static int fw_alloc = 4;
-	static int warned = FALSE;
+	static short warned = FALSE;
 	extern unsigned long strtoul P((const char *, char **endptr, int base));
 
 	if (do_lint && ! warned) {
@@ -916,13 +920,13 @@ set_FIELDWIDTHS()
 
 	parse_field = fw_parse_field;
 	scan = force_string(FIELDWIDTHS_node->var_value)->stptr;
-	end = scan + 1;
+
 	if (FIELDWIDTHS == NULL)
 		emalloc(FIELDWIDTHS, int *, fw_alloc * sizeof(int), "set_FIELDWIDTHS");
 	FIELDWIDTHS[0] = 0;
 	for (i = 1; ; i++) {
 		unsigned long int tmp;
-		if (i >= fw_alloc) {
+		if (i + 1 >= fw_alloc) {
 			fw_alloc *= 2;
 			erealloc(FIELDWIDTHS, int *, fw_alloc * sizeof(int), "set_FIELDWIDTHS");
 		}
@@ -935,13 +939,16 @@ set_FIELDWIDTHS()
 			fatal(_("invalid FIELDWIDTHS value, near `%s'"),
 			      scan);
 
+		if (*scan == '\0')
+			break;
+
 		/* Detect an invalid base-10 integer, a valid value that
 		   is followed by something other than a blank or '\0',
 		   or a value that is not in the range [1..INT_MAX].  */
 		errno = 0;
 		tmp = strtoul(scan, &end, 10);
 		if (errno != 0
-		    || !(*end == '\0' || is_blank(*end))
+		    || (*end != '\0' && ! is_blank(*end))
 		    || !(0 < tmp && tmp <= INT_MAX))
 			fatal(_("invalid FIELDWIDTHS value, near `%s'"),
 			      scan);
@@ -954,7 +961,9 @@ set_FIELDWIDTHS()
 		if (*scan == '\0')
 			break;
 	}
-	FIELDWIDTHS[i] = -1;
+	if (i == 1)	/* empty string! */
+		i--;
+	FIELDWIDTHS[i+1] = -1;
 
 	update_PROCINFO("FS", "FIELDWIDTHS");
 }
@@ -1027,6 +1036,8 @@ choose_fs_function:
 			lintwarn(_("null string for `FS' is a gawk extension"));
 		}
 	} else if (fs->stlen > 1) {
+		if (do_lint_old)
+			warning(_("old awk does not support regexps as value of `FS'"));
 		parse_field = re_parse_field;
 	} else if (RS_is_null) {
 		/* we know that fs->stlen <= 1 */
diff --git a/floatcomp.c b/floatcomp.c
new file mode 100644
index 00000000..44db96d7
--- /dev/null
+++ b/floatcomp.c
@@ -0,0 +1,124 @@
+/*
+ * floatcomp.c - Isolate floating point details.
+ */
+
+/* 
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
+ * 
+ * This file is part of GAWK, the GNU implementation of the
+ * AWK Programming Language.
+ * 
+ * GAWK is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * GAWK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "awk.h"
+#include <math.h>
+
+/* Assume IEEE-754 arithmetic on pre-C89 hosts.  */
+#ifndef FLT_RADIX
+#define FLT_RADIX 2
+#endif
+#ifndef FLT_MANT_DIG
+#define FLT_MANT_DIG 24
+#endif
+#ifndef DBL_MANT_DIG
+#define DBL_MANT_DIG 53
+#endif
+
+/*
+ * The number of base-FLT_RADIX digits in an AWKNUM fraction, assuming
+ * that AWKNUM is not long double.
+ */
+#define AWKSMALL_MANT_DIG \
+  (sizeof (AWKNUM) == sizeof (double) ? DBL_MANT_DIG : FLT_MANT_DIG)
+
+/*
+ * The number of base-FLT_DIGIT digits in an AWKNUM fraction, even if
+ * AWKNUM is long double.  Don't mention 'long double' unless
+ * LDBL_MANT_DIG is defined, for the sake of ancient compilers that
+ * lack 'long double'.
+ */
+#ifdef LDBL_MANT_DIG
+#define AWKNUM_MANT_DIG \
+  (sizeof (AWKNUM) == sizeof (long double) ? LDBL_MANT_DIG : AWKSMALL_MANT_DIG)
+#else
+#define AWKNUM_MANT_DIG AWKSMALL_MANT_DIG
+#endif
+
+/*
+ * The number of bits in an AWKNUM fraction, assuming FLT_RADIX is
+ * either 2 or 16.  IEEE and VAX formats use radix 2, and IBM
+ * mainframe format uses radix 16; we know of no other radices in
+ * practical use.
+ */
+#if FLT_RADIX != 2 && FLT_RADIX != 16
+Please port the following code to your weird host;
+#endif
+#define AWKNUM_FRACTION_BITS (AWKNUM_MANT_DIG * (FLT_RADIX == 2 ? 1 : 4))
+#define DBL_FRACTION_BITS (DBL_MANT_DIG * (FLT_RADIX == 2 ? 1 : 4))
+
+/*
+ * Floor and Ceil --- Work around a problem in conversion of
+ * doubles to exact integers.
+ */
+
+/* Floor --- do floor(), also for Cray */
+
+AWKNUM
+Floor(AWKNUM n)
+{
+	return floor(n
+#if 0
+#ifdef _CRAY
+		* (1.0 + DBL_EPSILON)
+#endif
+#endif
+	);
+}
+
+/* Ceil --- do ceil(), also for Cray */
+
+AWKNUM
+Ceil(AWKNUM n)
+{
+	return ceil(n
+#if 0
+#ifdef _CRAY
+		* (1.0 + DBL_EPSILON)
+#endif
+#endif
+	);
+}
+
+#ifdef HAVE_UINTMAX_T
+/* adjust_uint --- fiddle with values, ask Paul Eggert to explain */
+
+uintmax_t
+adjust_uint(uintmax_t n)
+{
+	/*
+	 * If uintmax_t is so wide that AWKNUM cannot represent all its
+	 * values, strip leading nonzero bits of integers that are so large
+	 * that they cannot be represented exactly as AWKNUMs, so that their
+	 * low order bits are represented exactly, without rounding errors.
+	 * This is more desirable in practice, since it means the user sees
+	 * integers that are the same width as the AWKNUM fractions.
+	 */
+	if (AWKNUM_FRACTION_BITS < CHAR_BIT * sizeof n)
+		n &= ((uintmax_t) 1 << AWKNUM_FRACTION_BITS) - 1;
+
+	return n;
+}
+#endif /* HAVE_UINTMAX_T */
diff --git a/gawkmisc.c b/gawkmisc.c
index 9dc288f0..feb9f652 100644
--- a/gawkmisc.c
+++ b/gawkmisc.c
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/getopt.c b/getopt.c
index 207b55f4..b1cecd31 100644
--- a/getopt.c
+++ b/getopt.c
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.  */
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
@@ -576,10 +576,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
 		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		  if (_IO_fwide (stderr, 0) > 0)
-		    __fwprintf (stderr, L"%s", buf);
-		  else
-		    fputs (buf, stderr);
+		  __fxprintf (NULL, "%s", buf);
 
 		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
 		  _IO_funlockfile (stderr);
@@ -654,10 +651,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			  ((_IO_FILE *) stderr)->_flags2
 			    |= _IO_FLAGS2_NOTCANCEL;
 
-			  if (_IO_fwide (stderr, 0) > 0)
-			    __fwprintf (stderr, L"%s", buf);
-			  else
-			    fputs (buf, stderr);
+			  __fxprintf (NULL, "%s", buf);
 
 			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
 			  _IO_funlockfile (stderr);
@@ -694,10 +688,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			  ((_IO_FILE *) stderr)->_flags2
 			    |= _IO_FLAGS2_NOTCANCEL;
 
-			  if (_IO_fwide (stderr, 0) > 0)
-			    __fwprintf (stderr, L"%s", buf);
-			  else
-			    fputs (buf, stderr);
+			  __fxprintf (NULL, "%s", buf);
 
 			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
 			  _IO_funlockfile (stderr);
@@ -771,10 +762,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
 		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		  if (_IO_fwide (stderr, 0) > 0)
-		    __fwprintf (stderr, L"%s", buf);
-		  else
-		    fputs (buf, stderr);
+		  __fxprintf (NULL, "%s", buf);
 
 		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
 		  _IO_funlockfile (stderr);
@@ -837,10 +825,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
 		((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		if (_IO_fwide (stderr, 0) > 0)
-		  __fwprintf (stderr, L"%s", buf);
-		else
-		  fputs (buf, stderr);
+		__fxprintf (NULL, "%s", buf);
 
 		((_IO_FILE *) stderr)->_flags2 = old_flags2;
 		_IO_funlockfile (stderr);
@@ -888,10 +873,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
 		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		    if (_IO_fwide (stderr, 0) > 0)
-		      __fwprintf (stderr, L"%s", buf);
-		    else
-		      fputs (buf, stderr);
+		    __fxprintf (NULL, "%s", buf);
 
 		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
 		    _IO_funlockfile (stderr);
@@ -960,10 +942,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
 		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		    if (_IO_fwide (stderr, 0) > 0)
-		      __fwprintf (stderr, L"%s", buf);
-		    else
-		      fputs (buf, stderr);
+		    __fxprintf (NULL, "%s", buf);
 
 		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
 		    _IO_funlockfile (stderr);
@@ -1005,10 +984,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			    ((_IO_FILE *) stderr)->_flags2
 			      |= _IO_FLAGS2_NOTCANCEL;
 
-			    if (_IO_fwide (stderr, 0) > 0)
-			      __fwprintf (stderr, L"%s", buf);
-			    else
-			      fputs (buf, stderr);
+			    __fxprintf (NULL, "%s", buf);
 
 			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
 			    _IO_funlockfile (stderr);
@@ -1047,10 +1023,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			    ((_IO_FILE *) stderr)->_flags2
 			      |= _IO_FLAGS2_NOTCANCEL;
 
-			    if (_IO_fwide (stderr, 0) > 0)
-			      __fwprintf (stderr, L"%s", buf);
-			    else
-			      fputs (buf, stderr);
+			    __fxprintf (NULL, "%s", buf);
 
 			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
 			    _IO_funlockfile (stderr);
@@ -1121,10 +1094,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
 			((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-			if (_IO_fwide (stderr, 0) > 0)
-			  __fwprintf (stderr, L"%s", buf);
-			else
-			  fputs (buf, stderr);
+			__fxprintf (NULL, "%s", buf);
 
 			((_IO_FILE *) stderr)->_flags2 = old_flags2;
 			_IO_funlockfile (stderr);
diff --git a/gettext.h b/gettext.h
index 84e57c53..93470018 100644
--- a/gettext.h
+++ b/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -30,6 +30,18 @@
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>
 
+/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
+   the gettext() and ngettext() macros.  This is an alternative to calling
+   textdomain(), and is useful for libraries.  */
+# ifdef DEFAULT_TEXT_DOMAIN
+#  undef gettext
+#  define gettext(Msgid) \
+     dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
+#  undef ngettext
+#  define ngettext(Msgid1, Msgid2, N) \
+     dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
+# endif
+
 #else
 
 /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
@@ -45,6 +57,16 @@
 # include <locale.h>
 #endif
 
+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+   <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
+   it now, to make later inclusions of <libintl.h> a NOP.  */
+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+# include <cstdlib>
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+#  include <libintl.h>
+# endif
+#endif
+
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings
    for invalid uses of the value returned from these functions.
@@ -75,4 +97,178 @@
    initializer for static 'char[]' or 'const char[]' variables.  */
 #define gettext_noop(String) String
 
+/* The separator between msgctxt and msgid in a .mo file.  */
+#define GETTEXT_CONTEXT_GLUE "\004"
+
+/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
+   MSGID.  MSGCTXT and MSGID must be string literals.  MSGCTXT should be
+   short and rarely need to change.
+   The letter 'p' stands for 'particular' or 'special'.  */
+#ifdef DEFAULT_TEXT_DOMAIN
+# define pgettext(Msgctxt, Msgid) \
+   pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#else
+# define pgettext(Msgctxt, Msgid) \
+   pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#endif
+#define dpgettext(Domainname, Msgctxt, Msgid) \
+  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
+  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
+#ifdef DEFAULT_TEXT_DOMAIN
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+   npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#else
+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+   npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#endif
+#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
+  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+pgettext_aux (const char *domain,
+	      const char *msg_ctxt_id, const char *msgid,
+	      int category)
+{
+  const char *translation = dcgettext (domain, msg_ctxt_id, category);
+  if (translation == msg_ctxt_id)
+    return msgid;
+  else
+    return translation;
+}
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+npgettext_aux (const char *domain,
+	       const char *msg_ctxt_id, const char *msgid,
+	       const char *msgid_plural, unsigned long int n,
+	       int category)
+{
+  const char *translation =
+    dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+  if (translation == msg_ctxt_id || translation == msgid_plural)
+    return (n == 1 ? msgid : msgid_plural);
+  else
+    return translation;
+}
+
+/* The same thing extended for non-constant arguments.  Here MSGCTXT and MSGID
+   can be arbitrary expressions.  But for string literals these macros are
+   less efficient than those above.  */
+
+#include <string.h>
+
+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+  (__GNUC__ >= 3 || __GNUG__ >= 2 /* || __STDC_VERSION__ >= 199901L */ )
+
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#include <stdlib.h>
+#endif
+
+#define pgettext_expr(Msgctxt, Msgid) \
+  dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
+#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+  dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcpgettext_expr (const char *domain,
+		 const char *msgctxt, const char *msgid,
+		 int category)
+{
+  size_t msgctxt_len = strlen (msgctxt) + 1;
+  size_t msgid_len = strlen (msgid) + 1;
+  const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+  char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+  char buf[1024];
+  char *msg_ctxt_id =
+    (msgctxt_len + msgid_len <= sizeof (buf)
+     ? buf
+     : (char *) malloc (msgctxt_len + msgid_len));
+  if (msg_ctxt_id != NULL)
+#endif
+    {
+      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+      msg_ctxt_id[msgctxt_len - 1] = '\004';
+      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+      translation = dcgettext (domain, msg_ctxt_id, category);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+      if (msg_ctxt_id != buf)
+	free (msg_ctxt_id);
+#endif
+      if (translation != msg_ctxt_id)
+	return translation;
+    }
+  return msgid;
+}
+
+#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+  dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+  dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static const char *
+dcnpgettext_expr (const char *domain,
+		  const char *msgctxt, const char *msgid,
+		  const char *msgid_plural, unsigned long int n,
+		  int category)
+{
+  size_t msgctxt_len = strlen (msgctxt) + 1;
+  size_t msgid_len = strlen (msgid) + 1;
+  const char *translation;
+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+  char msg_ctxt_id[msgctxt_len + msgid_len];
+#else
+  char buf[1024];
+  char *msg_ctxt_id =
+    (msgctxt_len + msgid_len <= sizeof (buf)
+     ? buf
+     : (char *) malloc (msgctxt_len + msgid_len));
+  if (msg_ctxt_id != NULL)
+#endif
+    {
+      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+      msg_ctxt_id[msgctxt_len - 1] = '\004';
+      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+      translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+      if (msg_ctxt_id != buf)
+	free (msg_ctxt_id);
+#endif
+      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+	return translation;
+    }
+  return (n == 1 ? msgid : msgid_plural);
+}
+
 #endif /* _LIBGETTEXT_H */
diff --git a/hard-locale.h b/hard-locale.h
index 0f4986ba..ea19605a 100644
--- a/hard-locale.h
+++ b/hard-locale.h
@@ -21,6 +21,11 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+/* Declare at file scope for stupid compilers. */
+#if !( defined __GLIBC__ && __GLIBC__ >= 2 )
+static ptr_t xmalloc PARAMS ((size_t n));
+#endif
+
 
 /* Return nonzero if the current CATEGORY locale is hard, i.e. if you
    can't get away with assuming traditional C or POSIX behavior.  */
@@ -40,8 +45,6 @@ hard_locale (int category)
       if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
 	hard = 0;
 # else
-      static ptr_t xmalloc PARAMS ((size_t n));
-
       char *locale = xmalloc (strlen (p) + 1);
       strcpy (locale, p);
 
diff --git a/install-sh b/install-sh
index 1a835340..4fbbae7b 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-02-02.21
+scriptversion=2006-10-14.15
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@ scriptversion=2005-02-02.21
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
@@ -95,7 +110,7 @@ Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
     -c) shift
         continue;;
@@ -111,9 +126,15 @@ while test -n "$1"; do
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
         shift
         shift
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
         continue;;
 
     -o) chowncmd="$chownprog $2"
@@ -136,25 +157,33 @@ while test -n "$1"; do
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dstarg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dstarg"
+      shift # fnord
+    fi
+    shift # arg
+    dstarg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,6 +193,33 @@ if test -z "$1"; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
@@ -173,15 +229,11 @@ do
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,188 @@ do
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-    pathcomp=
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix=/ ;;
+	-*) prefix=./ ;;
+	*)  prefix= ;;
+      esac
+
+      case $posix_glob in
+        '')
+	  if (set -f) 2>/dev/null; then
+	    posix_glob=true
+	  else
+	    posix_glob=false
+	  fi ;;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob && set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob && set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +449,9 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -276,10 +462,10 @@ do
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
     # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
       || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +477,12 @@ do
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	     if test -f "$dst"; then
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
@@ -304,16 +491,13 @@ do
 	   } &&
 
 	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
+    } || exit 1
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
+    trap '' 0
+  fi
+done
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/io.c b/io.c
index 964c9284..6e728def 100644
--- a/io.c
+++ b/io.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -45,21 +45,46 @@
 #endif
 
 #ifdef HAVE_SOCKETS
+
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #else
 #include <socket.h>
 #endif /* HAVE_SYS_SOCKET_H */
+
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
-#else
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#else /* ! HAVE_NETINET_IN_H */
 #include <in.h>
 #endif /* HAVE_NETINET_IN_H */
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif /* HAVE_NETDB_H */
+
+#ifndef HAVE_GETADDRINFO
+#include "missing_d/getaddrinfo.h"
+#endif
+
+#ifndef AI_ADDRCONFIG	/* This is a recent symbol, not everyone has it */
+#define AI_ADDRCONFIG 0
+#endif /* AI_ADDRCONFIG */
+
+#ifndef HAVE_SOCKADDR_STORAGE
+#define sockaddr_storage sockaddr	/* for older systems */
+#endif /* HAVE_SOCKADDR_STORAGE */
+
 #endif /* HAVE_SOCKETS */
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #ifdef __EMX__
 #include <process.h>
 #endif
@@ -71,7 +96,6 @@
 extern int MRL;
 
 #ifdef HAVE_SOCKETS
-enum inet_prot { INET_NONE, INET_TCP, INET_UDP, INET_RAW };
 
 #ifndef SHUT_RD
 #define SHUT_RD		0
@@ -103,6 +127,9 @@ enum inet_prot { INET_NONE, INET_TCP, INET_UDP, INET_RAW };
 
 typedef enum { CLOSE_ALL, CLOSE_TO, CLOSE_FROM } two_way_close_type;
 
+/* For internal files, /dev/pid, etc. */
+#define INTERNAL_HANDLE		(-42)
+
 /* Several macros make the code a bit clearer:                              */
 /*                                                                          */
 /*                                                                          */
@@ -110,6 +137,7 @@ typedef enum { CLOSE_ALL, CLOSE_TO, CLOSE_FROM } two_way_close_type;
 #define at_eof(iop)     ((iop->flag & IOP_AT_EOF) != 0)
 #define has_no_data(iop)        (iop->dataend == NULL)
 #define no_data_left(iop)	(iop->off >= iop->dataend)
+#define is_internal(iop) ((iop->flag & IOP_IS_INTERNAL) != 0)
 /* The key point to the design is to split out the code that searches through */
 /* a buffer looking for the record and the terminator into separate routines, */
 /* with a higher-level routine doing the reading of data and buffer management. */
@@ -158,15 +186,15 @@ static int close_redir P((struct redirect *rp, int exitwarn, two_way_close_type
 static int wait_any P((int interesting));
 #endif
 static IOBUF *gawk_popen P((const char *cmd, struct redirect *rp));
-static IOBUF *iop_open P((const char *file, const char *how, IOBUF *buf));
+static IOBUF *iop_open P((const char *file, const char *how, IOBUF *buf, int *isdir));
 static IOBUF *iop_alloc P((int fd, const char *name, IOBUF *buf));
 static int gawk_pclose P((struct redirect *rp));
 static int do_pathopen P((const char *file));
 static int str2mode P((const char *mode));
-static void spec_setup P((IOBUF *iop, int len, int allocate));
-static int specfdopen P((IOBUF *iop, const char *name, const char *mode));
-static int pidopen P((IOBUF *iop, const char *name, const char *mode));
-static int useropen P((IOBUF *iop, const char *name, const char *mode));
+static void spec_setup P((IOBUF *iop, int len));
+static IOBUF *specfdopen P((IOBUF *iop, const char *name, const char *mode));
+static IOBUF *pidopen P((IOBUF *iop, const char *name, const char *mode));
+static IOBUF *useropen P((IOBUF *iop, const char *name, const char *mode));
 static int two_way_open P((const char *str, struct redirect *rp));
 static int pty_vs_pipe P((const char *command));
 
@@ -275,11 +303,21 @@ nextfile(int skipping)
 			ARGIND_node->var_value = make_number((AWKNUM) i);
 		}
 		if (! arg_assign(arg->stptr, FALSE)) {
+			int isdir = FALSE;
+
 			files = TRUE;
 			fname = arg->stptr;
-			curfile = iop_open(fname, binmode("r"), &mybuf);
-			if (curfile == NULL)
+			curfile = iop_open(fname, binmode("r"), &mybuf, & isdir);
+			if (curfile == NULL) {
+#if NO_DIRECTORY_FATAL
+				if (isdir)
+					continue;
+#else
+				if (isdir && do_traditional)
+					continue;
+#endif
 				goto give_up;
+			}
 			curfile->flag |= IOP_NOFREE_OBJ;
 			/* This is a kludge.  */
 			unref(FILENAME_node->var_value);
@@ -296,7 +334,7 @@ nextfile(int skipping)
 		unref(FILENAME_node->var_value);
 		FILENAME_node->var_value = make_string("-", 1);
 		fname = "-";
-		curfile = iop_open(fname, binmode("r"), &mybuf);
+		curfile = iop_open(fname, binmode("r"), &mybuf, NULL);
 		if (curfile == NULL)
 			goto give_up;
 		curfile->flag |= IOP_NOFREE_OBJ;
@@ -503,6 +541,7 @@ redirect(NODE *tree, int *errflg)
 	const char *mode;
 	int fd;
 	const char *what = NULL;
+	int isdir = FALSE;
 
 	switch (tree->type) {
 	case Node_redirect_append:
@@ -654,7 +693,9 @@ redirect(NODE *tree, int *errflg)
 			break;
 		case Node_redirect_input:
 			direction = "from";
-			rp->iop = iop_open(str, binmode("r"), NULL);
+			rp->iop = iop_open(str, binmode("r"), NULL, & isdir);
+			if (isdir)
+				fatal(_("file `%s' is a directory"), str);
 			break;
 		case Node_redirect_twoway:
 			direction = "to/from";
@@ -1129,125 +1170,139 @@ str2mode(const char *mode)
 }
 
 #ifdef HAVE_SOCKETS
+
 /* socketopen --- open a socket and set it into connected state */
 
 static int
-socketopen(enum inet_prot type, int localport, int remoteport, const char *remotehostname)
+socketopen(int type, const char *localpname, const char *remotepname,
+	const char *remotehostname)
 {
-	struct hostent *hp = gethostbyname(remotehostname);
-	struct sockaddr_in local_addr, remote_addr;
-	int socket_fd;
-	int any_remote_host = strcmp(remotehostname, "0");
-
-	socket_fd = INVALID_HANDLE;
-	switch (type) {
-	case INET_TCP:  
-		if (localport != 0 || remoteport != 0) {
-			int on = 1;
+	struct addrinfo *lres, *lres0;
+	struct addrinfo lhints;
+	struct addrinfo *rres, *rres0;
+	struct addrinfo rhints;
+
+	int lerror;
+	int rerror;
+
+	int socket_fd = INVALID_HANDLE;
+	int any_remote_host = (strcmp(remotehostname, "0") == 0);
+
+	memset (&lhints, '\0', sizeof (lhints));
+	lhints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+	lhints.ai_socktype = type;
+
+	lerror = getaddrinfo (NULL, localpname, &lhints, &lres);
+	if (lerror) {
+		if (strcmp(localpname, "0") != 0)
+			fatal(_("local port %s invalid in `/inet'"), localpname);
+		lres0 = NULL;
+		lres = &lhints;
+	} else
+		lres0 = lres;
+
+	while (lres != NULL) {
+		memset (&rhints, '\0', sizeof (rhints));
+		rhints.ai_flags = lhints.ai_flags;
+		rhints.ai_socktype = lhints.ai_socktype;
+		rhints.ai_family = lhints.ai_family;
+		rhints.ai_protocol = lhints.ai_protocol;
+
+		rerror = getaddrinfo (remotehostname, remotepname, &rhints, &rres);
+		if (rerror) {
+			if (lres0 != NULL)
+				freeaddrinfo(lres0);
+			fatal(_("remote host and port information (%s, %s) invalid"), remotehostname, remotepname);
+		}
+		rres0 = rres;
+		socket_fd = INVALID_HANDLE;
+		while (rres != NULL) {
+			socket_fd = socket (rres->ai_family,
+				rres->ai_socktype, rres->ai_protocol);
+			if (socket_fd < 0 || socket_fd == INVALID_HANDLE)
+				goto nextrres;
+
+			if (type == SOCK_STREAM) {
+				int on = 1;
 #ifdef SO_LINGER
-			struct linger linger;
-
-			memset(& linger, '\0', sizeof(linger));
+				struct linger linger;
+				memset(& linger, '\0', sizeof(linger));
 #endif
-			socket_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); 
-			setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR,
-				(char *) & on, sizeof(on));
+				setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR,
+					(char *) & on, sizeof(on));
 #ifdef SO_LINGER
-			linger.l_onoff = 1;
-			linger.l_linger = 30;    /* linger for 30/100 second */
-			setsockopt(socket_fd, SOL_SOCKET, SO_LINGER,
-				(char *) & linger, sizeof(linger));
-#endif
-		}
-		break;
-	case INET_UDP:  
-		if (localport != 0 || remoteport != 0)
-			socket_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); 
-		break;
-	case INET_RAW:  
-#ifdef SOCK_RAW
-		if (localport == 0 && remoteport == 0)
-			socket_fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); 
+				linger.l_onoff = 1;
+				linger.l_linger = 30;    /* linger for 30/100 second */
+				setsockopt(socket_fd, SOL_SOCKET, SO_LINGER,
+					(char *) & linger, sizeof(linger));
 #endif
-		break;
-	case INET_NONE:
-		/* fall through */
-	default:
-		cant_happen();
-		break;
-	}
-
-	if (socket_fd < 0 || socket_fd == INVALID_HANDLE
-	    || (hp == NULL && any_remote_host != 0))
-		return INVALID_HANDLE;
-
-	local_addr.sin_family = remote_addr.sin_family = AF_INET;
-	local_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	remote_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	local_addr.sin_port  = htons(localport);
-	remote_addr.sin_port = htons(remoteport);
-	if (bind(socket_fd, (struct sockaddr *) &local_addr, sizeof(local_addr)) == 0) {
-		if (any_remote_host != 0) { /* not ANY => create a client */
-			if (type == INET_TCP || type == INET_UDP) {
-				memcpy(&remote_addr.sin_addr, hp->h_addr,
-					sizeof(remote_addr.sin_addr));
-				if (connect(socket_fd,
-						(struct sockaddr *) &remote_addr,
-						sizeof(remote_addr)) != 0) {
-					close(socket_fd);
-					if (localport == 0)
-						socket_fd = INVALID_HANDLE;
-					else
-						socket_fd = socketopen(type, localport, 0, "0");
-				}
-			} else {
-				/* /inet/raw client not ready yet */ 
-				fatal(_("/inet/raw client not ready yet, sorry"));
-				if (geteuid() != 0)
-					fatal(_("only root may use `/inet/raw'."));
 			}
-		} else { /* remote host is ANY => create a server */
-			if (type == INET_TCP) {
-				int clientsocket_fd = INVALID_HANDLE;
-				socklen_t namelen = sizeof(remote_addr);
+			if (bind(socket_fd, lres->ai_addr, lres->ai_addrlen) != 0)
+				goto nextrres;
+
+			if (! any_remote_host) { /* not ANY => create a client */
+				if (type != SOCK_RAW) {
+					if (connect(socket_fd, rres->ai_addr,
+						rres->ai_addrlen) == 0)
+						break;
+				} else {
+					/* /inet/raw client not ready yet */ 
+					fatal(_("/inet/raw client not ready yet, sorry"));
+					if (geteuid() != 0)
+						/* FIXME: is this second fatal ever reached? */
+						fatal(_("only root may use `/inet/raw'."));
+				}
+			} else { /* remote host is ANY => create a server */
+				if (type == SOCK_STREAM) {
+					int clientsocket_fd = INVALID_HANDLE;
 
-				if (listen(socket_fd, 1) >= 0
-				    && (clientsocket_fd = accept(socket_fd,
+					struct sockaddr_storage remote_addr;
+					socklen_t namelen = sizeof (remote_addr);
+
+					if (listen(socket_fd, 1) >= 0
+					    && (clientsocket_fd = accept(socket_fd,
 						(struct sockaddr *) &remote_addr,
 						&namelen)) >= 0) {
-					close(socket_fd);
-					socket_fd = clientsocket_fd;
-				} else {
-					close(socket_fd);
-					socket_fd = INVALID_HANDLE;
-				}
-			} else if (type == INET_UDP) {
+						close(socket_fd);
+						socket_fd = clientsocket_fd;
+						break;
+					}
+				} else if (type == SOCK_DGRAM) {
 #ifdef MSG_PEEK
-				char buf[10];
-				socklen_t readle;
-
-				if (recvfrom(socket_fd, buf, 1, MSG_PEEK,
-					(struct sockaddr *) & remote_addr,
-					& readle) < 1
-						|| readle != sizeof(remote_addr)
-				    || connect(socket_fd,
-					(struct sockaddr *)& remote_addr,
-						readle) != 0) {
-					close(socket_fd);
-					socket_fd = INVALID_HANDLE;
-				}
+					char buf[10];
+					struct sockaddr_storage remote_addr;
+					socklen_t readle;
+
+					if (recvfrom(socket_fd, buf, 1, MSG_PEEK,
+						(struct sockaddr *) & remote_addr,
+							& readle) >= 0
+							&& readle
+							&& connect(socket_fd,
+						(struct sockaddr *)& remote_addr,
+								readle) == 0)
+							break;
 #endif
-			} else {
-				/* /inet/raw server not ready yet */ 
-				fatal(_("/inet/raw server not ready yet, sorry"));
-				if (geteuid() != 0)
-					fatal(_("only root may use `/inet/raw'."));
+				} else {
+					/* /inet/raw server not ready yet */ 
+					fatal(_("/inet/raw server not ready yet, sorry"));
+					if (geteuid() != 0)
+						fatal(_("only root may use `/inet/raw'."));
+				}
 			}
+
+nextrres:
+			if (socket_fd != INVALID_HANDLE)
+				close(socket_fd);
+			socket_fd = INVALID_HANDLE;
+			rres = rres->ai_next;
 		}
-	} else {
-		close(socket_fd);
-		socket_fd = INVALID_HANDLE;
+		freeaddrinfo(rres0);
+		if (socket_fd != INVALID_HANDLE)
+			break;
+		lres = lres->ai_next;
 	}
+	if (lres0)
+		freeaddrinfo(lres0);
 
 	return socket_fd;
 }
@@ -1312,30 +1367,24 @@ devopen(const char *name, const char *mode)
 	} else if (STREQN(name, "/inet/", 6)) {
 #ifdef HAVE_SOCKETS
 		/* /inet/protocol/localport/hostname/remoteport */
-		enum inet_prot protocol = INET_NONE;
-		int localport, remoteport;
+		int protocol;
 		char *hostname;
 		char *hostnameslastcharp;
 		char *localpname;
-		char proto[4];
-		struct servent *service;
+		char *localpnamelastcharp;
 
 		cp = (char *) name + 6;
 		/* which protocol? */
 		if (STREQN(cp, "tcp/", 4))
-			protocol = INET_TCP;
+			protocol = SOCK_STREAM;
 		else if (STREQN(cp, "udp/", 4))
-			protocol = INET_UDP;
+			protocol = SOCK_DGRAM;
 		else if (STREQN(cp, "raw/", 4))
-			protocol = INET_RAW;
+			protocol = SOCK_RAW;
 		else
 			fatal(_("no (known) protocol supplied in special filename `%s'"),
 				name);
 
-		proto[0] = cp[0];
-		proto[1] = cp[1];   
-		proto[2] = cp[2];   
-		proto[3] =  '\0';
 		cp += 4;
 
 		/* which localport? */
@@ -1353,25 +1402,17 @@ devopen(const char *name, const char *mode)
 		 * By using atoi() the use of decimal numbers is enforced.
 		 */
 		*cp = '\0';
-
-		localport = atoi(localpname);
-		if (strcmp(localpname, "0") != 0
-		    && (localport <= 0 || localport > 65535)) {
-			service = getservbyname(localpname, proto);
-			if (service == NULL)
-				fatal(_("local port invalid in `%s'"), name);
-			else
-				localport = ntohs(service->s_port);
-		}
-		*cp = '/';
+		localpnamelastcharp = cp;
 
 		/* which hostname? */
 		cp++;
 		hostname = cp;
 		while (*cp != '/' && *cp != '\0')
 			cp++; 
-		if (*cp != '/' || cp == hostname)
+		if (*cp != '/' || cp == hostname) {
+			*localpnamelastcharp = '/';
 			fatal(_("must supply a remote hostname to `/inet'"));
+		}
 		*cp = '\0';
 		hostnameslastcharp = cp;
 
@@ -1385,22 +1426,15 @@ devopen(const char *name, const char *mode)
 		 * Here too, require a port, let them explicitly put 0 if
 		 * they don't care.
 		 */
-		if (*cp == '\0')
+		if (*cp == '\0') {
+			*localpnamelastcharp = '/';
+			*hostnameslastcharp = '/';
 			fatal(_("must supply a remote port to `/inet'"));
-		remoteport = atoi(cp);
-		if (strcmp(cp, "0") != 0
-		    && (remoteport <= 0 || remoteport > 65535)) {
-			service = getservbyname(cp, proto);
-			if (service == NULL)
-				 fatal(_("remote port invalid in `%s'"), name);
-			else
-				remoteport = ntohs(service->s_port);
 		}
 
-		/* Open Sesame! */
-		openfd = socketopen(protocol, localport, remoteport, hostname);
+		openfd = socketopen(protocol, localpname, cp, hostname);
+		*localpnamelastcharp = '/';
 		*hostnameslastcharp = '/';
-
 #else /* ! HAVE_SOCKETS */
 		fatal(_("TCP/IP communications are not supported"));
 #endif /* HAVE_SOCKETS */
@@ -1422,30 +1456,24 @@ strictopen:
 /* spec_setup --- setup an IOBUF for a special internal file */
 
 static void
-spec_setup(IOBUF *iop, int len, int allocate)
+spec_setup(IOBUF *iop, int len)
 {
 	char *cp;
 
-	if (allocate) {
-		emalloc(cp, char *, len+2, "spec_setup");
-		iop->buf = cp;
-	} else {
-		len = strlen(iop->buf);
-		iop->buf[len++] = '\n';	/* get_a_record clobbered it */
-		iop->buf[len] = '\0';	/* just in case */
-	}
+	emalloc(cp, char *, len+2, "spec_setup");
+	iop->buf = cp;
 	iop->off = iop->buf;
 	iop->count = 0;
 	iop->size = len;
 	iop->end = iop->buf + len;
 	iop->dataend = iop->end;
 	iop->fd = -1;
-	iop->flag = IOP_IS_INTERNAL | IOP_AT_START;
+	iop->flag = IOP_IS_INTERNAL | IOP_AT_START | IOP_NO_FREE;
 }
 
 /* specfdopen --- open an fd special file */
 
-static int
+static IOBUF *
 specfdopen(IOBUF *iop, const char *name, const char *mode)
 {
 	int fd;
@@ -1453,17 +1481,14 @@ specfdopen(IOBUF *iop, const char *name, const char *mode)
 
 	fd = devopen(name, mode);
 	if (fd == INVALID_HANDLE)
-		return INVALID_HANDLE;
-	tp = iop_alloc(fd, name, NULL);
+		return NULL;
+	tp = iop_alloc(fd, name, iop);
 	if (tp == NULL) {
 		/* don't leak fd's */
 		close(fd);
-		return INVALID_HANDLE;
+		return NULL;
 	}
-	*iop = *tp;
-	iop->flag |= IOP_NO_FREE;
-	free(tp);
-	return 0;
+	return tp;
 }
 
 #ifdef GETPGRP_VOID
@@ -1474,7 +1499,7 @@ specfdopen(IOBUF *iop, const char *name, const char *mode)
 
 /* pidopen --- "open" /dev/pid, /dev/ppid, and /dev/pgrpid */
 
-static int
+static IOBUF *
 pidopen(IOBUF *iop, const char *name, const char *mode ATTRIBUTE_UNUSED)
 {
 	char tbuf[BUFSIZ];
@@ -1483,6 +1508,12 @@ pidopen(IOBUF *iop, const char *name, const char *mode ATTRIBUTE_UNUSED)
 
 	warning(_("use `PROCINFO[\"%s\"]' instead of `%s'"), cp, name);
 
+	if (iop == NULL) {
+		iop = iop_alloc(INTERNAL_HANDLE, name, iop);
+		if (iop == NULL)
+			return NULL;
+	}
+
 	if (name[6] == 'g')
 		sprintf(tbuf, "%d\n", (int) getpgrp(getpgrp_arg()));
 	else if (name[6] == 'i')
@@ -1490,9 +1521,9 @@ pidopen(IOBUF *iop, const char *name, const char *mode ATTRIBUTE_UNUSED)
 	else
 		sprintf(tbuf, "%d\n", (int) getppid());
 	i = strlen(tbuf);
-	spec_setup(iop, i, TRUE);
+	spec_setup(iop, i);
 	strcpy(iop->buf, tbuf);
-	return 0;
+	return iop;
 }
 
 /* useropen --- "open" /dev/user */
@@ -1507,7 +1538,7 @@ pidopen(IOBUF *iop, const char *name, const char *mode ATTRIBUTE_UNUSED)
  * supplementary group set.
  */
 
-static int
+static IOBUF *
 useropen(IOBUF *iop, const char *name ATTRIBUTE_UNUSED, const char *mode ATTRIBUTE_UNUSED)
 {
 	char tbuf[BUFSIZ], *cp;
@@ -1515,6 +1546,12 @@ useropen(IOBUF *iop, const char *name ATTRIBUTE_UNUSED, const char *mode ATTRIBU
 
 	warning(_("use `PROCINFO[...]' instead of `/dev/user'"));
 
+	if (iop == NULL) {
+		iop = iop_alloc(INTERNAL_HANDLE, name, iop);
+		if (iop == NULL)
+			return NULL;
+	}
+
 	sprintf(tbuf, "%d %d %d %d", (int) getuid(), (int) geteuid(), (int) getgid(), (int) getegid());
 
 	cp = tbuf + strlen(tbuf);
@@ -1529,23 +1566,22 @@ useropen(IOBUF *iop, const char *name ATTRIBUTE_UNUSED, const char *mode ATTRIBU
 	*cp++ = '\0';
 
 	i = strlen(tbuf);
-	spec_setup(iop, i, TRUE);
+	spec_setup(iop, i);
 	strcpy(iop->buf, tbuf);
-	return 0;
+	return iop;
 }
 
 /* iop_open --- handle special and regular files for input */
 
 static IOBUF *
-iop_open(const char *name, const char *mode, IOBUF *iop)
+iop_open(const char *name, const char *mode, IOBUF *iop, int *isdir)
 {
 	int openfd = INVALID_HANDLE;
 	int flag = 0;
 	static struct internal {
 		const char *name;
 		int compare;
-		int (*fp) P((IOBUF *, const char *, const char *));
-		IOBUF iob;
+		IOBUF *(*fp) P((IOBUF *, const char *, const char *));
 	} table[] = {
 		{ "/dev/fd/",		8,	specfdopen },
 		{ "/dev/stdin",		10,	specfdopen },
@@ -1570,12 +1606,7 @@ iop_open(const char *name, const char *mode, IOBUF *iop)
 
 		for (i = 0; i < devcount; i++) {
 			if (STREQN(name, table[i].name, table[i].compare)) {
-				iop = & table[i].iob;
-
-				if (iop->buf != NULL) {
-					spec_setup(iop, 0, FALSE);
-					return iop;
-				} else if ((*table[i].fp)(iop, name, mode) == 0)
+				if ((iop = (*table[i].fp)(iop, name, mode)) != NULL)
 					return iop;
 				else {
 					warning(_("could not open `%s', mode `%s'"),
@@ -1591,8 +1622,12 @@ strictopen:
 	if (openfd == INVALID_HANDLE)
 		openfd = open(name, flag, 0666);
 	if (openfd != INVALID_HANDLE) {
-		if (os_isdir(openfd))
-			fatal(_("file `%s' is a directory"), name);
+		if (os_isdir(openfd)) {
+			if (isdir)
+				*isdir = TRUE;
+			(void) close(openfd);	/* don't leak fds */
+			return NULL;
+		}
 	}
 	/*
 	 * At this point, fd could still be INVALID_HANDLE.
@@ -2480,9 +2515,12 @@ iop_alloc(int fd, const char *name, IOBUF *iop)
 {
 	struct stat sbuf;
 	struct open_hook *oh;
+	int iop_malloced = FALSE;
 
-	if (iop == NULL)
+	if (iop == NULL) {
 		emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc");
+		iop_malloced = TRUE;
+	}
 	memset(iop, '\0', sizeof(IOBUF));
 	iop->flag = 0;
 	iop->fd = fd;
@@ -2494,8 +2532,12 @@ iop_alloc(int fd, const char *name, IOBUF *iop)
 			break;
 	}
 
+	if (iop->fd == INTERNAL_HANDLE)
+		return iop;
+
 	if (iop->fd == INVALID_HANDLE) {
-		free(iop);
+		if (iop_malloced)
+			free(iop);
 		return NULL;
 	}
 	if (isatty(iop->fd))
@@ -2503,7 +2545,7 @@ iop_alloc(int fd, const char *name, IOBUF *iop)
 	iop->readsize = iop->size = optimal_bufsize(iop->fd, & sbuf);
 	iop->sbuf = sbuf;
 	if (do_lint && S_ISREG(sbuf.st_mode) && sbuf.st_size == 0)
-			lintwarn(_("data file `%s' is empty"), name);
+		lintwarn(_("data file `%s' is empty"), name);
 	errno = 0;
 	iop->count = iop->scanoff = 0;
 	emalloc(iop->buf, char *, iop->size += 2, "iop_alloc");
@@ -2886,7 +2928,7 @@ find_longest_terminator:
 /* <getarecord>=                                                            */
 /* get_a_record --- read a record from IOP into out, return length of EOF, set RT */
 
-int
+static int
 get_a_record(char **out,        /* pointer to pointer to data */
         IOBUF *iop,             /* input IOP */
         int *errcode)           /* pointer to error variable */
@@ -2906,6 +2948,10 @@ get_a_record(char **out,        /* pointer to pointer to data */
 
         /* <fill initial buffer>=                                                   */
         if (has_no_data(iop) || no_data_left(iop)) {
+		if (is_internal(iop)) {
+			iop->flag |= IOP_AT_EOF;
+			return EOF;
+		}
                 iop->count = read(iop->fd, iop->buf, iop->readsize);
                 if (iop->count == 0) {
                         iop->flag |= IOP_AT_EOF;
@@ -2974,6 +3020,14 @@ get_a_record(char **out,        /* pointer to pointer to data */
                         while (amt_to_read + iop->readsize < room_left)
                                 amt_to_read += iop->readsize;
 
+#ifdef SSIZE_MAX
+			/*
+			 * POSIX limits read to SSIZE_MAX. There are (bizarre)
+			 * systems where this amount is small.
+			 */
+			amt_to_read = min(amt_to_read, SSIZE_MAX);
+#endif
+
                         iop->count = read(iop->fd, iop->dataend, amt_to_read);
                         if (iop->count == -1) {
                                 if (! do_traditional && errcode != NULL) {
@@ -3097,7 +3151,7 @@ set_RS()
 		RS_is_null = TRUE;
 		matchrec = rsnullscan;
 	} else if (RS->stlen > 1) {
-		static int warned = FALSE;
+		static short warned = FALSE;
 
 		RS_re_yes_case = make_regexp(RS->stptr, RS->stlen, FALSE, TRUE);
 		RS_re_no_case = make_regexp(RS->stptr, RS->stlen, TRUE, TRUE);
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 60dfe21c..3c9a5184 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,23 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Tue Mar 20 21:33:31 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* strtod.m4: Removed, not needed anymore.
+
+2007-01-08  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* gettext.m4: Upgrade to gettext-0.16.1.
+	* lib-link.m4: Upgrade to gettext-0.16.1.
+	* lib-prefix.m4: Upgrade to gettext-0.16.1.
+	* nls.m4: Upgrade to gettext-0.16.1.
+	* po.m4: Upgrade to gettext-0.16.1.
+	* intl.m4: New file, copied in from move to current Autotools.
+	* intldir.m4: New file, copied in from move to current Autotools.
+	* lock.m4: New file, copied in from move to current Autotools.
+	* visibility.m4: New file, copied in from move to current Autotools.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/m4/arch.m4 b/m4/arch.m4
index 622068c9..4698f082 100644
--- a/m4/arch.m4
+++ b/m4/arch.m4
@@ -8,7 +8,7 @@ dnl AWK Progamming Language.
 dnl
 dnl GAWK is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
+dnl the Free Software Foundation; either version 3 of the License, or
 dnl (at your option) any later version.
 dnl
 dnl GAWK is distributed in the hope that it will be useful,
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index a6e67ec4..223955b4 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,5 +1,5 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# codeset.m4 serial 2 (gettext-0.16)
+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,7 +10,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
 [
   AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
     [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
       am_cv_langinfo_codeset=yes,
       am_cv_langinfo_codeset=no)
     ])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 624a8078..91c345e9 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,5 +1,5 @@
-# gettext.m4 serial 37 (gettext-0.14.4)
-dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+# gettext.m4 serial 59 (gettext-0.16.1)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
 
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006.
 
 dnl Macro to add for using GNU gettext.
 
@@ -63,8 +63,13 @@ AC_DEFUN([AM_GNU_GETTEXT],
   ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
 ])])])])
-  define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
   define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
 
   AC_REQUIRE([AM_PO_SUBDIRS])dnl
   ifelse(gt_included_intl, yes, [
@@ -78,7 +83,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
   dnl Sometimes libintl requires libiconv, so first search for libiconv.
   dnl Ideally we would do this search only after the
   dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
   dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
   dnl the configure script would need to contain the same shell code
   dnl again, outside any 'if'. There are two solutions:
@@ -94,7 +99,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
   gt_INTL_MACOSX
 
   dnl Set USE_NLS.
-  AM_NLS
+  AC_REQUIRE([AM_NLS])
 
   ifelse(gt_included_intl, yes, [
     BUILD_INCLUDED_LIBINTL=no
@@ -104,6 +109,15 @@ AC_DEFUN([AM_GNU_GETTEXT],
   LTLIBINTL=
   POSUB=
 
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
@@ -122,28 +136,35 @@ AC_DEFUN([AM_GNU_GETTEXT],
         dnl to use.  If GNU gettext is available we use this.  Else we have
         dnl to fall back to GNU NLS library.
 
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
 changequote(,)dnl
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
 changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
 
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
           dnl Sometimes libintl requires libiconv, so first search for libiconv.
           ifelse(gt_included_intl, yes, , [
             AM_ICONV_LINK
@@ -154,52 +175,40 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
           dnl even if libiconv doesn't exist.
           AC_LIB_LINKFLAGS_BODY([intl])
           AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
+            [$gt_func_gnugettext_libintl],
            [gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);],
               [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);],
                 [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
+                eval "$gt_func_gnugettext_libintl=yes"
                ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
@@ -210,8 +219,8 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
         dnl use it.  But if this macro is used in GNU gettext, and GNU
         dnl gettext is already preinstalled in libintl, we update this
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -234,8 +243,8 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
         dnl Mark actions used to generate GNU NLS library.
         BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
@@ -271,7 +280,7 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
   if test "$USE_NLS" = "yes"; then
     AC_MSG_CHECKING([where the gettext function comes from])
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -285,7 +294,7 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         AC_MSG_CHECKING([how to link with libintl])
         AC_MSG_RESULT([$LIBINTL])
         AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
@@ -353,134 +362,6 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
 ])
 
 
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([gt_GLIBC2])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([bh_C_SIGNED])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
-  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_REQUIRE([gt_TYPE_INTMAX_T])
-  AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([gl_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-  AC_REQUIRE([gl_XSIZE])dnl
-  AC_REQUIRE([gt_INTL_MACOSX])dnl
-
-  AC_CHECK_TYPE([ptrdiff_t], ,
-    [AC_DEFINE([ptrdiff_t], [long],
-       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-    ])
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking])
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
-  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST([HAVE_POSIX_PRINTF])
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST([HAVE_ASPRINTF])
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST([HAVE_SNPRINTF])
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST([HAVE_WPRINTF])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    gt_LC_MESSAGES
-  fi
-
-  if test -n "$INTL_MACOSX_LIBS"; then
-    CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-
 dnl Checks for special options needed on MacOS X.
 dnl Defines INTL_MACOSX_LIBS.
 AC_DEFUN([gt_INTL_MACOSX],
@@ -488,15 +369,12 @@ AC_DEFUN([gt_INTL_MACOSX],
   dnl Check for API introduced in MacOS X 10.2.
   AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
     gt_cv_func_CFPreferencesCopyAppValue,
-    [gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
-     AC_TRY_LINK([#include <CFPreferences.h>],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
        [CFPreferencesCopyAppValue(NULL, NULL)],
        [gt_cv_func_CFPreferencesCopyAppValue=yes],
        [gt_cv_func_CFPreferencesCopyAppValue=no])
-     CPPFLAGS="$gt_save_CPPFLAGS"
      LIBS="$gt_save_LIBS"])
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
     AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
@@ -504,14 +382,11 @@ AC_DEFUN([gt_INTL_MACOSX],
   fi
   dnl Check for API introduced in MacOS X 10.3.
   AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
-    [gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
-     AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
        [gt_cv_func_CFLocaleCopyCurrent=yes],
        [gt_cv_func_CFLocaleCopyCurrent=no])
-     CPPFLAGS="$gt_save_CPPFLAGS"
      LIBS="$gt_save_LIBS"])
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
     AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
@@ -525,23 +400,18 @@ AC_DEFUN([gt_INTL_MACOSX],
 ])
 
 
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN([gt_CHECK_DECL],
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
 [
-  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
-    [AC_TRY_COMPILE([$2], [
-#ifndef $1
-  char *p = (char *) $1;
-#endif
-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
-  if test $ac_cv_have_decl_$1 = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
-    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
 ])
 
 
diff --git a/m4/intl.m4 b/m4/intl.m4
new file mode 100644
index 00000000..dcefb118
--- /dev/null
+++ b/m4/intl.m4
@@ -0,0 +1,259 @@
+# intl.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006.
+
+AC_PREREQ(2.52)
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([gt_GLIBC2])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([gl_VISIBILITY])dnl
+  AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
+  AC_REQUIRE([gl_GLIBC21])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+  AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
+  AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
+  AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
+
+  AM_LANGINFO_CODESET
+  gt_LC_MESSAGES
+
+  dnl Compilation on mingw and Cygwin needs special Makefile rules, because
+  dnl 1. when we install a shared library, we must arrange to export
+  dnl    auxiliary pointer variables for every exported variable,
+  dnl 2. when we install a shared library and a static library simultaneously,
+  dnl    the include file specifies __declspec(dllimport) and therefore we
+  dnl    must arrange to define the auxiliary pointer variables for the
+  dnl    exported variables _also_ in the static library.
+  if test "$enable_shared" = yes; then
+    case "$host_os" in
+      cygwin*) is_woe32dll=yes ;;
+      *) is_woe32dll=no ;;
+    esac
+  else
+    is_woe32dll=no
+  fi
+  WOE32DLL=$is_woe32dll
+  AC_SUBST([WOE32DLL])
+
+  dnl Rename some macros and functions used for locking.
+  AH_BOTTOM([
+#define __libc_lock_t                   gl_lock_t
+#define __libc_lock_define              gl_lock_define
+#define __libc_lock_define_initialized  gl_lock_define_initialized
+#define __libc_lock_init                gl_lock_init
+#define __libc_lock_lock                gl_lock_lock
+#define __libc_lock_unlock              gl_lock_unlock
+#define __libc_lock_recursive_t                   gl_recursive_lock_t
+#define __libc_lock_define_recursive              gl_recursive_lock_define
+#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
+#define __libc_lock_init_recursive                gl_recursive_lock_init
+#define __libc_lock_lock_recursive                gl_recursive_lock_lock
+#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
+#define glthread_in_use  libintl_thread_in_use
+#define glthread_lock_init     libintl_lock_init
+#define glthread_lock_lock     libintl_lock_lock
+#define glthread_lock_unlock   libintl_lock_unlock
+#define glthread_lock_destroy  libintl_lock_destroy
+#define glthread_rwlock_init     libintl_rwlock_init
+#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
+#define glthread_rwlock_unlock   libintl_rwlock_unlock
+#define glthread_rwlock_destroy  libintl_rwlock_destroy
+#define glthread_recursive_lock_init     libintl_recursive_lock_init
+#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
+#define glthread_once                 libintl_once
+#define glthread_once_call            libintl_once_call
+#define glthread_once_singlethreaded  libintl_once_singlethreaded
+])
+])
+
+
+dnl Checks for the core files of the intl subdirectory:
+dnl   dcigettext.c
+dnl   eval-plural.h
+dnl   explodename.c
+dnl   finddomain.c
+dnl   gettextP.h
+dnl   gmo.h
+dnl   hash-string.h hash-string.c
+dnl   l10nflist.c
+dnl   libgnuintl.h.in (except the *printf stuff)
+dnl   loadinfo.h
+dnl   loadmsgcat.c
+dnl   localealias.c
+dnl   log.c
+dnl   plural-exp.h plural-exp.c
+dnl   plural.y
+dnl Used by libglocale.
+AC_DEFUN([gt_INTL_SUBDIR_CORE],
+[
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_LOCK])dnl
+
+  AC_TRY_LINK(
+    [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
+    [],
+    [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
+       [Define to 1 if the compiler understands __builtin_expect.])])
+
+  AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
+    stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
+    argz_next __fsetlocking])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+
+  AM_ICONV
+
+  dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
+  dnl and a _NL_LOCALE_NAME macro always.
+  AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
+    [AC_TRY_LINK([#include <langinfo.h>
+#include <locale.h>],
+      [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
+      gt_cv_nl_locale_name=yes,
+      gt_cv_nl_locale_name=no)
+    ])
+  if test $gt_cv_nl_locale_name = yes; then
+    AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
+      [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
+  fi
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
+])
+
+
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
diff --git a/m4/intldir.m4 b/m4/intldir.m4
new file mode 100644
index 00000000..7a28843f
--- /dev/null
+++ b/m4/intldir.m4
@@ -0,0 +1,19 @@
+# intldir.m4 serial 1 (gettext-0.16)
+dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+AC_PREREQ(2.52)
+
+dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
+AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index d99c999f..ce7a8a49 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,4 +1,4 @@
-# intmax.m4 serial 2 (gettext-0.14.2)
+# intmax.m4 serial 3 (gettext-0.16)
 dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -22,7 +22,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
 #if HAVE_INTTYPES_H_WITH_UINTMAX
 #include <inttypes.h>
 #endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+],     [intmax_t x = -1;
+        return !x;],
+       gt_cv_c_intmax_t=yes,
+       gt_cv_c_intmax_t=no)])
   if test $gt_cv_c_intmax_t = yes; then
     AC_DEFINE(HAVE_INTMAX_T, 1,
       [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index 4d56a9ad..7c7f8940 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,18 +1,20 @@
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+# inttypes-pri.m4 serial 4 (gettext-0.16)
+dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+AC_PREREQ(2.52)
+
 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
 # macros to non-string values.  This is the case on AIX 4.3.3.
 
 AC_DEFUN([gt_INTTYPES_PRI],
 [
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
+  AC_CHECK_HEADERS([inttypes.h])
+  if test $ac_cv_header_inttypes_h = yes; then
     AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
       gt_cv_inttypes_pri_broken,
       [
@@ -26,5 +28,9 @@ char *p = PRId32;
   if test "$gt_cv_inttypes_pri_broken" = yes; then
     AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
       [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+    PRI_MACROS_BROKEN=1
+  else
+    PRI_MACROS_BROKEN=0
   fi
+  AC_SUBST([PRI_MACROS_BROKEN])
 ])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index a5d075d9..edc8ecb2 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
-# inttypes_h.m4 serial 6
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# inttypes_h.m4 serial 7
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
     gl_cv_header_inttypes_h=yes,
     gl_cv_header_inttypes_h=no)])
   if test $gl_cv_header_inttypes_h = yes; then
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index ea0b0c4e..f95b7ba8 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,5 +1,5 @@
-# lib-link.m4 serial 6 (gettext-0.14.3)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+# lib-link.m4 serial 9 (gettext-0.16)
+dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -126,6 +126,7 @@ dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   dnl By default, look in $includedir and $libdir.
@@ -148,7 +149,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
         ])
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 ])
@@ -197,9 +198,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -219,9 +227,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -248,7 +263,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -334,8 +349,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
             dnl Assume the include files are nearby.
             additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -396,9 +411,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     dnl   3. if it's already present in $LDFLAGS or the already
                     dnl      constructed $LIBNAME,
                     dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -551,3 +566,79 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
     fi
   done
 ])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 0d895ca6..a8684e17 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,4 +1,4 @@
-# lib-prefix.m4 serial 4 (gettext-0.14.2)
+# lib-prefix.m4 serial 5 (gettext-0.15)
 dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -24,6 +24,7 @@ AC_DEFUN([AC_LIB_PREFIX],
   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
@@ -45,7 +46,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         ])
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 ])
@@ -87,7 +88,7 @@ AC_DEFUN([AC_LIB_PREFIX],
     dnl   2. if it's already present in $LDFLAGS,
     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
     dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
       haveit=
       for x in $LDFLAGS; do
         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
@@ -97,7 +98,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         fi
       done
       if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
           if test -n "$GCC"; then
             case $host_os in
               linux*) haveit=yes;;
@@ -151,3 +152,34 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 ])
+
+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+dnl the basename of the libdir, either "lib" or "lib64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64. The current
+  dnl practice is that on a system supporting 32-bit and 64-bit instruction
+  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+  dnl libraries go under $prefix/lib. We determine the compiler's default
+  dnl mode by looking at the compiler's library search path. If at least
+  dnl of its elements ends in /lib64 or points to a directory whose absolute
+  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+  dnl default, namely "lib".
+  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+])
diff --git a/m4/lock.m4 b/m4/lock.m4
new file mode 100644
index 00000000..0224f2ff
--- /dev/null
+++ b/m4/lock.m4
@@ -0,0 +1,311 @@
+# lock.m4 serial 6 (gettext-0.16)
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests for a multithreading library to be used.
+dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
+dnl USE_PTH_THREADS, USE_WIN32_THREADS
+dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
+dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
+dnl libtool).
+dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
+dnl programs that really need multithread functionality. The difference
+dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
+dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
+dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
+dnl multithread-safe programs.
+
+AC_DEFUN([gl_LOCK_EARLY],
+[
+  AC_REQUIRE([gl_LOCK_EARLY_BODY])
+])
+
+dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once.
+
+AC_DEFUN([gl_LOCK_EARLY_BODY],
+[
+  dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
+  dnl influences the result of the autoconf tests that test for *_unlocked
+  dnl declarations, on AIX 5 at least. Therefore it must come early.
+  AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
+  AC_BEFORE([$0], [gl_ARGP])dnl
+
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems
+  dnl Check for multithreading.
+  AC_ARG_ENABLE(threads,
+AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
+AC_HELP_STRING([--disable-threads], [build without multithread safety]),
+    [gl_use_threads=$enableval],
+    [case "$host_os" in
+       dnl Disable multithreading by default on OSF/1, because it interferes
+       dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
+       dnl process gets an endless segmentation fault inside execvp().
+       osf*) gl_use_threads=no ;;
+       *)    gl_use_threads=yes ;;
+     esac
+    ])
+  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+    # For using <pthread.h>:
+    case "$host_os" in
+      osf*)
+        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+        # groks <pthread.h>. cc also understands the flag -pthread, but
+        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+        # 2. putting a flag into CPPFLAGS that has an effect on the linker
+        # causes the AC_TRY_LINK test below to succeed unexpectedly,
+        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
+        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+        ;;
+    esac
+    # Some systems optimize for single-threaded programs by default, and
+    # need special flags to disable these optimizations. For example, the
+    # definition of 'errno' in <errno.h>.
+    case "$host_os" in
+      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
+      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
+    esac
+  fi
+])
+
+dnl The guts of gl_LOCK. Needs to be expanded only once.
+
+AC_DEFUN([gl_LOCK_BODY],
+[
+  AC_REQUIRE([gl_LOCK_EARLY_BODY])
+  gl_threads_api=none
+  LIBTHREAD=
+  LTLIBTHREAD=
+  LIBMULTITHREAD=
+  LTLIBMULTITHREAD=
+  if test "$gl_use_threads" != no; then
+    dnl Check whether the compiler and linker support weak declarations.
+    AC_MSG_CHECKING([whether imported symbols can be declared weak])
+    gl_have_weak=no
+    AC_TRY_LINK([extern void xyzzy ();
+#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes])
+    AC_MSG_RESULT([$gl_have_weak])
+    if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+      # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
+      # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
+      AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no)
+      if test "$gl_have_pthread_h" = yes; then
+        # Other possible tests:
+        #   -lpthreads (FSU threads, PCthreads)
+        #   -lgthreads
+        gl_have_pthread=
+        # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
+        # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
+        # the second one only in libpthread, and lock.c needs it.
+        AC_TRY_LINK([#include <pthread.h>],
+          [pthread_mutex_lock((pthread_mutex_t*)0);
+           pthread_mutexattr_init((pthread_mutexattr_t*)0);],
+          [gl_have_pthread=yes])
+        # Test for libpthread by looking for pthread_kill. (Not pthread_self,
+        # since it is defined as a macro on OSF/1.)
+        if test -n "$gl_have_pthread"; then
+          # The program links fine without libpthread. But it may actually
+          # need to link with libpthread in order to create multiple threads.
+          AC_CHECK_LIB(pthread, pthread_kill,
+            [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+             # On Solaris and HP-UX, most pthread functions exist also in libc.
+             # Therefore pthread_in_use() needs to actually try to create a
+             # thread: pthread_create from libc will fail, whereas
+             # pthread_create will actually create a thread.
+             case "$host_os" in
+               solaris* | hpux*)
+                 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1,
+                   [Define if the pthread_in_use() detection is hard.])
+             esac
+            ])
+        else
+          # Some library is needed. Try libpthread and libc_r.
+          AC_CHECK_LIB(pthread, pthread_kill,
+            [gl_have_pthread=yes
+             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
+          if test -z "$gl_have_pthread"; then
+            # For FreeBSD 4.
+            AC_CHECK_LIB(c_r, pthread_kill,
+              [gl_have_pthread=yes
+               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
+          fi
+        fi
+        if test -n "$gl_have_pthread"; then
+          gl_threads_api=posix
+          AC_DEFINE([USE_POSIX_THREADS], 1,
+            [Define if the POSIX multithreading library can be used.])
+          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+            if test $gl_have_weak = yes; then
+              AC_DEFINE([USE_POSIX_THREADS_WEAK], 1,
+                [Define if references to the POSIX multithreading library should be made weak.])
+              LIBTHREAD=
+              LTLIBTHREAD=
+            fi
+          fi
+          # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
+          # pthread_rwlock_* functions.
+          AC_CHECK_TYPE([pthread_rwlock_t],
+            [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1,
+               [Define if the POSIX multithreading library has read/write locks.])],
+            [],
+            [#include <pthread.h>])
+          # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
+          AC_TRY_COMPILE([#include <pthread.h>],
+            [#if __FreeBSD__ == 4
+error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+#else
+int x = (int)PTHREAD_MUTEX_RECURSIVE;
+return !x;
+#endif],
+            [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1,
+               [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
+        fi
+      fi
+    fi
+    if test -z "$gl_have_pthread"; then
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
+        gl_have_solaristhread=
+        gl_save_LIBS="$LIBS"
+        LIBS="$LIBS -lthread"
+        AC_TRY_LINK([#include <thread.h>
+#include <synch.h>],
+          [thr_self();],
+          [gl_have_solaristhread=yes])
+        LIBS="$gl_save_LIBS"
+        if test -n "$gl_have_solaristhread"; then
+          gl_threads_api=solaris
+          LIBTHREAD=-lthread
+          LTLIBTHREAD=-lthread
+          LIBMULTITHREAD="$LIBTHREAD"
+          LTLIBMULTITHREAD="$LTLIBTHREAD"
+          AC_DEFINE([USE_SOLARIS_THREADS], 1,
+            [Define if the old Solaris multithreading library can be used.])
+          if test $gl_have_weak = yes; then
+            AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1,
+              [Define if references to the old Solaris multithreading library should be made weak.])
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      fi
+    fi
+    if test "$gl_use_threads" = pth; then
+      gl_save_CPPFLAGS="$CPPFLAGS"
+      AC_LIB_LINKFLAGS(pth)
+      gl_have_pth=
+      gl_save_LIBS="$LIBS"
+      LIBS="$LIBS -lpth"
+      AC_TRY_LINK([#include <pth.h>], [pth_self();], gl_have_pth=yes)
+      LIBS="$gl_save_LIBS"
+      if test -n "$gl_have_pth"; then
+        gl_threads_api=pth
+        LIBTHREAD="$LIBPTH"
+        LTLIBTHREAD="$LTLIBPTH"
+        LIBMULTITHREAD="$LIBTHREAD"
+        LTLIBMULTITHREAD="$LTLIBTHREAD"
+        AC_DEFINE([USE_PTH_THREADS], 1,
+          [Define if the GNU Pth multithreading library can be used.])
+        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+          if test $gl_have_weak = yes; then
+            AC_DEFINE([USE_PTH_THREADS_WEAK], 1,
+              [Define if references to the GNU Pth multithreading library should be made weak.])
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      else
+        CPPFLAGS="$gl_save_CPPFLAGS"
+      fi
+    fi
+    if test -z "$gl_have_pthread"; then
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
+        if { case "$host_os" in
+               mingw*) true;;
+               *) false;;
+             esac
+           }; then
+          gl_threads_api=win32
+          AC_DEFINE([USE_WIN32_THREADS], 1,
+            [Define if the Win32 multithreading API can be used.])
+        fi
+      fi
+    fi
+  fi
+  AC_MSG_CHECKING([for multithread API to use])
+  AC_MSG_RESULT([$gl_threads_api])
+  AC_SUBST(LIBTHREAD)
+  AC_SUBST(LTLIBTHREAD)
+  AC_SUBST(LIBMULTITHREAD)
+  AC_SUBST(LTLIBMULTITHREAD)
+])
+
+AC_DEFUN([gl_LOCK],
+[
+  AC_REQUIRE([gl_LOCK_EARLY])
+  AC_REQUIRE([gl_LOCK_BODY])
+  gl_PREREQ_LOCK
+])
+
+# Prerequisites of lib/lock.c.
+AC_DEFUN([gl_PREREQ_LOCK], [
+  AC_REQUIRE([AC_C_INLINE])
+])
+
+dnl Survey of platforms:
+dnl
+dnl Platform          Available   Compiler    Supports   test-lock
+dnl                   flavours    option      weak       result
+dnl ---------------   ---------   ---------   --------   ---------
+dnl Linux 2.4/glibc   posix       -lpthread       Y      OK
+dnl
+dnl GNU Hurd/glibc    posix
+dnl
+dnl FreeBSD 5.3       posix       -lc_r           Y
+dnl                   posix       -lkse ?         Y
+dnl                   posix       -lpthread ?     Y
+dnl                   posix       -lthr           Y
+dnl
+dnl FreeBSD 5.2       posix       -lc_r           Y
+dnl                   posix       -lkse           Y
+dnl                   posix       -lthr           Y
+dnl
+dnl FreeBSD 4.0,4.10  posix       -lc_r           Y      OK
+dnl
+dnl NetBSD 1.6        --
+dnl
+dnl OpenBSD 3.4       posix       -lpthread       Y      OK
+dnl
+dnl MacOS X 10.[123]  posix       -lpthread       Y      OK
+dnl
+dnl Solaris 7,8,9     posix       -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
+dnl                   solaris     -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
+dnl
+dnl HP-UX 11          posix       -lpthread       N (cc) OK
+dnl                                               Y (gcc)
+dnl
+dnl IRIX 6.5          posix       -lpthread       Y      0.5
+dnl
+dnl AIX 4.3,5.1       posix       -lpthread       N      AIX 4: 0.5; AIX 5: OK
+dnl
+dnl OSF/1 4.0,5.1     posix       -pthread (cc)   N      OK
+dnl                               -lpthread (gcc) Y
+dnl
+dnl Cygwin            posix       -lpthread       Y      OK
+dnl
+dnl Any of the above  pth         -lpth                  0.0
+dnl
+dnl Mingw             win32                       N      OK
+dnl
+dnl BeOS 5            --
+dnl
+dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
+dnl turned off:
+dnl   OK if all three tests terminate OK,
+dnl   0.5 if the first test terminates OK but the second one loops endlessly,
+dnl   0.0 if the first test already loops endlessly.
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
index 40cd7ce0..25590f47 100644
--- a/m4/longdouble.m4
+++ b/m4/longdouble.m4
@@ -1,5 +1,5 @@
-# longdouble.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# longdouble.m4 serial 2 (gettext-0.15)
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,6 +8,9 @@ dnl From Bruno Haible.
 dnl Test whether the compiler supports the 'long double' type.
 dnl Prerequisite: AC_PROG_CC
 
+dnl This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
+dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics.
+
 AC_DEFUN([gt_TYPE_LONGDOUBLE],
 [
   AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 7b399e01..3716c09f 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,21 +1,46 @@
-# longlong.m4 serial 5
-dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+# longlong.m4 serial 8
+dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
-# Define HAVE_LONG_LONG if 'long long' works.
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.60, but can be removed once we
+# assume 2.61 everywhere.
 
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
+
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+	  [[long long int ll = 9223372036854775807ll;
+	    long long int nll = -9223372036854775807LL;
+	    typedef int a[((-9223372036854775807LL < 0
+			    && 0 < 9223372036854775807ll)
+			   ? 1 : -1)];
+	    int i = 63;]],
+	  [[long long int llmax = 9223372036854775807ll;
+	    return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+		    | (llmax / ll) | (llmax % ll));]])],
+       [ac_cv_type_long_long_int=yes],
+       [ac_cv_type_long_long_int=no])])
+  if test $ac_cv_type_long_long_int = yes; then
+    AC_DEFINE([HAVE_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `long long int'.])
+  fi
+])
+
+# This macro is obsolescent and should go away soon.
 AC_DEFUN([gl_AC_TYPE_LONG_LONG],
 [
-  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
-  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
-    [long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;],
-    ac_cv_type_long_long=yes,
-    ac_cv_type_long_long=no)])
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+  ac_cv_type_long_long=$ac_cv_type_long_long_int
   if test $ac_cv_type_long_long = yes; then
     AC_DEFINE(HAVE_LONG_LONG, 1,
       [Define if you have the 'long long' type.])
diff --git a/m4/nls.m4 b/m4/nls.m4
index 2082c3b2..7967cc2f 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,5 +1,5 @@
-# nls.m4 serial 2 (gettext-0.14.3)
-dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -29,23 +29,3 @@ AC_DEFUN([AM_NLS],
   AC_MSG_RESULT($USE_NLS)
   AC_SUBST(USE_NLS)
 ])
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate it.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
diff --git a/m4/po.m4 b/m4/po.m4
index f2795eea..00133ef3 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 7 (gettext-0.14.3)
-dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+# po.m4 serial 13 (gettext-0.15)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Perform the following tests also if --disable-nls has been given,
@@ -39,6 +39,22 @@ AC_DEFUN([AM_PO_SUBDIRS],
     :)
   AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
   dnl Search for GNU xgettext 0.12 or newer in the PATH.
   dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
   dnl The second test excludes FreeBSD xgettext.
@@ -49,44 +65,26 @@ AC_DEFUN([AM_PO_SUBDIRS],
   dnl Remove leftover from FreeBSD xgettext call.
   rm -f messages.po
 
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
   dnl Search for GNU msgmerge 0.11 or newer in the PATH.
   AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
     [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
 
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
-  fi
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
 
-  AC_OUTPUT_COMMANDS([
+  AC_CONFIG_COMMANDS([po-directories], [[
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
@@ -123,11 +121,12 @@ AC_DEFUN([AM_PO_SUBDIRS],
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -197,10 +196,10 @@ AC_DEFUN([AM_PO_SUBDIRS],
         fi
         ;;
       esac
-    done],
+    done]],
    [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
+    # from automake < 1.5.
     eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
@@ -286,7 +285,7 @@ x
 changequote([,])dnl
 
   # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
   POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
   # Compute POTFILES_DEPS as
   #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
@@ -305,10 +304,10 @@ changequote([,])dnl
     POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
   else
     # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assigment from automake.
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index 4fe81c7b..bfba811e 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,5 +1,5 @@
-# size_max.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# size_max.m4 serial 5
+dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,8 +11,9 @@ AC_DEFUN([gl_SIZE_MAX],
   AC_CHECK_HEADERS(stdint.h)
   dnl First test whether the system already has SIZE_MAX.
   AC_MSG_CHECKING([for SIZE_MAX])
-  result=
-  AC_EGREP_CPP([Found it], [
+  AC_CACHE_VAL([gl_cv_size_max], [
+    gl_cv_size_max=
+    AC_EGREP_CPP([Found it], [
 #include <limits.h>
 #if HAVE_STDINT_H
 #include <stdint.h>
@@ -20,40 +21,42 @@ AC_DEFUN([gl_SIZE_MAX],
 #ifdef SIZE_MAX
 Found it
 #endif
-], result=yes)
-  if test -z "$result"; then
-    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-    dnl than the type 'unsigned long'.
-    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
-    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
-    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
-      [#include <stddef.h>], result=?)
-    if test "$fits_in_uint" = 1; then
-      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-      AC_TRY_COMPILE([#include <stddef.h>
-        extern size_t foo;
-        extern unsigned long foo;
-        ], [], fits_in_uint=0)
-    fi
-    if test -z "$result"; then
-      if test "$fits_in_uint" = 1; then
-        result="$res_hi$res_lo"U
+], gl_cv_size_max=yes)
+    if test -z "$gl_cv_size_max"; then
+      dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+      dnl than the type 'unsigned long'. Try hard to find a definition that can
+      dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
+      _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
+        [#include <stddef.h>
+#include <limits.h>], size_t_bits_minus_1=)
+      _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+        [#include <stddef.h>], fits_in_uint=)
+      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
+        if test $fits_in_uint = 1; then
+          dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+          dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+          AC_TRY_COMPILE([#include <stddef.h>
+            extern size_t foo;
+            extern unsigned long foo;
+            ], [], fits_in_uint=0)
+        fi
+        dnl We cannot use 'expr' to simplify this expression, because 'expr'
+        dnl works only with 'long' integers in the host environment, while we
+        dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
+        if test $fits_in_uint = 1; then
+          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
+        else
+          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
+        fi
       else
-        result="$res_hi$res_lo"UL
+        dnl Shouldn't happen, but who knows...
+        gl_cv_size_max='((size_t)~(size_t)0)'
       fi
-    else
-      dnl Shouldn't happen, but who knows...
-      result='~(size_t)0'
     fi
-  fi
-  AC_MSG_RESULT([$result])
-  if test "$result" != yes; then
-    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+  ])
+  AC_MSG_RESULT([$gl_cv_size_max])
+  if test "$gl_cv_size_max" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
       [Define as the maximum value of type 'size_t', if the system doesn't define it.])
   fi
 ])
diff --git a/m4/socket.m4 b/m4/socket.m4
index 8e77cfed..ae86b349 100644
--- a/m4/socket.m4
+++ b/m4/socket.m4
@@ -8,7 +8,7 @@ dnl AWK Progamming Language.
 dnl
 dnl GAWK is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
+dnl the Free Software Foundation; either version 3 of the License, or
 dnl (at your option) any later version.
 dnl
 dnl GAWK is distributed in the hope that it will be useful,
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 3355f35a..db9a8ac4 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,5 +1,5 @@
-# stdint_h.m4 serial 5
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# stdint_h.m4 serial 6
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_STDINT_H],
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
     gl_cv_header_stdint_h=yes,
     gl_cv_header_stdint_h=no)])
   if test $gl_cv_header_stdint_h = yes; then
diff --git a/m4/strtod.m4 b/m4/strtod.m4
deleted file mode 100644
index f097bbba..00000000
--- a/m4/strtod.m4
+++ /dev/null
@@ -1,58 +0,0 @@
-dnl
-dnl strtod.m4 --- autoconf input file for gawk
-dnl
-dnl Copyright (C) 2001, 2002, 2004 the Free Software Foundation, Inc.
-dnl
-dnl This file is part of GAWK, the GNU implementation of the
-dnl AWK Progamming Language.
-dnl
-dnl GAWK is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl GAWK is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-dnl Check for strtod with C89 semantics
-
-AC_DEFUN([GAWK_AC_FUNC_STRTOD_C89], [
-AC_CHECK_HEADERS(stdlib.h)
-AC_CHECK_FUNCS(strtod)
-AC_CACHE_CHECK([for strtod with C89 semantics], gawk_ac_cv_func_strtod_c89,
-[AC_TRY_RUN(
-[/* Test program from Arnold Robbins (arnold@skeeve.com) */
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#else
-extern double strtod();
-#endif
-
-int
-main ()
-{
-#if ! HAVE_STRTOD
-  exit(1);
-#else
-  double d;
-  char *str = "0x345a";
-
-  d = strtod(str, 0);
-  if (d == 0)
-     exit (0);
-  else
-     exit (1);
-#endif
-}],
-gawk_ac_cv_func_strtod_c89=yes, gawk_ac_cv_func_strtod_c89=no,
-gawk_ac_cv_func_strtod_c89=no)])
-if test $gawk_ac_cv_func_strtod_c89 = no; then
-  AC_DEFINE(STRTOD_NOT_C89, 1, [strtod doesn't have C89 semantics])
-fi
-])# GAWK_FUNC_STRTOD_C89
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index dee10ccc..9fae98e3 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,21 +1,46 @@
-# ulonglong.m4 serial 4
-dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+# ulonglong.m4 serial 6
+dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.60, but can be removed once we
+# assume 2.61 everywhere.
 
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for unsigned long long int],
+    [ac_cv_type_unsigned_long_long_int],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+	  [[unsigned long long int ull = 18446744073709551615ULL;
+	    typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
+			   ? 1 : -1)];
+	   int i = 63;]],
+	  [[unsigned long long int ullmax = 18446744073709551615ull;
+	    return (ull << 63 | ull >> 63 | ull << i | ull >> i
+		    | ullmax / ull | ullmax % ull);]])],
+       [ac_cv_type_unsigned_long_long_int=yes],
+       [ac_cv_type_unsigned_long_long_int=no])])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `unsigned long long int'.])
+  fi
+])
+
+# This macro is obsolescent and should go away soon.
 AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
 [
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
   if test $ac_cv_type_unsigned_long_long = yes; then
     AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
       [Define if you have the 'unsigned long long' type.])
diff --git a/m4/visibility.m4 b/m4/visibility.m4
new file mode 100644
index 00000000..2ff6330a
--- /dev/null
+++ b/m4/visibility.m4
@@ -0,0 +1,52 @@
+# visibility.m4 serial 1 (gettext-0.15)
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests whether the compiler supports the command-line option
+dnl -fvisibility=hidden and the function and variable attributes
+dnl __attribute__((__visibility__("hidden"))) and
+dnl __attribute__((__visibility__("default"))).
+dnl Does *not* test for __visibility__("protected") - which has tricky
+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+dnl MacOS X.
+dnl Does *not* test for __visibility__("internal") - which has processor
+dnl dependent semantics.
+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+dnl "really only recommended for legacy code".
+dnl Set the variable CFLAG_VISIBILITY.
+dnl Defines and sets the variable HAVE_VISIBILITY.
+
+AC_DEFUN([gl_VISIBILITY],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+    AC_MSG_CHECKING([for simple visibility declarations])
+    AC_CACHE_VAL(gl_cv_cc_visibility, [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+      AC_TRY_COMPILE(
+        [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+         extern __attribute__((__visibility__("default"))) int exportedvar;
+         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+         extern __attribute__((__visibility__("default"))) int exportedfunc (void);],
+        [],
+        gl_cv_cc_visibility=yes,
+        gl_cv_cc_visibility=no)
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_visibility])
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  AC_SUBST([CFLAG_VISIBILITY])
+  AC_SUBST([HAVE_VISIBILITY])
+  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])
diff --git a/main.c b/main.c
index 847ae54e..2d036781 100644
--- a/main.c
+++ b/main.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -24,7 +24,7 @@
  */
 
 /* FIX THIS BEFORE EVERY RELEASE: */
-#define UPDATE_YEAR	2005
+#define UPDATE_YEAR	2007
 
 #include "awk.h"
 #include "getopt.h"
@@ -139,8 +139,9 @@ int do_dump_vars = FALSE;	/* dump all global variables at end */
 int do_tidy_mem = FALSE;	/* release vars when done */
 
 int in_begin_rule = FALSE;	/* we're in a BEGIN rule */
-int in_end_rule = FALSE;	/* we're in a END rule */
+int in_end_rule = FALSE;	/* we're in an END rule */
 int whiny_users = FALSE;	/* do things that whiny users want */
+int use_lc_numeric = FALSE;	/* obey locale for decimal point */
 #ifdef MBS_SUPPORT
 int gawk_mb_cur_max;		/* MB_CUR_MAX value, see comment in main() */
 #else
@@ -162,7 +163,7 @@ NODE *expression_value;
 #if _MSC_VER == 510
 void (*lintfunc) P((va_list va_alist, ...)) = warning;
 #else
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 void (*lintfunc) P((const char *mesg, ...)) = warning;
 #else
 void (*lintfunc) () = warning;
@@ -191,7 +192,8 @@ static const struct option optab[] = {
 	{ "usage",		no_argument,		NULL,		'u' },
 	{ "help",		no_argument,		NULL,		'u' },
 	{ "exec",		required_argument,	NULL,		'S' },
-#ifdef GAWKDEBUG
+	{ "use-lc-numeric",	no_argument,		& use_lc_numeric, 1 },
+#if defined(YYDEBUG) || defined(GAWKDEBUG)
 	{ "parsedebug",		no_argument,		NULL,		'D' },
 #endif
 	{ NULL, 0, NULL, '\0' }
@@ -227,10 +229,12 @@ main(int argc, char **argv)
 		whiny_users = TRUE;
 
 #ifdef HAVE_MCHECK_H
+#ifdef HAVE_MTRACE
 	if (do_tidy_mem)
 		mtrace();
+#endif /* HAVE_MTRACE */
 #endif /* HAVE_MCHECK_H */
-	
+
 #if defined(LC_CTYPE)
 	setlocale(LC_CTYPE, "");
 #endif
@@ -246,7 +250,16 @@ main(int argc, char **argv)
 	 * point is used for parsing source code and for command-line
 	 * assignments and the locale value for processing input,
 	 * number to string conversion, and printing output.
+	 *
+	 * 10/2005 --- see below also; we now only use the locale's
+	 * decimal point if do_posix in effect.
+	 *
+	 * 9/2007:
+	 * This is a mess. We need to get the locale's numeric info for
+	 * the thousands separator for the %'d flag.
 	 */
+	setlocale(LC_NUMERIC, "");
+	loc = *localeconv();	/* Make a local copy of locale numeric info, early on */
 	setlocale(LC_NUMERIC, "C");
 #endif
 #if defined(LC_TIME)
@@ -413,7 +426,7 @@ main(int argc, char **argv)
 			break;
 
 		case 'D':
-#ifdef GAWKDEBUG
+#if defined(YYDEBUG) || defined(GAWKDEBUG)
 			yydebug = 2;
 			break;
 #endif
@@ -468,6 +481,7 @@ out:
 	}
 
 	if (do_posix) {
+		use_lc_numeric = TRUE;
 		if (do_traditional)	/* both on command line */
 			warning(_("`--posix' overrides `--traditional'"));
 		else
@@ -577,12 +591,23 @@ out:
 	init_profiling_signals();
 
 #if defined(LC_NUMERIC)
-	/* See comment above. */
-	setlocale(LC_NUMERIC, "");
-#endif
-
-#if defined(HAVE_LOCALE_H)
-	loc = *localeconv();	/* Make a local copy of locale numeric info */
+	/*
+	 * See comment above about using locale's decimal point.
+	 *
+	 * 10/2005:
+	 * Bitter experience teaches us that most people the world over
+	 * use period as the decimal point, not whatever their locale
+	 * uses.  Thus, only use the locale's decimal point if being
+	 * posixly anal-retentive.
+	 *
+	 * 7/2007:
+	 * Be a little bit kinder. Allow the --use-lc-numeric option
+	 * to also use the local decimal point. This avoids the draconian
+	 * strictness of POSIX mode if someone just wants to parse their
+	 * data using the local decimal point.
+	 */
+	if (use_lc_numeric)
+		setlocale(LC_NUMERIC, "");
 #endif
 
 	/* Whew. Finally, run the program. */
@@ -696,10 +721,16 @@ usage(int exitval, FILE *fp)
 	fputs(_("\t-W source=program-text\t--source=program-text\n"), fp);
 	fputs(_("\t-W traditional\t\t--traditional\n"), fp);
 	fputs(_("\t-W usage\t\t--usage\n"), fp);
+	fputs(_("\t-W use-lc-numeric\t--use-lc-numeric\n"), fp);
 	fputs(_("\t-W version\t\t--version\n"), fp);
 
 
 	/* This is one string to make things easier on translators. */
+	/* TRANSLATORS: --help output 5 (end)
+	   TRANSLATORS: the placeholder indicates the bug-reporting address
+	   for this application.  Please add _another line_ with the
+	   address for translation bugs.
+	   no-wrap */
 	fputs(_("\nTo report bugs, see node `Bugs' in `gawk.info', which is\n\
 section `Reporting Problems and Bugs' in the printed version.\n\n"), fp);
 
@@ -732,7 +763,7 @@ copyleft()
 \n\
 This program is free software; you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
-the Free Software Foundation; either version 2 of the License, or\n\
+the Free Software Foundation; either version 3 of the License, or\n\
 (at your option) any later version.\n\
 \n");
 	static const char blurb_part2[] =
@@ -742,9 +773,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
 GNU General Public License for more details.\n\
 \n");
 	static const char blurb_part3[] =
+/*
 	  N_("You should have received a copy of the GNU General Public License\n\
 along with this program; if not, write to the Free Software\n\
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n");
+*/
+	  N_("You should have received a copy of the GNU General Public License\n\
+along with this program. If not, see http://www.gnu.org/licenses/.\n");
  
 	/* multiple blurbs are needed for some brain dead compilers. */
 	printf(_(blurb_part1), UPDATE_YEAR);	/* Last update year */
@@ -910,9 +945,16 @@ load_environ()
 	 * Put AWKPATH into ENVIRON if it's not there.
 	 * This allows querying it from within awk programs.
 	 */
-	if (getenv("AWKPATH") == NULL) {
+	if (! in_array(ENVIRON_node, tmp_string("AWKPATH", 7))) {
+		/*
+		 * On VMS, environ[] only holds a subset of what getenv() can
+		 * find, so look AWKPATH up before resorting to default path.
+		 */
+		val = getenv("AWKPATH");
+		if (val == NULL)
+			val = defpath;
 		aptr = assoc_lookup(ENVIRON_node, tmp_string("AWKPATH", 7), FALSE);
-		*aptr = make_string(defpath, strlen(defpath));
+		*aptr = make_string(val, strlen(val));
 	}
 #endif /* TANDEM */
 	return ENVIRON_node;
@@ -1048,9 +1090,14 @@ arg_assign(char *arg, int initing)
 		it = make_str_node(cp, strlen(cp), SCAN);
 		it->flags |= MAYBE_NUM;
 #ifdef LC_NUMERIC
-		setlocale(LC_NUMERIC, "C");
+		/*
+		 * See comment above about locale decimal point.
+		 */
+		if (do_posix)
+			setlocale(LC_NUMERIC, "C");
 		(void) force_number(it);
-		setlocale(LC_NUMERIC, "");
+		if (do_posix)
+			setlocale(LC_NUMERIC, "");
 #endif /* LC_NUMERIC */
 		var = variable(arg, FALSE, Node_var);
 		lhs = get_lhs(var, &after_assign, FALSE);
@@ -1060,7 +1107,8 @@ arg_assign(char *arg, int initing)
 			(*after_assign)();
 	}
 
-	*--cp = '=';	/* restore original text of ARGV */
+	if (! initing)
+		*--cp = '=';	/* restore original text of ARGV */
 
 	return ! badvar;
 }
diff --git a/mbsupport.h b/mbsupport.h
index 941db32f..c3a6b333 100644
--- a/mbsupport.h
+++ b/mbsupport.h
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/missing b/missing
index feec7f08..1c8ff704 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-02-08.22
+scriptversion=2006-05-10.23
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@ if test $# -eq 0; then
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@ fi
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,14 +290,23 @@ WARNING: \`$1' is $msg.  You should only need it if
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 
@@ -314,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog
index 72c2f71e..261df786 100644
--- a/missing_d/ChangeLog
+++ b/missing_d/ChangeLog
@@ -1,3 +1,65 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Sun Oct 14 19:37:33 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* snprintf.c (safe_tmpfile): If have `atexit', add call to a function
+	that closes the open fp and unlinks the file.  Needed mainly for
+	PC which can't do Unix-style unlink-after-open.
+
+Tue Oct  2 22:12:13 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* snprintf.c (safe_tmpfile): Add use of TMPDIR and TEMP environment
+	variables for systems that may not have a /tmp.  For MS systems
+	do unlink at close. Thanks to Eli Zaretskii and Scott Deifik
+	for motivating me to do the right thing.
+
+Fri Apr 13 06:05:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* getaddrinfo.c: Add test for HAVE_SOCKETS with error message
+	if not. Thanks to Pat Rankin.
+
+Sun Apr  8 16:15:27 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* getaddrinfo.c: Add include of <netinet/in.h>, and <arpa/inet.h>.
+
+Fri Apr  6 13:23:04 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* memmove.c.BSD, strncasecmp.c.BSD: Removed so that they won't make
+	their way into a tarball; these were the original versions from BSD
+	that were in use until the Savannah CVS archive went into place; see
+	the entry from August 25, 2006.
+
+Thu Apr  5 17:01:15 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* sprintf.c (snprintf): Fix typo and call vsnprintf
+	instead of calling self recursively. Thanks to Pat Rankin.
+
+Tue Feb 27 20:58:01 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* snprintf.c: Change names from gawk_xxx to real xxx.
+
+Mon Jan 15 14:34:30 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* getaddrinfo.h, getaddrinfo.c: New files, based on
+	submission by Jan Pazdziora <jpazdziora@redhat.com>.
+
+Fri Sep 15 15:05:09 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* strncasecmp.c, memmove.c: Corrected the FSF's address.
+
+Fri Aug 25 13:21:57 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* README: New file.
+	* strncasecmp.c, memmove.c: Replaced with versions
+	from GLIBC, hacked unmercifully to work standalone.
+
+Fri Oct 21 11:18:10 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* strtod.c (gawk_strtod): Made check for locale's decimal
+	point conditional also upon do_posix.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/missing_d/README b/missing_d/README
new file mode 100644
index 00000000..735889d8
--- /dev/null
+++ b/missing_d/README
@@ -0,0 +1,14 @@
+Fri Aug 25 13:23:06 IDT 2006
+============================
+
+The files memmove.c, mktime.c, snprintf.c, strerror.c, strftime.c,
+strncasecmp.c, and system.c are copyright by the Free Software
+Foundation. They are licensed under the GPL or the LGPL. See the
+COPYING.LIB file in this directory and the COPYING file in the parent
+directory for licensing information.
+
+All other files are public domain.
+
+Arnold Robbins
+arnold@skeeve.com
+
diff --git a/missing_d/getaddrinfo.c b/missing_d/getaddrinfo.c
new file mode 100644
index 00000000..677f27d0
--- /dev/null
+++ b/missing_d/getaddrinfo.c
@@ -0,0 +1,112 @@
+#ifndef HAVE_SOCKETS
+#error getaddrinfo.c included by mistake! no socket support!
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#include "getaddrinfo.h"
+
+void
+freeaddrinfo(struct addrinfo *res)
+{
+	if (res->ai_addr != NULL)
+		free(res->ai_addr);
+	free(res);
+}
+
+int
+getaddrinfo(const char *hostname, const char *portname,
+	struct addrinfo *hints, struct addrinfo **res)
+{
+	struct addrinfo *out;
+	if (res == NULL)
+		return -1;
+
+	out = (struct addrinfo *) malloc(sizeof(*out));
+	if (out == NULL) {
+		*res = NULL;
+		return -1;
+	}
+	memset(out, '\0', sizeof(*out));
+
+	out->ai_addr = (struct sockaddr *) malloc(sizeof(struct sockaddr_in));
+	if (out->ai_addr == NULL) {
+		free(out);
+		*res = NULL;
+		return -1;
+	}
+
+	out->ai_socktype = SOCK_STREAM;
+	if (hints != NULL) {
+		if (hints->ai_socktype)
+			out->ai_socktype = hints->ai_socktype;
+		if (hints->ai_protocol)
+			out->ai_protocol = hints->ai_protocol;
+	}
+
+	if (out->ai_protocol == 0) {
+		switch (out->ai_socktype) {
+		case SOCK_STREAM:
+			out->ai_protocol = IPPROTO_TCP;
+			break;
+		case SOCK_DGRAM:
+			out->ai_protocol = IPPROTO_UDP;
+			break;
+		case SOCK_RAW:
+			out->ai_protocol = IPPROTO_RAW;
+			break;
+		}
+	}
+
+	out->ai_addrlen = sizeof(struct sockaddr_in);
+	memset(out->ai_addr, '\0', sizeof(struct sockaddr_in));
+
+	if (hostname != NULL) {
+		struct hostent *he;
+		he = gethostbyname(hostname);
+		if (he != NULL && he->h_addr_list != NULL) {
+			((struct sockaddr_in *)out->ai_addr)->sin_addr.s_addr
+				= ((struct in_addr *)he->h_addr_list[0])->s_addr;
+		} else {
+			freeaddrinfo(out);
+			return -1;
+		}
+	} else {
+		if (!(out->ai_flags & AI_PASSIVE))
+			((struct sockaddr_in *)out->ai_addr)->sin_addr.s_addr
+							= htonl(INADDR_ANY);
+	}
+	((struct sockaddr_in *)out->ai_addr)->sin_family = AF_INET;
+	out->ai_family = AF_INET;
+
+	if (portname != NULL && *portname) {
+		long portnum;
+		char *end;
+		portnum = strtol(portname, &end, 10);
+		if (*end == '\0' && portnum > 0 && portnum < 65536) {
+			((struct sockaddr_in *)out->ai_addr)->sin_port
+							= htons(portnum);
+		} else {
+			struct servent *se;
+			se = getservbyname(portname, NULL);
+			if (se != NULL) {
+				((struct sockaddr_in *)out->ai_addr)->sin_port
+							= se->s_port;
+			}
+		}
+	}
+
+	*res = out;
+
+	return 0;
+}
+#endif
diff --git a/missing_d/getaddrinfo.h b/missing_d/getaddrinfo.h
new file mode 100644
index 00000000..2d369213
--- /dev/null
+++ b/missing_d/getaddrinfo.h
@@ -0,0 +1,26 @@
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG 0
+#endif /* AI_ADDRCONFIG */
+#ifndef AI_PASSIVE
+#define AI_PASSIVE 1
+#endif /* AI_PASSIVE */
+
+#define addrinfo xaddrinfo
+#define freeaddrinfo xfreeaddrinfo
+#define getaddrinfo xgetaddrinfo
+
+struct addrinfo
+{
+	int ai_flags;
+	int ai_socktype;
+	int ai_family;
+	int ai_protocol;
+	socklen_t ai_addrlen;
+	struct sockaddr * ai_addr;
+	struct xaddrinfo * ai_next;
+};
+
+void freeaddrinfo(struct xaddrinfo * res);
+
+int getaddrinfo(const char * hostname, const char * portname,
+	struct xaddrinfo * hints, struct xaddrinfo ** res);
diff --git a/missing_d/memmove.c b/missing_d/memmove.c
index 928b812e..a28a32d1 100644
--- a/missing_d/memmove.c
+++ b/missing_d/memmove.c
@@ -1,149 +1,139 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
+/* Copy memory to memory until the specified number of bytes
+   has been copied.  Overlap is handled correctly.
+   Copyright (C) 1991, 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Torbjorn Granlund (tege@sics.se).
 
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bcopy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-#include <sys/cdefs.h>
-#include <string.h>
-#endif
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA  02110-1301  USA */
 
 /*
- * sizeof(word) MUST BE A POWER OF TWO
- * SO THAT wmask BELOW IS ALL ONES
+ * August 2006. For Gawk: Borrowed from GLIBC and hacked unmercifully.
+ * DON'T steal this for your own code, got straight to the GLIBC
+ * source for the original versions.
  */
-typedef	int word;		/* "word" used for optimal copy speed */
 
-#define	wsize	sizeof(word)
-#define	wmask	(wsize - 1)
 
-/* ADR: 1/2004. For gawk, we need memmove(). */
-#define MEMMOVE 1
+/* This stuff from libc/sysdeps/generic/memcopy.h */
+typedef unsigned char byte;
+
+/* Copy exactly NBYTES bytes from SRC_BP to DST_BP,
+   without any assumptions about alignment of the pointers.  */
+#define BYTE_COPY_FWD(dst_bp, src_bp, nbytes)				      \
+  do									      \
+    {									      \
+      size_t __nbytes = (nbytes);					      \
+      while (__nbytes > 0)						      \
+	{								      \
+	  byte __x = ((byte *) src_bp)[0];				      \
+	  src_bp += 1;							      \
+	  __nbytes -= 1;						      \
+	  ((byte *) dst_bp)[0] = __x;					      \
+	  dst_bp += 1;							      \
+	}								      \
+    } while (0)
+
+/* Copy exactly NBYTES_TO_COPY bytes from SRC_END_PTR to DST_END_PTR,
+   beginning at the bytes right before the pointers and continuing towards
+   smaller addresses.  Don't assume anything about alignment of the
+   pointers.  */
+#define BYTE_COPY_BWD(dst_ep, src_ep, nbytes)				      \
+  do									      \
+    {									      \
+      size_t __nbytes = (nbytes);					      \
+      while (__nbytes > 0)						      \
+	{								      \
+	  byte __x;							      \
+	  src_ep -= 1;							      \
+	  __x = ((byte *) src_ep)[0];					      \
+	  dst_ep -= 1;							      \
+	  __nbytes -= 1;						      \
+	  ((byte *) dst_ep)[0] = __x;					      \
+	}								      \
+    } while (0)
+
+/* end of stuff from memcopy.h */
 
-/*
- * Copy a block of memory, handling overlap.
- * This is the routine that actually implements
- * (the portable versions of) bcopy, memcpy, and memmove.
- */
-#ifdef MEMCOPY
-void *
-memcpy(dst0, src0, length)
-#else
-#ifdef MEMMOVE
 void *
-memmove(dst0, src0, length)
-#else
-void
-bcopy(src0, dst0, length)
-#endif
-#endif
-	void *dst0;
-	const void *src0;
-	register size_t length;
+memmove (dest, src, len)
+     void *dest;
+     const void *src;
+     size_t len;
 {
-	register char *dst = dst0;
-	register const char *src = src0;
-	register size_t t;
-
-	if (length == 0 || dst == src)		/* nothing to do */
-		goto done;
-
-	/*
-	 * Macros: loop-t-times; and loop-t-times, t>0
-	 */
-#define	TLOOP(s) if (t) TLOOP1(s)
-#define	TLOOP1(s) do { s; } while (--t)
-
-	if ((unsigned long)dst < (unsigned long)src) {
-		/*
-		 * Copy forward.
-		 */
-		t = (int)src;	/* only need low bits */
-		if ((t | (int)dst) & wmask) {
-			/*
-			 * Try to align operands.  This cannot be done
-			 * unless the low bits match.
-			 */
-			if ((t ^ (int)dst) & wmask || length < wsize)
-				t = length;
-			else
-				t = wsize - (t & wmask);
-			length -= t;
-			TLOOP1(*dst++ = *src++);
-		}
-		/*
-		 * Copy whole words, then mop up any trailing bytes.
-		 */
-		t = length / wsize;
-		TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-		t = length & wmask;
-		TLOOP(*dst++ = *src++);
-	} else {
-		/*
-		 * Copy backwards.  Otherwise essentially the same.
-		 * Alignment works as before, except that it takes
-		 * (t&wmask) bytes to align, not wsize-(t&wmask).
-		 */
-		src += length;
-		dst += length;
-		t = (int)src;
-		if ((t | (int)dst) & wmask) {
-			if ((t ^ (int)dst) & wmask || length <= wsize)
-				t = length;
-			else
-				t &= wmask;
-			length -= t;
-			TLOOP1(*--dst = *--src);
-		}
-		t = length / wsize;
-		TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
-		t = length & wmask;
-		TLOOP(*--dst = *--src);
+  unsigned long int dstp = (long int) dest;
+  unsigned long int srcp = (long int) src;
+
+  /* This test makes the forward copying code be used whenever possible.
+     Reduces the working set.  */
+  if (dstp - srcp >= len)	/* *Unsigned* compare!  */
+    {
+      /* Copy from the beginning to the end.  */
+#if 0 /* screw all this */
+      /* If there not too few bytes to copy, use word copy.  */
+      if (len >= OP_T_THRES)
+	{
+	  /* Copy just a few bytes to make DSTP aligned.  */
+	  len -= (-dstp) % OPSIZ;
+	  BYTE_COPY_FWD (dstp, srcp, (-dstp) % OPSIZ);
+
+	  /* Copy whole pages from SRCP to DSTP by virtual address
+	     manipulation, as much as possible.  */
+
+	  PAGE_COPY_FWD_MAYBE (dstp, srcp, len, len);
+
+	  /* Copy from SRCP to DSTP taking advantage of the known
+	     alignment of DSTP.  Number of bytes remaining is put
+	     in the third argument, i.e. in LEN.  This number may
+	     vary from machine to machine.  */
+
+	  WORD_COPY_FWD (dstp, srcp, len, len);
+
+	  /* Fall out and copy the tail.  */
+	}
+
+      /* There are just a few bytes to copy.  Use byte memory operations.  */
+#endif
+      BYTE_COPY_FWD (dstp, srcp, len);
+    }
+  else
+    {
+      /* Copy from the end to the beginning.  */
+      srcp += len;
+      dstp += len;
+
+#if 0 /* ditto */
+      /* If there not too few bytes to copy, use word copy.  */
+      if (len >= OP_T_THRES)
+	{
+	  /* Copy just a few bytes to make DSTP aligned.  */
+	  len -= dstp % OPSIZ;
+	  BYTE_COPY_BWD (dstp, srcp, dstp % OPSIZ);
+
+	  /* Copy from SRCP to DSTP taking advantage of the known
+	     alignment of DSTP.  Number of bytes remaining is put
+	     in the third argument, i.e. in LEN.  This number may
+	     vary from machine to machine.  */
+
+	  WORD_COPY_BWD (dstp, srcp, len, len);
+
+	  /* Fall out and copy the tail.  */
 	}
-done:
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	return (dst0);
-#else
-	return;
 #endif
+      /* There are just a few bytes to copy.  Use byte memory operations.  */
+      BYTE_COPY_BWD (dstp, srcp, len);
+    }
+
+  return (dest);
 }
-#undef	wsize
-#undef	wmask
-#undef MEMMOVE
-#undef	TLOOP
-#undef	TLOOP1
diff --git a/missing_d/mktime.c b/missing_d/mktime.c
index 217dfafb..d394ef17 100644
--- a/missing_d/mktime.c
+++ b/missing_d/mktime.c
@@ -4,7 +4,7 @@
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
+   published by the Free Software Foundation; either version 3 of the
    License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
diff --git a/missing_d/snprintf.c b/missing_d/snprintf.c
new file mode 100644
index 00000000..df7f1da7
--- /dev/null
+++ b/missing_d/snprintf.c
@@ -0,0 +1,197 @@
+/*
+ * snprintf.c - Implement snprintf and vsnprintf on platforms that need them.
+ */
+
+/* 
+ * Copyright (C) 2006, 2007 the Free Software Foundation, Inc.
+ * 
+ * This file is part of GAWK, the GNU implementation of the
+ * AWK Programming Language.
+ * 
+ * GAWK is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * GAWK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+
+/* If using in a multi-threaded context, then SNPRINTF_REENTRANT must be
+   defined.   But in that case, performance will be much worse, since a
+   temporary file is created and closed for each call to snprintf. */
+
+#if defined(HAVE_MKSTEMP)
+/* If mkstemp is available, use it instead of tmpfile(), since some older
+   implementations of tmpfile() were not secure. */
+
+static char *tmpfilename = NULL;
+static FILE *safe_f = NULL;
+
+#ifdef HAVE_ATEXIT
+static void close_safe_f()
+{
+	if (safe_f != NULL) {
+		fclose(safe_f);
+		safe_f = NULL;
+	}
+	if (tmpfilename != NULL) {
+		unlink(tmpfilename);
+		free(tmpfilename);
+		tmpfilename = NULL;
+	}
+}
+#endif
+
+static FILE *
+safe_tmpfile (void)
+{
+	static short first = TRUE;
+	static const char template[] = "snprintfXXXXXX";
+	int fd;
+	static char *tmpdir = NULL;
+	static int len = 0;
+
+	if (first) {
+		first = FALSE;
+		/*
+		 * First try Unix stanadard env var, then Windows var,
+		 * then fall back to /tmp.
+		 */
+		if ((tmpdir = getenv("TMPDIR")) != NULL && *tmpdir != '\0')
+			;	/* got it */
+		else if ((tmpdir = getenv("TEMP")) != NULL && *tmpdir != '\0')
+			;	/* got it */
+		else
+			tmpdir = "/tmp";
+
+		len = strlen(tmpdir) + 1 + strlen(template) + 1;
+#ifdef HAVE_ATEXIT
+		atexit(close_safe_f);
+#endif /* HAVE_ATEXIT */
+	}
+
+	if ((tmpfilename = (char *) malloc(len)) == NULL)
+		return NULL;
+	else
+		sprintf(tmpfilename, "%s/%s", tmpdir, template);
+
+	if ((fd = mkstemp (tmpfilename)) < 0)
+		return NULL;
+
+#if ! defined(DJGPP) && ! defined(MSDOS) && ! defined(_MSC_VER) \
+	&& ! defined(_WIN32) && ! defined(__CRTRSXNT__) && ! defined(__EMX__) \
+	&& ! defined(__MINGW32__) && ! defined(__WIN32__)
+	/* If not MS, unlink after opening. */
+	unlink (tmpfilename);
+	free(tmpfilename);
+	tmpfilename = NULL;
+#endif
+
+	if ((safe_f = fdopen (fd, "w+b")) == NULL) {
+		close (fd);
+		return NULL;
+	}
+	/* setvbuf(f,NULL,_IOFBF,4*BUFSIZ); */
+	return safe_f;
+}
+
+#elif defined(HAVE_TMPFILE)
+#define safe_tmpfile tmpfile
+#else
+#error Neither mkstemp() nor tmpfile() is available on this platform.
+#endif
+
+int
+vsnprintf (char *restrict buf, size_t len,
+		const char *restrict fmt, va_list args)
+{
+	int actual;
+	int nread;
+	size_t cnt = 0;
+#ifndef SNPRINTF_REENTRANT
+	static
+#endif
+	FILE *fp;
+
+	if ((buf == NULL) || (len < 1))
+		return -1;
+
+	buf[0] = '\0';	/* in case the caller does not check the return code! */
+
+#ifdef SNPRINTF_REENTRANT
+	if ((fp = safe_tmpfile ()) == NULL)
+		return -1;
+#else
+	if ((fp == NULL) && ((fp = safe_tmpfile ()) == NULL))
+		return -1;
+	rewind (fp);
+#endif
+	actual = vfprintf (fp, fmt, args);
+	rewind (fp);
+	if (actual < 0) {
+#ifdef SNPRINTF_REENTRANT
+		fclose (fp);
+		if (tmpfilename != NULL) {
+			unlink(tmpfilename);
+			free(tmpfilename);
+			tmpfilename = NULL;
+		}
+#endif
+		return -1;
+	}
+	else if ((size_t) actual < len)
+		len = actual;
+	else
+		--len;
+	while (cnt < len && (nread = fread (buf + cnt, 1, len - cnt, fp)) > 0)
+		cnt += nread;
+	buf[cnt] = '\0';
+#ifdef SNPRINTF_REENTRANT
+	fclose (fp);
+	if (tmpfilename != NULL) {
+		unlink(tmpfilename);
+		free(tmpfilename);
+		tmpfilename = NULL;
+	}
+#endif
+	if (cnt < len)
+		return -1;
+
+	return actual;
+}
+
+int
+#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+snprintf (char *restrict buf, size_t len, const char *restrict fmt, ...)
+#else
+snprintf (va_alist)
+     va_dcl
+#endif
+{
+	int rv;
+	va_list args;
+
+#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+	va_start (args, fmt);
+#else
+	char *buf;
+	size_t len;
+	char *fmt;
+
+	va_start (args);
+	buf = va_arg (args, char *);
+	len = va_arg (args, size_t);
+	fmt = va_arg (args, char *);
+#endif
+	rv = vsnprintf (buf, len, fmt, args);
+	va_end (args);
+	return rv;
+}
diff --git a/missing_d/snprintf.c.save b/missing_d/snprintf.c.save
new file mode 100644
index 00000000..9f59e73e
--- /dev/null
+++ b/missing_d/snprintf.c.save
@@ -0,0 +1,136 @@
+/*
+ * snprintf.c - Implement snprintf and vsnprintf on platforms that need them.
+ */
+
+/* 
+ * Copyright (C) 2006 the Free Software Foundation, Inc.
+ * 
+ * This file is part of GAWK, the GNU implementation of the
+ * AWK Programming Language.
+ * 
+ * GAWK is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * GAWK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+
+/* If using in a multi-threaded context, then SNPRINTF_REENTRANT must be
+   defined.   But in that case, performance will be much worse, since a
+   temporary file is created and closed for each call to snprintf. */
+
+#if defined(HAVE_MKSTEMP)
+/* If mkstemp is available, use it instead of tmpfile(), since some older
+   implementations of tmpfile() were not secure. */
+
+static FILE *
+safe_tmpfile (void)
+{
+	static const char template[] = "/tmp/snprintfXXXXXX";
+	FILE *f;
+	int fd;
+	char t[sizeof (template)];
+
+	strcpy (t, template);
+	if ((fd = mkstemp (t)) < 0)
+		return NULL;
+	unlink (t);
+	if ((f = fdopen (fd, "w+b")) == NULL) {
+		close (fd);
+		return NULL;
+	}
+	/* setvbuf(f,NULL,_IOFBF,4*BUFSIZ); */
+	return f;
+}
+
+#elif defined(HAVE_TMPFILE)
+#define safe_tmpfile tmpfile
+#else
+#error Neither mkstemp() nor tmpfile() is available on this platform.
+#endif
+
+int
+vsnprintf (char *restrict buf, size_t len,
+		const char *restrict fmt, va_list args)
+{
+	int actual;
+	int nread;
+	size_t cnt = 0;
+#ifndef SNPRINTF_REENTRANT
+	static
+#endif
+	FILE *fp;
+
+	if ((buf == NULL) || (len < 1))
+		return -1;
+
+	buf[0] = '\0';	/* in case the caller does not check the return code! */
+
+#ifdef SNPRINTF_REENTRANT
+	if ((fp = safe_tmpfile ()) == NULL)
+		return -1;
+#else
+	if ((fp == NULL) && ((fp = safe_tmpfile ()) == NULL))
+		return -1;
+	rewind (fp);
+#endif
+	actual = vfprintf (fp, fmt, args);
+	rewind (fp);
+	if (actual < 0) {
+#ifdef SNPRINTF_REENTRANT
+		fclose (fp);
+#endif
+		return -1;
+	}
+	else if ((size_t) actual < len)
+		len = actual;
+	else
+		--len;
+	while (cnt < len && (nread = fread (buf + cnt, 1, len - cnt, fp)) > 0)
+		cnt += nread;
+	buf[cnt] = '\0';
+#ifdef SNPRINTF_REENTRANT
+	fclose (fp);
+#endif
+	if (cnt < len)
+		return -1;
+
+	return actual;
+}
+
+int
+#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+snprintf (char *restrict buf, size_t len, const char *restrict fmt, ...)
+#else
+snprintf (va_alist)
+     va_dcl
+#endif
+{
+	int rv;
+	va_list args;
+
+#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+	va_start (args, fmt);
+#else
+	char *buf;
+	size_t len;
+	char *fmt;
+
+	va_start (args);
+	buf = va_arg (args, char *);
+	len = va_arg (args, size_t);
+	fmt = va_arg (args, char *);
+#endif
+	rv = vsnprintf (buf, len, fmt, args);
+	va_end (args);
+	return rv;
+}
diff --git a/missing_d/strncasecmp.c b/missing_d/strncasecmp.c
index 9d17c648..74872356 100644
--- a/missing_d/strncasecmp.c
+++ b/missing_d/strncasecmp.c
@@ -1,102 +1,97 @@
-/*
- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
+/* Copyright (C) 1991,1992,1995,1996,1997,2001,2002, 2004
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA  02110-1301  USA */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcasecmp.c	5.6 (Berkeley) 6/27/88";
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef atarist
-#include <sys/types.h>
-#else
-#define u_char unsigned char
-#endif
-
-/* This rather ugly macro is for VMS C */
-#ifdef C
-#undef C
-#endif
-#define C(c) ((u_char)c)  
 /*
- * This array is designed for mapping upper and lower case letter
- * together for a case independent comparison.  The mappings are
- * based upon ascii character sequences.
+ * August 2006. For Gawk: Borrowed from GLIBC to replace BSD licensed version.
+ * DON'T steal this for your own code, just go to the GLIBC sources.
+ * This version hacked unmercifully.
  */
-static u_char charmap[] = {
-	'\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-	'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-	'\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-	'\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-	'\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-	'\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-	'\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-	'\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-	'\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-	'\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-	'\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-	'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-	C('\200'), C('\201'), C('\202'), C('\203'), C('\204'), C('\205'), C('\206'), C('\207'),
-	C('\210'), C('\211'), C('\212'), C('\213'), C('\214'), C('\215'), C('\216'), C('\217'),
-	C('\220'), C('\221'), C('\222'), C('\223'), C('\224'), C('\225'), C('\226'), C('\227'),
-	C('\230'), C('\231'), C('\232'), C('\233'), C('\234'), C('\235'), C('\236'), C('\237'),
-	C('\240'), C('\241'), C('\242'), C('\243'), C('\244'), C('\245'), C('\246'), C('\247'),
-	C('\250'), C('\251'), C('\252'), C('\253'), C('\254'), C('\255'), C('\256'), C('\257'),
-	C('\260'), C('\261'), C('\262'), C('\263'), C('\264'), C('\265'), C('\266'), C('\267'),
-	C('\270'), C('\271'), C('\272'), C('\273'), C('\274'), C('\275'), C('\276'), C('\277'),
-	C('\340'), C('\341'), C('\342'), C('\343'), C('\344'), C('\345'), C('\346'), C('\347'),
-	C('\350'), C('\351'), C('\352'), C('\353'), C('\354'), C('\355'), C('\356'), C('\357'),
-	C('\360'), C('\361'), C('\362'), C('\363'), C('\364'), C('\365'), C('\366'), C('\327'),
-	C('\370'), C('\371'), C('\372'), C('\373'), C('\374'), C('\375'), C('\376'), C('\337'),
-	C('\340'), C('\341'), C('\342'), C('\343'), C('\344'), C('\345'), C('\346'), C('\347'),
-	C('\350'), C('\351'), C('\352'), C('\353'), C('\354'), C('\355'), C('\356'), C('\357'),
-	C('\360'), C('\361'), C('\362'), C('\363'), C('\364'), C('\365'), C('\366'), C('\367'),
-	C('\370'), C('\371'), C('\372'), C('\373'), C('\374'), C('\375'), C('\376'), C('\377'),
-};
-
-#undef C
 
+
+/* Compare S1 and S2, ignoring case, returning less than, equal to or
+   greater than zero if S1 is lexicographically less than,
+   equal to or greater than S2.  */
 int
-strcasecmp(s1, s2)
-	const char *s1, *s2;
+strcasecmp (s1, s2)
+     const char *s1;
+     const char *s2;
 {
-	register u_char	*cm = charmap,
-			*us1 = (u_char *)s1,
-			*us2 = (u_char *)s2;
-
-	while (cm[*us1] == cm[*us2++])
-		if (*us1++ == '\0')
-			return(0);
-	return(cm[*us1] - cm[*--us2]);
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
+  int result;
+
+  if (p1 == p2)
+    return 0;
+
+  while ((result = tolower (*p1) - tolower (*p2++)) == 0)
+    if (*p1++ == '\0')
+      break;
+
+  return result;
 }
 
+/* Compare at most N characters of two strings without taking care for
+   the case.
+   Copyright (C) 1992, 1996, 1997, 2001, 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ * August 2006, for gawk, same comment applies. See strncase.c
+ * in the GLIBC sources.
+ */
+
+
+/* Compare no more than N characters of S1 and S2,
+   ignoring case, returning less than, equal to or
+   greater than zero if S1 is lexicographically less
+   than, equal to or greater than S2.  */
 int
-strncasecmp(s1, s2, n)
-	const char *s1, *s2;
-	register size_t n;
+strncasecmp (s1, s2, n)
+     const char *s1;
+     const char *s2;
+     size_t n;
 {
-	register u_char	*cm = charmap,
-			*us1 = (u_char *)s1,
-			*us2 = (u_char *)s2;
-
-	while ((long)(--n) >= 0 && cm[*us1] == cm[*us2++])
-		if (*us1++ == '\0')
-			return(0);
-	return((long)n < 0 ? 0 : cm[*us1] - cm[*--us2]);
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
+  int result;
+
+  if (p1 == p2 || n == 0)
+    return 0;
+
+  while ((result = tolower (*p1) - tolower (*p2++)) == 0)
+    if (*p1++ == '\0' || --n == 0)
+      break;
+
+  return result;
 }
diff --git a/missing_d/strtod.c b/missing_d/strtod.c
index 5ebc8c6e..c4f9d2bd 100644
--- a/missing_d/strtod.c
+++ b/missing_d/strtod.c
@@ -70,7 +70,7 @@ register const char **ptr;
 
 	if (
 #if defined(HAVE_LOCALE_H)
-	loc.decimal_point != NULL
+	loc.decimal_point != NULL && do_posix
 			? *s == loc.decimal_point[0]
 			: *s == '.'
 #else
diff --git a/mkinstalldirs b/mkinstalldirs
index 6fbe5e11..ef7e16fd 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2004-02-15.20
+scriptversion=2006-05-11.19
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -11,8 +11,11 @@ scriptversion=2004-02-15.20
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+IFS=" ""	$nl"
 errstatus=0
-dirmode=""
+dirmode=
 
 usage="\
 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -27,7 +30,7 @@ while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
       echo "$usage"
-      exit 0
+      exit $?
       ;;
     -m)                         # -m PERM arg
       shift
@@ -37,7 +40,7 @@ while test $# -gt 0 ; do
       ;;
     --version)
       echo "$0 $scriptversion"
-      exit 0
+      exit $?
       ;;
     --)                         # stop option processing
       shift
@@ -103,13 +106,21 @@ esac
 
 for file
 do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
   shift
+  IFS=$oIFS
 
-  pathcomp=
   for d
   do
-    pathcomp="$pathcomp$d"
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
@@ -124,7 +135,7 @@ do
       else
 	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-	  lasterr=""
+	  lasterr=
 	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
 	  if test ! -z "$lasterr"; then
@@ -134,7 +145,7 @@ do
       fi
     fi
 
-    pathcomp="$pathcomp/"
+    pathcomp=$pathcomp/
   done
 done
 
diff --git a/msg.c b/msg.c
index 1584f910..b6b42e07 100644
--- a/msg.c
+++ b/msg.c
@@ -76,7 +76,7 @@ err(const char *s, const char *emsg, va_list argp)
  */
 
 void
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
   msg(const char *mesg, ...)
 #else
 /*VARARGS0*/
@@ -85,7 +85,7 @@ void
 #endif
 {
 	va_list args;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 	va_start(args, mesg);
 #else
 	char *mesg;
@@ -100,7 +100,7 @@ void
 /* warning --- print a warning message */
 
 void
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
   warning(const char *mesg, ...)
 #else
 /*VARARGS0*/
@@ -109,7 +109,7 @@ void
 #endif
 {
 	va_list args;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 	va_start(args, mesg);
 #else
 	char *mesg;
@@ -122,7 +122,7 @@ void
 }
 
 void
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
   error(const char *mesg, ...)
 #else
 /*VARARGS0*/
@@ -131,7 +131,7 @@ void
 #endif
 {
 	va_list args;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 	va_start(args, mesg);
 #else
 	char *mesg;
@@ -158,7 +158,7 @@ set_loc(const char *file, int line)
 /* fatal --- print an error message and die */
 
 void
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
   r_fatal(const char *mesg, ...)
 #else
 /*VARARGS0*/
@@ -167,7 +167,7 @@ void
 #endif
 {
 	va_list args;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#ifdef CAN_USE_STDARG_H
 	va_start(args, mesg);
 #else
 	char *mesg;
diff --git a/node.c b/node.c
index b49a1506..0a7be425 100644
--- a/node.c
+++ b/node.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2001, 2003-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2001, 2003-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -24,6 +24,10 @@
  */
 
 #include "awk.h"
+#include "math.h"
+
+static int is_ieee_magic_val P((const char *val));
+static AWKNUM get_ieee_magic_val P((const char *val));
 
 /* r_force_number --- force a value to be numeric */
 
@@ -61,16 +65,42 @@ r_force_number(register NODE *n)
 	}
 
 	cp = n->stptr;
-	if (ISALPHA(*cp)) {
-		if (0 && do_lint)
-			lintwarn(_("can't convert string to float"));
-		return 0.0;
+	/*
+	 * 2/2007:
+	 * POSIX, by way of severe language lawyering, seems to
+	 * allow things like "inf" and "nan" to mean something.
+	 * So if do_posix, the user gets what he deserves.
+	 * This also allows hexadecimal floating point. Ugh.
+	 */
+	if (! do_posix) {
+		if (ISALPHA(*cp)) {
+			if (0 && do_lint)
+				lintwarn(_("can't convert string to float"));
+			return 0.0;
+		} else if (n->stlen == 4 && is_ieee_magic_val(n->stptr)) {
+			if (n->flags & MAYBE_NUM)
+				n->flags &= ~MAYBE_NUM;
+			n->flags |= NUMBER|NUMCUR;
+			n->numbr = get_ieee_magic_val(n->stptr);
+
+			return n->numbr;
+		}
+		/* else
+			fall through */
 	}
+	/* else not POSIX, so
+		fall through */
 
 	cpend = cp + n->stlen;
 	while (cp < cpend && ISSPACE(*cp))
 		cp++;
-	if (cp == cpend || ISALPHA(*cp)) {
+
+	/* FIXME: Simplify this condition! */
+	if (   cp == cpend
+	    || (! do_posix
+	        && (ISALPHA(*cp)
+		    || (! do_non_decimal_data && cp[0] == '0'
+		        && (cp[1] == 'x' || cp[1] == 'X'))))) {
 		if (0 && do_lint)
 			lintwarn(_("can't convert string to float"));
 		return 0.0;
@@ -81,6 +111,7 @@ r_force_number(register NODE *n)
 		n->flags &= ~MAYBE_NUM;
 	} else
 		newflags = 0;
+
 	if (cpend - cp == 1) {
 		if (ISDIGIT(*cp)) {
 			n->numbr = (AWKNUM)(*cp - '0');
@@ -91,11 +122,12 @@ r_force_number(register NODE *n)
 		return n->numbr;
 	}
 
-	if (do_non_decimal_data) {
+	if (do_non_decimal_data) {	/* main.c assures false if do_posix */
 		errno = 0;
 		if (! do_traditional && isnondecimal(cp, TRUE)) {
 			n->numbr = nondec2awknum(cp, cpend - cp);
 			n->flags |= NUMCUR;
+			ptr = cpend;
 			goto finish;
 		}
 	}
@@ -123,35 +155,19 @@ finish:
 	return n->numbr;
 }
 
-/*
- * the following lookup table is used as an optimization in force_string
- * (more complicated) variations on this theme didn't seem to pay off, but 
- * systematic testing might be in order at some point
- */
-static const char *const values[] = {
-	"0",
-	"1",
-	"2",
-	"3",
-	"4",
-	"5",
-	"6",
-	"7",
-	"8",
-	"9",
-};
-#define	NVAL	(sizeof(values)/sizeof(values[0]))
 
 /* format_val --- format a numeric value based on format */
 
 NODE *
 format_val(const char *format, int index, register NODE *s)
 {
-	char buf[BUFSIZ];
-	register char *sp = buf;
 	double val;
 	char *orig, *trans, save;
 
+	NODE *dummy, *r;
+	unsigned short oflags;
+	extern NODE **fmt_list;          /* declared in eval.c */
+
 	if (! do_traditional && (s->flags & INTLSTR) != 0) {
 		save = s->stptr[s->stlen];
 		s->stptr[s->stlen] = '\0';
@@ -163,68 +179,41 @@ format_val(const char *format, int index, register NODE *s)
 		return tmp_string(trans, strlen(trans));
 	}
 
-	/* not an integral value, or out of range */
-	if ((val = double_to_int(s->numbr)) != s->numbr
-	    || val < LONG_MIN || val > LONG_MAX) {
-		/*
-		 * Once upon a time, if GFMT_WORKAROUND wasn't defined,
-		 * we just blindly did this:
-		 *	sprintf(sp, format, s->numbr);
-		 *	s->stlen = strlen(sp);
-		 *	s->stfmt = (char) index;
-		 * but that's no good if, e.g., OFMT is %s. So we punt,
-		 * and just always format the value ourselves.
-		 */
-
-		NODE *dummy, *r;
-		unsigned short oflags;
-		extern NODE **fmt_list;          /* declared in eval.c */
-
-		/* create dummy node for a sole use of format_tree */
-		getnode(dummy);
-		dummy->type = Node_expression_list;
-		dummy->lnode = s;
-		dummy->rnode = NULL;
-		oflags = s->flags;
-		s->flags |= PERM; /* prevent from freeing by format_tree() */
+	/*
+	 * 2/2007: Simplify our lives here. Instead of worrying about
+	 * whether or not the value will fit into a long just so we
+	 * can use sprintf("%ld", val) on it, always format it ourselves.
+	 * The only thing to worry about is that integral values always
+	 * format as integers. %.0f does that very well.
+	 */
+
+	val = double_to_int(s->numbr);
+
+	/* create dummy node for a sole use of format_tree */
+	getnode(dummy);
+	dummy->type = Node_expression_list;
+	dummy->lnode = s;
+	dummy->rnode = NULL;
+	oflags = s->flags;
+	s->flags |= PERM; /* prevent from freeing by format_tree() */
+	if (val == s->numbr) {
+		r = format_tree("%.0f", 4, dummy, 2);
+		s->stfmt = -1;
+	} else {
 		r = format_tree(format, fmt_list[index]->stlen, dummy, 2);
-		s->flags = oflags;
 		s->stfmt = (char) index;
-		s->stlen = r->stlen;
-		if ((s->flags & STRCUR) != 0)
-			free(s->stptr);
-		s->stptr = r->stptr;
-		freenode(r);		/* Do not free_temp(r)!  We want */
-		freenode(dummy);	/* to keep s->stptr == r->stpr.  */
-
-		goto no_malloc;
-	} else {
-		/* integral value */
-	        /* force conversion to long only once */
-		register long num = (long) val;
-		if (num < NVAL && num >= 0) {
-			sp = (char *) values[num];
-			s->stlen = 1;
-		} else {
-			(void) sprintf(sp, "%ld", num);
-			s->stlen = strlen(sp);
-		}
-		s->stfmt = -1;
 	}
-	emalloc(s->stptr, char *, s->stlen + 2, "format_val");
-	memcpy(s->stptr, sp, s->stlen+1);
-no_malloc:
+	s->flags = oflags;
+	s->stlen = r->stlen;
+	if ((s->flags & STRCUR) != 0)
+		free(s->stptr);
+	s->stptr = r->stptr;
+	freenode(r);		/* Do not free_temp(r)!  We want */
+	freenode(dummy);	/* to keep s->stptr == r->stpr.  */
+
 	s->stref = 1;
 	s->flags |= STRCUR;
-#if defined MBS_SUPPORT
-	if ((s->flags & WSTRCUR) != 0) {
-		assert(s->wstptr != NULL);
-		free(s->wstptr);
-		s->wstptr = NULL;
-		s->wstlen = 0;
-		s->flags &= ~WSTRCUR;
-	}
-#endif
+	free_wstr(s);
 	return s;
 }
 
@@ -287,8 +276,14 @@ r_dupnode(NODE *n)
 	*r = *n;
 	r->flags &= ~(PERM|TEMP|FIELD);
 	r->flags |= MALLOC;
-#if defined MBS_SUPPORT
+#ifdef MBS_SUPPORT
+	/*
+	 * DON'T call free_wstr(r) here!
+	 * r->wstptr still points at n->wstptr's value, and we
+	 * don't want to free it!
+	 */
 	r->wstptr = NULL;
+	r->wstlen = 0;
 #endif /* defined MBS_SUPPORT */
 	if (n->type == Node_val && (n->flags & STRCUR) != 0) {
 		r->stref = 1;
@@ -344,11 +339,7 @@ mk_number(AWKNUM x, unsigned int flags)
 	r->stref = 1;
 	r->stptr = NULL;
 	r->stlen = 0;
-#if defined MBS_SUPPORT
-	r->wstptr = NULL;
-	r->wstlen = 0;
-	r->flags &= ~WSTRCUR;
-#endif /* MBS_SUPPORT */
+	free_wstr(r);
 #endif /* GAWKDEBUG */
 	return r;
 }
@@ -363,10 +354,11 @@ make_str_node(char *s, unsigned long len, int flags)
 	getnode(r);
 	r->type = Node_val;
 	r->flags = (STRING|STRCUR|MALLOC);
-#if defined MBS_SUPPORT
+#ifdef MBS_SUPPORT
 	r->wstptr = NULL;
 	r->wstlen = 0;
-#endif
+#endif /* defined MBS_SUPPORT */
+
 	if (flags & ALREADY_MALLOCED)
 		r->stptr = s;
 	else {
@@ -510,20 +502,13 @@ unref(register NODE *tmp)
 				return;
 			}
 			free(tmp->stptr);
-#if defined MBS_SUPPORT
-			if (tmp->wstptr != NULL) {
-				assert((tmp->flags & WSTRCUR) != 0);
-				free(tmp->wstptr);
-			}
-			tmp->flags &= ~WSTRCUR;
-			tmp->wstptr = NULL;
-			tmp->wstlen = 0;
-#endif
+			free_wstr(tmp);
 		}
 		freenode(tmp);
 		return;
 	}
 	if ((tmp->flags & FIELD) != 0) {
+		free_wstr(tmp);
 		freenode(tmp);
 		return;
 	}
@@ -555,6 +540,16 @@ parse_escape(const char **string_ptr)
 	register int i;
 	register int count;
 
+	if (do_lint_old) {
+		switch (c) {
+		case 'b':
+		case 'f':
+		case 'r':
+			warning(_("old awk does not support the `\\%c' escape sequence"), c);
+			break;
+		}
+	}
+
 	switch (c) {
 	case 'a':
 		return BELL;
@@ -597,10 +592,10 @@ parse_escape(const char **string_ptr)
 		return i;
 	case 'x':
 		if (do_lint) {
-			static int didwarn = FALSE;
+			static short warned = FALSE;
 
-			if (! didwarn) {
-				didwarn = TRUE;
+			if (! warned) {
+				warned = TRUE;
 				lintwarn(_("POSIX does not allow `\\x' escapes"));
 			}
 		}
@@ -704,12 +699,7 @@ str2wstr(NODE *n, size_t **ptr)
 			return n;
 		/* otherwise
 			fall through and recompute to fill in the array */
-	}
-
-	if (n->wstptr != NULL) {
-		free(n->wstptr);
-		n->wstptr = NULL;
-		n->wstlen = 0;
+		free_wstr(n);
 	}
 
 	/*
@@ -749,9 +739,11 @@ str2wstr(NODE *n, size_t **ptr)
 		switch (count) {
 		case (size_t) -2:
 		case (size_t) -1:
-		case 0:
 			goto done;
 
+		case 0:
+			count = 1;
+			/* fall through */
 		default:
 			*wsp++ = wc;
 			src_count -= count;
@@ -775,7 +767,22 @@ done:
 	return n;
 }
 
-#if 0
+/* free_wstr --- release the wide string part of a node */
+
+void
+free_wstr(NODE *n)
+{
+	assert(n->type == Node_val);
+
+	if ((n->flags & WSTRCUR) != 0) {
+		assert(n->wstptr != NULL);
+		free(n->wstptr);
+	}
+	n->wstptr = NULL;
+	n->wstlen = 0;
+	n->flags &= ~WSTRCUR;
+}
+
 static void
 dump_wstr(FILE *fp, const wchar_t *str, size_t len)
 {
@@ -783,9 +790,8 @@ dump_wstr(FILE *fp, const wchar_t *str, size_t len)
 		return;
 
 	for (; len--; str++)
-		putc((int) *str, fp);
+		putwc(*str, fp);
 }
-#endif
 
 /* wstrstr --- walk haystack, looking for needle, wide char version */
 
@@ -847,3 +853,48 @@ out:	;
 	return NULL;
 }
 #endif /* defined MBS_SUPPORT */
+
+/* is_ieee_magic_val --- return true for +inf, -inf, +nan, -nan */
+
+static int
+is_ieee_magic_val(const char *val)
+{
+	/*
+	 * Avoid strncasecmp: it mishandles ASCII bytes in some locales.
+	 * Assume the length is 4, as the caller checks this.
+	 */
+	return (   (val[0] == '+' || val[0] == '-')
+		&& (   (   (val[1] == 'i' || val[1] == 'I')
+			&& (val[2] == 'n' || val[2] == 'N')
+			&& (val[3] == 'f' || val[3] == 'F'))
+		    || (   (val[1] == 'n' || val[1] == 'N')
+			&& (val[2] == 'a' || val[2] == 'A')
+			&& (val[3] == 'n' || val[3] == 'N'))));
+}
+
+/* get_ieee_magic_val --- return magic value for string */
+
+static AWKNUM
+get_ieee_magic_val(const char *val)
+{
+	static short first = TRUE;
+	static AWKNUM inf;
+	static AWKNUM nan;
+
+	char *ptr;
+	AWKNUM v = strtod(val, &ptr);
+
+	if (val == ptr) { /* Older strtod implementations don't support inf or nan. */
+		if (first) {
+			first = FALSE;
+			nan = sqrt(-1.0);
+			inf = -log(0.0);
+		}
+
+		v = ((val[1] == 'i' || val[1] == 'I') ? inf : nan);
+		if (val[0] == '-')
+			v = -v;
+	}
+
+	return v;
+}
diff --git a/pc/ChangeLog b/pc/ChangeLog
index e62fad7c..962a4cf8 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,126 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Sat Oct 20 22:42:08 2007  Scott Deifik         <scottd.mail@sbcglobal.net>
+
+	* Makefile.tst: Sync with mainline, Revise inftest.
+
+Fri Oct 19 05:37:37 2007  Scott Deifik         <scottd.mail@sbcglobal.net>
+
+	* config.h: Add definition of HAVE_ATEXIT. Needed for replacement
+	sprintf.
+
+Thu Oct  4 21:19:54 2007  Juan M. Guerrero     <juan.guerrero@gmx.de>
+
+	* Makefile.tst (fmtspcl.ok): Remove unneeded dependency on Makefile.
+
+Wed Sep 26 15:10:17 2007  Scott Deifik         <scottd.mail@sbcglobal.net>
+
+	* Makefile.tst (poundbang): Fix path in call to gawk.
+	(nofile): Fix output message with sed to match what test suite wants.
+
+Wed Sep 26 14:46:34 2007  Eli Zaretskii      <eliz@gnu.org>
+
+	* Makefile.tst (msg): Use $(CMP) instead a literal "cmp".
+	(nonl): Use NUL instead of /dev/null.
+	(devfd, pid, fmtspcl, nofile, rstest4, rstest5, getlnhd, clos1way):
+	Expect to fail on MinGW.
+	(fmtspcl.ok): Depend on Makefile, not Makefile.tst.
+	(pipeio2, hsprint, fmttest): Expect formatting or whitespace
+	differences.
+	(exitval2): Use exitval2.w32 instead of exitval2.awk.
+
+	* config.h (HAVE_DECL_TZNAME) [__MINGW32__]: Define.
+	(HAVE_ALLOCA) [__MINGW32__]: Don't define.
+	(HAVE_SNPRINTF) [__MINGW32__]: Remove _MSC_VER condition.
+
+Tue Sep 25 08:22:11 2007  KIMURA Koichi        <kimura.koichi@canon.co.jp>
+
+	* config.h: For Visual Studio, undef restrict, define HAVE_TMPFILE,
+	undef TIME_WITH_SYS_TIME.
+
+Mon May 21 05:46:46 2007  Scott Deifik         <scottd.mail@sbcglobal.net>
+
+	* config.h (HAVE_MKTIME): Define.
+
+Wed May 16 22:12:55 2007  Scott Deifik         <scottd.mail@sbcglobal.net>
+
+	* Makfile.tst: Changes for DJGPP, bring in sync with main
+	test/Makefile.
+
+Wed May  9 21:01:18 2007  Scott Deifik         <scottd.mail@sbcglobal.net>
+
+	DJGPP changes:
+
+	* config.h: Add HAVE_MKTME, HAVE_MKSTEMP, conditionalize
+	HAVE_SNPRINTF. (ADR: #define out restrict).
+	* Makefile: Add replace$0 to AWKOBJS2 and PAWKOBJS2.
+
+2007-03-19  Juan M. Guerrero  <juan.guerrero@gmx.de>
+
+	* config.h: Undef HAVE_ALLOCA for DJGPP.
+	* Makefile: Add floatcomp$O to AWKOBJS1 and PAWKOBJS1.
+
+2007-02-25  Juan M. Guerrero  <juan.guerrero@gmx.de>
+
+	* config.h: Let DEFPATH reflect DJGPP installation directory tree.
+	* Makefile: pkgdatadir variable defined to $(prefix)/lib/awk.
+	* Makefile: In DJGPP section use the DJGPP environment variable to
+	  redefine the pkgdatadir variable.
+
+2006-07-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.tst: Update copyright years.
+	(COMSPEC): If it's empty, use ComSpec instead.
+	(CMP): Ignore white space differences.
+	(BASIC_TESTS): Add concat4, nofile, ovrflow1, subi18n.
+	(GAWK_EXT_TESTS): Add binmode1, devfd1, devfd2, fwtest, nondec2.
+	(msg): Use $(CMP) instead of literal "cmp".
+	(inftest): Uncomment the test.
+	(nonl): Use NUL, so it works with any DOS/Windows shell.
+	(fsspcoln): Run `head' though the system shell.
+	(nondec2, nofile, binmode1, subi18n, concat4, devfd1, devfd2)
+	(ovrflow1, fwtest, mixed1): New tests.
+	(fmttest, hsprint, ovrflow1, posix): Run output through Sed to
+	adjust the number of leading zeros in the exponent produced by %e.
+	(longwrds): Set SORT to just "sort".
+	(exitval2): Use exitval2.w32.
+
+2006-07-01  Eli Zaretskii  <eliz@gnu.org>
+
+	* popen.h (os_popen): Declare 1st argument "const char *".
+
+	* popen.c (scriptify): Declare argument "const char *".
+	(os_system): Declare argument "const char *".  Add a new local
+	variable cmd1 to hold the results of scriptify.
+	(os_popen): Declare 1st argument "const char *".  Add a new local
+	variable cmd to hold the results of scriptify.
+
+	* Makefile (mingw32): Update definitions for CF, LF, and LF2.  Use
+	libmsvcrtp60 during linking (for multibyte and wide character
+	support).
+	(io$O): Depend on popen.h.
+
+	* config.h (HAVE_BTOWC) [_WIN32]: Define.
+	(HAVE_INTMAX_T, HAVE_UINTMAX_T, HAVE_INTTYPES_H, HAVE_STDINT_H)
+	(HAVE_INTTYPES_H_WITH_UINTMAX, HAVE_ISASCII, HAVE_ISWCTYPE)
+	(HAVE_ISWLOWER, HAVE_ISWUPPER, HAVE_LONG_LONG, HAVE_MBRLEN)
+	(HAVE_MBRTOWC, HAVE_TOWLOWER, HAVE_TOWUPPER, HAVE_WCHAR_H)
+	(HAVE_WCRTOMB, HAVE_WCSCOLL, HAVE_WCTYPE, HAVE_WCTYPE_H)
+	(HAVE_WCTYPE_T, HAVE_WINT_T) [__MINGW32__]: Define.
+	(inline) [__GNUC__]: Define to __inline__.
+	(HAVE_MEMMOVE, HAVE_PUTENV, HAVE_SETLOCALE, HAVE_LOCALE_H)
+	(HAVE_SNPRINTF, HAVE_STRTOUL, HAVE_STDLIB_H, HAVE_SYS_STAT_H)
+	(HAVE_SYS_TIME_H, HAVE_UNSIGNED_LONG_LONG) [__MINGW32__]: Define.
+	(HAVE_UNISTD_H): Define also for __MINGW32__.
+	(PACKAGE_BUGREPORT, PACKAGE_NAME, PACKAGE_STRING)
+	(PACKAGE_TARNAME, PACKAGE_VERSION): Define.
+	(VERSION): Update.
+	[__MINGW32__]: Include <limits.h>.
+	(HAVE_POPEN_H): Define as 1.
+	(ssize_t, intmax_t, uintmax_t): Don't redefine for __MINGW32__.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/pc/Makefile b/pc/Makefile
index ad14baaf..585e66ab 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -73,6 +73,7 @@ MAK = $(MAKE) $(MAKEFILE)
 # edit config.h so that $(prefix)/lib/awk appears as part of DEFPATH.
 #prefix =
 prefix = c:/gnu
+pkgdatadir = $(prefix)/lib/awk
 #
 # Define the install method. Method 1 is Unix-like (and requires cat,
 # cp, mkdir, sed, and sh); method 2 uses gawk and batch files.
@@ -106,6 +107,10 @@ DO_PBIND= $($(PBIND))
 #========================== DJGPP =======================================
 #========================================================================
 
+ifneq ($(DJGPP),)
+prefix = $(DJDIR)
+pkgdatadir = $(prefix)/share/awk
+endif
 LDJG = $(CC) $(LF) -o gawk.exe $(LDRSP) $(LF2)
 PLDJG = $(CC) $(LF) -o pgawk.exe $(PLDRSP) $(LF2)
 BDJG = stubify -g awk.exe | stubedit awk.exe runfile=gawk
@@ -185,8 +190,8 @@ PLMINGW32 = $(CC) $(LF) -o $@ $(PGAWKOBJS) $(LF2)
 
 mingw32:
 	$(MAK) all \
-	CC=gcc O=.o CF=-O OBJ=popen.o \
-	LNK=LMINGW32 PLNK=PLMINGW32 LF=-s RSP=
+	CC=gcc O=.o CF="-O2 -gdwarf-2 -g3" OBJ=popen.o \
+	LNK=LMINGW32 PLNK=PLMINGW32 LF="-gdwarf-2 -g3" LF2=-lmsvcp60 RSP=
 
 #========================================================================
 #========================== MSC =========================================
@@ -313,10 +318,10 @@ EMPTY=
 CFLAGS = $(CF) -DGAWK -I. -DHAVE_CONFIG_H $(DYN_FLAGS)
 
 # object files
-AWKOBJS1  = array$O builtin$O eval$O   field$O gawkmisc$O io$O main$O
-AWKOBJS2  = ext$O msg$O node$O profile$O re$O version$O $(DYN_OBJ)
-PAWKOBJS1 = array$O builtin$O eval_p$O field$O gawkmisc$O io$O main$O
-PAWKOBJS2 = ext$O msg$O node$O profile_p$O re$O version$O $(DYN_OBJ)
+AWKOBJS1  = array$O builtin$O eval$O field$O floatcomp$O gawkmisc$O io$O main$O
+AWKOBJS2  = ext$O msg$O node$O profile$O re$O replace$O version$O $(DYN_OBJ)
+PAWKOBJS1 = array$O builtin$O eval_p$O field$O floatcomp$O gawkmisc$O io$O main$O
+PAWKOBJS2 = ext$O msg$O node$O profile_p$O re$O replace$O version$O $(DYN_OBJ)
 AWKOBJS = $(AWKOBJS1) $(AWKOBJS2)
 
 ALLOBJS = $(AWKOBJS) awkgram$O getid$O $(OBJ)
@@ -364,6 +369,8 @@ getopt$O:	getopt.h
 
 getopt1$O:	getopt.h
 
+io$O:		popen.h
+
 gawk.exp: gawkw32.def
 	$(DYN_MAKEXP)
 
@@ -389,9 +396,9 @@ install1:
 	cat pc/awklib/igawk >> igawk.cmd
 	sed "s;igawk;$(prefix)/bin/igawk;" pc/awklib/igawk.bat > igawk.bat
 	sh mkinstal.sh $(prefix)/bin
-	sh mkinstal.sh $(prefix)/lib/awk $(prefix)/man/man1 $(prefix)/info
+	sh mkinstal.sh $(pkgdatadir) $(prefix)/man/man1 $(prefix)/info
 	cp *awk.exe igawk.bat igawk.cmd pc/awklib/igawk $(prefix)/bin
-	cp awklib/eg/lib/* pc/awklib/igawk.awk $(prefix)/lib/awk
+	cp awklib/eg/lib/* pc/awklib/igawk.awk $(pkgdatadir)
 	cp doc/*.1 $(prefix)/man/man1
 	cp doc/gawk.info $(prefix)/info
 
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 8c32dd80..b5953a12 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -1,13 +1,13 @@
 # Makefile for GNU Awk test suite.
 #
-# Copyright (C) 1988-2004 the Free Software Foundation, Inc.
+# Copyright (C) 1988-2007 the Free Software Foundation, Inc.
 # 
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 # 
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GAWK is distributed in the hope that it will be useful,
@@ -111,46 +111,50 @@ PATH_SEPARATOR = ;
 
 srcdir = .
 
-# Get rid of core files when cleaning
-CLEANFILES = core core.*
+# Get rid of core files when cleaning and generated .ok file
+CLEANFILES = core core.* fmtspcl.ok
 
 # try to keep these sorted
 BASIC_TESTS = addcomma anchgsub argarray arrayparm arrayref arrymem1 \
 	arrayprm2 arrayprm3 arryref2 arryref3 arryref4 arryref5 arynasty \
 	arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
 	aryprm8 arysubnm asgext awkpath back89 backgsub childin clobber \
-	clsflnam compare compare2 concat1 concat2 concat3 convfmt datanonl defref \
-	delarprm delarpm2 delfunc dynlj eofsplit exitval1 exitval2 fldchg fldchgnf fmttest fnamedat \
+	clsflnam compare compare2 concat1 concat2 concat3 concat4 convfmt datanonl defref \
+	delarprm delarpm2 delfunc dynlj eofsplit exitval1 exitval2 fldchg fldchgnf fmtspcl fmttest fnamedat \
 	fnarray fnarray2 fnarydel fnaryscl fnasgnm fnmisc fnparydl \
 	fordel forsimp fsbs fsspcoln fsrs fstabplus funsemnl funsmnam funstack getline \
 	getline2 getline3 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest \
-	gsubtst2 gsubtst3 gsubtst4 gsubtst5 hex hsprint inputred intest \
+	gsubtst2 gsubtst3 gsubtst4 gsubtst5 hex hsprint inputred intest intformat \
 	intprec iobug1 leaddig leadnl litoct longsub longwrds manglprm math membug1 \
-	messages minusstr mmap8k nasty nasty2 negexp nested nfldstr \
-	nfneg nfset nlfldsep nlinstr nlstrina noeffect nofmtch noloop1 \
+	messages minusstr mmap8k mtchi18n nasty nasty2 negexp nested nfldstr \
+	nfneg nfset nlfldsep nlinstr nlstrina noeffect nofile nofmtch noloop1 \
 	noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt \
-	ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf paramdup paramtyp \
-	parseme pcntplus prdupval prec printf0 printf1 prmarscl prmreuse \
+	ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf ovrflow1 paramdup paramtyp \
+	parse1 parsefld parseme pcntplus prdupval prec printf0 printf1 prmarscl prmreuse \
 	prt1eval prtoeval psx96sub rand rebt8b1 rebt8b2 redfilnm regeq \
 	reindops reparse resplit rs rsnul1nl rsnulbig rsnulbig2 rstest1 \
 	rstest2 rstest3 rstest4 rstest5 rswhite scalar sclforin sclifin \
 	sortempty splitargv splitarr splitdef splitvar splitwht sprintfc \
-	strcat1 strtod subamp subsepnm subslash substr swaplns synerr1 tradanch \
-	tweakfld uninit2 uninit3 uninit4 uninitialized unterm wjposer1 \
-	zeroe0 zeroflag
-
-UNIX_TESTS = fflush getlnhd pid pipeio1 pipeio2 poundbang space strftlng
-GAWK_EXT_TESTS = argtest asort asorti backw badargs clos1way fieldwdth fsfwfs \
-	gensub gensub2 gnuops2 gnuops3 gnureops icasefs icasers igncdym igncfs ignrcase \
-	ignrcas2 lint match1 match2 manyfiles nondec posix procinfs \
-	printfbad1 regx8bit rebuf reint rsstart1 rsstart2 rsstart3 \
-	rstest6 shadow sort1 strtonum strftime whiny
+	strcat1 strtod strnum1 subamp subi18n subsepnm subslash substr swaplns \
+	synerr1 synerr2 tradanch \
+	tweakfld uninit2 uninit3 uninit4 uninitialized unterm wideidx wideidx2 \
+	widesub widesub2 widesub3 widesub4 wjposer1 zeroe0 zeroflag zero2
+
+UNIX_TESTS = fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
+GAWK_EXT_TESTS = argtest asort asorti backw badargs binmode1 clos1way devfd devfd1 devfd2 double1 double2 \
+	fieldwdth fsfwfs fwtest fwtest2 gensub gensub2 gnuops2 gnuops3 gnureops icasefs \
+	icasers igncdym igncfs ignrcase ignrcas2 lint lintold match1 match2 manyfiles \
+	nondec nondec2 posix procinfs printfbad1 regx8bit rebuf reint reint2 rsstart1 \
+	rsstart2 rsstart3 rstest6 shadow sort1 strtonum strftime whiny
 
 EXTRA_TESTS = regtest inftest
 INET_TESTS = inetechu inetecht inetdayu inetdayt
 
 # List of the tests which should be run with --lint option:
-NEED_LINT = defref noeffect nofmtch shadow uninit2 uninit3 uninit4 uninitialized
+NEED_LINT = defref fmtspcl noeffect nofmtch shadow uninit2 uninit3 uninit4 uninitialized
+
+# List of the tests which should be run with --lint-old option:
+NEED_LINT_OLD = lintold
 
 # List of the files that appear in manual tests or are for reserve testing:
 GENTESTS_UNUSED = Makefile.in gtlnbufv.awk printfloat.awk switch2.awk
@@ -177,11 +181,11 @@ extra:	$(EXTRA_TESTS) inetmesg
 inet:	inetmesg $(INET_TESTS)
 
 msg::
-	@echo ''
-	@echo 'Any output from "cmp" is bad news, although some differences'
-	@echo 'in floating point values are probably benign -- in particular,'
-	@echo 'some systems may omit a leading zero and the floating point'
-	@echo 'precision may lead to slightly different output in a few cases.'
+	@echo ""
+	@echo "Any output from $(CMP) is bad news, although some differences"
+	@echo "in floating point values are probably benign -- in particular,"
+	@echo "some systems may omit a leading zero and the floating point"
+	@echo "precision may lead to slightly different output in a few cases."
 
 printlang::
 	@$(AWK) -f $(srcdir)/printlang.awk
@@ -216,7 +220,7 @@ poundbang::
 	@if ./_pbd.awk $(srcdir)/poundbang.awk > _`basename $@` ; \
 	then : ; \
 	else \
-		sed "s;/tmp/gawk;../$(AWKPROG);" < $(srcdir)/poundbang.awk > ./_pbd.awk ; \
+		sed "s;/tmp/gawk;./$(AWKPROG);" < $(srcdir)/poundbang.awk > ./_pbd.awk ; \
 		chmod +x ./_pbd.awk ; \
 		LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} ./_pbd.awk $(srcdir)/poundbang.awk > _`basename $@`;  \
 	fi
@@ -244,7 +248,7 @@ regtest::
 	@echo 'Some of the output from regtest is very system specific, do not'
 	@echo 'be distressed if your output differs from that distributed.'
 	@echo 'Manual inspection is called for.'
-	AWK=`pwd`/$(AWK) $(srcdir)/regtest.sh
+	AWK=$(AWKPROG) $(srcdir)/regtest.sh
 
 manyfiles::
 	@echo manyfiles
@@ -263,10 +267,10 @@ compare::
 inftest::
 	@echo $@
 	@echo This test is very machine specific...
-	@echo This sometimes seems to cause problems for MSC gawk, so do not
-	@echo run it.
-#	@$(AWK) -f $(srcdir)/inftest.awk | sed "s/inf/Inf/g" >_$@
-#	@-$(CMP) $(srcdir)/inftest.ok _$@ && rm -f _$@
+	@echo This sometimes seems to cause problems for MSC gawk.
+	@echo Expect inftest to fail with DJGPP.
+	@$(AWK) -f $(srcdir)/inftest.awk | sed "s/inf/Inf/g" >_$@
+	@-$(CMP) $(srcdir)/inftest.ok _$@ && rm -f _$@
 
 getline2::
 	@echo $@
@@ -290,7 +294,7 @@ badargs::
 
 nonl::
 	@echo $@
-	@-AWKPATH=$(srcdir) $(AWK) --lint -f nonl.awk /dev/null >_$@ 2>&1
+	@-AWKPATH=$(srcdir) $(AWK) --lint -f nonl.awk NUL >_$@ 2>&1
 	@-$(CMP) $(srcdir)/nonl.ok _$@ && rm -f _$@
 
 strftime::
@@ -310,6 +314,12 @@ litoct::
 	@echo ab | $(AWK) --traditional -f $(srcdir)/litoct.awk >_$@
 	@-$(CMP) $(srcdir)/litoct.ok _$@ && rm -f _$@
 
+devfd::
+	@echo $@
+	@echo Expect devfd to fail in MinGW
+	@$(AWK) 1 /dev/fd/4 /dev/fd/5 4<$(srcdir)/devfd.in4 5<$(srcdir)/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 fflush::
 	@echo $@
 	@$(srcdir)/fflush.sh >_$@
@@ -335,9 +345,9 @@ tradanch::
 # command so that pid.sh is fork'ed as a child before being exec'ed.
 pid::
 	@echo pid
-	@echo Expect pid to fail with DJGPP.
+	@echo Expect pid to fail with DJGPP and MinGW.
 	@AWKPATH=$(srcdir) AWK=$(AWKPROG) $(SHELL) $(srcdir)/pid.sh $$$$ > _`basename $@` ; :
-	@-$(CMP) $(srcdir)/pid.ok _`basename $@` && rm -f _`basename $@` _`basename $@`.in
+	@-$(CMP) $(srcdir)/pid.ok _`basename $@` && rm -f _`basename $@`
 
 strftlng::
 	@echo $@
@@ -352,6 +362,15 @@ nors::
 	@echo A B C D E | tr -d '\12\15' | $(AWK) '{ print $$NF }' - $(srcdir)/nors.in > _$@
 	@-$(CMP) $(srcdir)/nors.ok _$@ && rm -f _$@
 
+fmtspcl.ok: fmtspcl.tok
+	@$(AWK) -v "sd=$(srcdir)" 'BEGIN {pnan = sprintf("%g",sqrt(-1)); nnan = sprintf("%g",-sqrt(-1)); pinf = sprintf("%g",-log(0)); ninf = sprintf("%g",log(0))} {sub(/positive_nan/,pnan); sub(/negative_nan/,nnan); sub(/positive_infinity/,pinf); sub(/negative_infinity/,ninf); sub(/fmtspcl/,(sd"/fmtspcl")); print}' < $(srcdir)/fmtspcl.tok > $@ 2>/dev/null
+
+fmtspcl: fmtspcl.ok
+	@echo fmtspcl
+	@echo Expect $@ to fail with MinGW
+	@$(AWK) -f $(srcdir)/fmtspcl.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $@.ok _$@ && rm -f _$@
+
 reint::
 	@echo $@
 	@$(AWK) --re-interval -f $(srcdir)/reint.awk $(srcdir)/reint.in >_$@
@@ -359,6 +378,7 @@ reint::
 
 pipeio1::
 	@echo $@
+	@echo Expect $@ to produce insignificant whitespace differences
 	@$(AWK) -f $(srcdir)/pipeio1.awk >_$@
 	@rm -f test1 test2
 	@-$(CMP) $(srcdir)/pipeio1.ok _$@ && rm -f _$@
@@ -455,6 +475,42 @@ whiny::
 	@WHINY_USERS=1 $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+wideidx::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+wideidx2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub3::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub4::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 ignrcas2::
 	@echo $@
 	@GAWKLOCALE=en_US ; export GAWKLOCALE ; \
@@ -493,6 +549,68 @@ rsstart3::
 	@echo $@
 	@head $(srcdir)/rsstart1.in | $(AWK) -f $(srcdir)/rsstart2.awk >_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+nondec2::
+	@echo $@
+	@$(AWK) --non-decimal-data -v a=0x1 -f $(srcdir)/$@.awk >_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+nofile::
+	@echo $@
+	@$(AWK) '{}' no/such/file >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@sed "s/ (ENOENT)//" _$@ > _$@.2
+	@rm -f _$@
+#	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@.2 && rm -f _$@.2
+
+binmode1::
+	@echo $@
+	@$(AWK) -v BINMODE=3 'BEGIN { print BINMODE }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+subi18n::
+	@echo $@
+	@GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f $(srcdir)/$@.awk > _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+concat4::
+	@echo $@
+	@GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in > _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+devfd1::
+	@echo $@
+	@echo Expect devfd1 to fail in MinGW
+	@$(AWK) -f $(srcdir)/$@.awk 4< $(srcdir)/devfd.in1 5< $(srcdir)/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+# The program text is the '1' which will print each record. How compact can you get?
+devfd2::
+	@echo $@
+	@$(AWK) 1 /dev/fd/4 /dev/fd/5 4< $(srcdir)/devfd.in1 5< $(srcdir)/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+mixed1::
+	@echo $@
+	@$(AWK) -f /dev/null --source 'BEGIN {return junk}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+mtchi18n::
+	@echo $@
+	@GAWKLOCALE=ru_RU.UTF-8 ; export GAWKLOCALE ; \
+	$(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+reint2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) --re-interval -f $@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+localenl::
+	@echo $@
+	@$(srcdir)/$@.sh >_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -687,7 +805,7 @@ eofsplit:
 
 exitval2:
 	@echo exitval2
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@AWKPATH=$(srcdir) $(AWK) -f $@.w32  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 fldchg:
@@ -702,7 +820,8 @@ fldchgnf:
 
 fmttest:
 	@echo fmttest
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@echo Expect $@ to produce insignificant formatting differences
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk | sed -e "s/\([0-9]e[-+]\)0\([0-9]\)/\1\2/g" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 fnamedat:
@@ -837,7 +956,9 @@ hex:
 
 hsprint:
 	@echo hsprint
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@echo Expect hsprint to produce insignificant formatting differences
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk | sed -e "s/\([0-9]e[-+]\)0\([0-9]\)/\1\2/g" -e "s/| 1/|  1/" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+#	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 inputred:
@@ -850,6 +971,11 @@ intest:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+intformat:
+	@echo intformat
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 intprec:
 	@echo intprec
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -872,7 +998,8 @@ longsub:
 
 longwrds:
 	@echo longwrds
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk SORT=sort < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+#	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 manglprm:
@@ -1025,6 +1152,11 @@ opasnslf:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+ovrflow1:
+	@echo ovrflow1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 paramdup:
 	@echo paramdup
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1035,6 +1167,16 @@ paramtyp:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+parse1:
+	@echo parse1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+parsefld:
+	@echo parsefld
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 parseme:
 	@echo parseme
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1147,11 +1289,13 @@ rstest3:
 
 rstest4:
 	@echo rstest4
+	@echo Expect $@ to fail on DOS/Windows
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 rstest5:
 	@echo rstest5
+	@echo Expect $@ to fail on DOS/Windows
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
@@ -1221,6 +1365,11 @@ strtod:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+strnum1:
+	@echo strnum1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 subsepnm:
 	@echo subsepnm
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1246,6 +1395,11 @@ synerr1:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+synerr2:
+	@echo synerr2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 uninit2:
 	@echo uninit2
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1286,8 +1440,14 @@ zeroflag:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+zero2:
+	@echo zero2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 getlnhd:
 	@echo getlnhd
+	@echo Expect getlnhd to fail if pipe does not use a Unixy shell
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
@@ -1308,7 +1468,17 @@ backw:
 
 clos1way:
 	@echo clos1way
-	@echo Expect clos1way to fail with DJGPP.
+	@echo Expect clos1way to fail with DJGPP and MinGW.
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+double1:
+	@echo double1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+double2:
+	@echo double2
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
@@ -1322,6 +1492,16 @@ fsfwfs:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+fwtest:
+	@echo fwtest
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+fwtest2:
+	@echo fwtest2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 gensub:
 	@echo gensub
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1377,6 +1557,11 @@ lint:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+lintold:
+	@echo lintold
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint-old < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 match1:
 	@echo match1
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1394,7 +1579,7 @@ nondec:
 
 posix:
 	@echo posix
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in | sed -e "s/e+000/e+00/" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 procinfs:
@@ -1442,10 +1627,11 @@ strtonum:
 # Targets generated for other tests:
 
 $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
-	$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" *.awk *.in > $(srcdir)/Maketests
+	files=`cd "$(srcdir)" && echo *.awk *.in`; \
+	$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests
 
 clean:
-	rm -fr _* core core.* junk out1 out2 out3 strftime.ok test1 test2 seq *~
+	rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~
 
 # An attempt to print something that can be grepped for in build logs
 pass-fail:
@@ -1459,10 +1645,31 @@ pass-fail:
 diffout:
 	for i in _* ; \
 	do  \
+		if [ "$$i" != "_*" ]; then \
 		echo ============== $$i ============= ; \
+		if [ -r $${i#_}.ok ]; then \
+		diff -c $${i#_}.ok $$i ; \
+		else \
 		diff -c $(srcdir)/$${i#_}.ok  $$i ; \
+		fi ; \
+		fi ; \
 	done | more
 
+# convenient way to scan valgrind results for errors
+valgrind-scan:
+	@echo "Scanning valgrind log files for problems:"
+	@$(AWK) '\
+	function show() {if (cmd) {printf "%s: %s\n",FILENAME,cmd; cmd = ""}; \
+	  printf "\t%s\n",$$0}; \
+	{$$1 = ""}; \
+	/Prog and args are:/ {incmd = 1; cmd = ""; next}; \
+	incmd {if (NF == 1) incmd = 0; else {cmd = (cmd $$0); next}}; \
+	/ERROR SUMMARY:/ && !/: 0 errors from 0 contexts/ {show()}; \
+	/definitely lost:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	/possibly lost:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	/ suppressed:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	' log.[0-9]*
+
 # This target is for testing with electric fence.
 efence:
 	for i in $$(ls _* | sed 's;_\(.*\);\1;') ; \
diff --git a/pc/config.h b/pc/config.h
index 4f07d8a5..0ea25224 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -12,7 +12,7 @@
  *
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GAWK is distributed in the hope that it will be useful,
@@ -55,12 +55,89 @@
 /* Define if the `getpgrp' function takes no argument.  */
 #define GETPGRP_VOID 1
 
+/* Define to 1 if you have the `atexit' function. */
+# define HAVE_ATEXIT 1
+
+/* Define to 1 if you have the `btowc' function. */
+#ifdef _WIN32
+#define HAVE_BTOWC 1
+#endif
+
+#ifdef __MINGW32__
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+#define HAVE_DECL_TZNAME 1
+
+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+#define HAVE_INTMAX_T 1
+
+/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
+#define HAVE_UINTMAX_T 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+   declares uintmax_t. */
+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+#endif
+
+#ifdef __MINGW32__
+/* Define to 1 if you have the `isascii' function. */
+#define HAVE_ISASCII 1
+
+/* Define to 1 if you have the `iswctype' function. */
+#define HAVE_ISWCTYPE 1
+
+/* Define to 1 if you have the `iswlower' function. */
+#define HAVE_ISWLOWER 1
+
+/* Define to 1 if you have the `iswupper' function. */
+#define HAVE_ISWUPPER 1
+
+/* Define if you have the 'long long' type. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the `mbrlen' function. */
+#define HAVE_MBRLEN 1
+
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
+#define HAVE_MBRTOWC 1
+
+/* Define to 1 if you have the `towlower' function. */
+#define HAVE_TOWLOWER 1
+
+/* Define to 1 if you have the `towupper' function. */
+#define HAVE_TOWUPPER 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to 1 if you have the `wcrtomb' function. */
+#define HAVE_WCRTOMB 1
+
+/* Define to 1 if you have the `wcscoll' function. */
+#define HAVE_WCSCOLL 1
+
+/* Define to 1 if you have the `wctype' function. */
+#define HAVE_WCTYPE 1
+
+/* Define to 1 if you have the <wctype.h> header file. */
+#define HAVE_WCTYPE_H 1
+
+/* systems should define this type here */
+#define HAVE_WCTYPE_T 1
+
+/* systems should define this type here */
+#define HAVE_WINT_T 1
+#endif
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef gid_t */
 
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
 /* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
 /* #undef HAVE_ALLOCA_H */
 
@@ -94,6 +171,12 @@
 #define inline
 #endif
 
+#ifdef __GNUC__
+#define inline __inline__
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+#endif
+
 /* Define if on MINIX.  */
 /* #undef _MINIX */
 
@@ -139,7 +222,7 @@
 
 #define REGEX_MALLOC 1 /* use malloc instead of alloca in regex.c */
 #define SPRINTF_RET int /* return type of sprintf */
-/* #undef HAVE_MKTIME */ /* we have the mktime function */
+#define HAVE_MKTIME    /* we have the mktime function */
 /* #undef HAVE_SOCKETS */ /* we have sockets on this system */
 /* #undef HAVE_PORTALS */ /* we have portals on /p on this system */
 /* #undef DYNAMIC */  /* allow dynamic addition of builtins */
@@ -175,21 +258,45 @@
 /* Define if you have the memcpy function.  */
 #define HAVE_MEMCPY 1
 
+#ifdef __MINGW32__
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+#endif
+
 /* Define if you have the memset function.  */
 #define HAVE_MEMSET 1
 
 /* Define if you have the munmap function.  */
 /* #undef HAVE_MUNMAP */
 
+#ifdef __MINGW32__
 /* Define if you have the putenv function.  */
-/* #undef HAVE_PUTENV */
+#define HAVE_PUTENV 1
+
+/* Define if you have the setlocale function.  */
+#define HAVE_SETLOCALE 1
+
+/* Define if you have the <locale.h> header file.  */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define if you have the strcasecmp function.  */
+#define HAVE_STRCASECMP 1
+
+/* FIXME!! */
+
+/* we have sockets on this system */
+#undef HAVE_SOCKETS
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+#endif
 
 /* Define if you have the setenv function.  */
 /* #define HAVE_SETENV */
 
-/* Define if you have the setlocale function.  */
-/* #undef HAVE_SETLOCALE */
-
 /* Define if you have the stpcpy function.  */
 /* #undef HAVE_STPCPY */
 
@@ -214,6 +321,12 @@
 /* Define if you have the strtod function.  */
 #define HAVE_STRTOD 1
 
+#ifdef __MINGW32__
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+#endif
+
 /* Define if you have the system function.  */
 #define HAVE_SYSTEM 1
 
@@ -232,9 +345,6 @@
 /* Define if you have the <limits.h> header file.  */
 #define HAVE_LIMITS_H 1
 
-/* Define if you have the <locale.h> header file.  */
-/* #undef HAVE_LOCALE_H */
-
 /* Define if you have the <malloc.h> header file.  */
 /* #undef HAVE_MALLOC_H */
 
@@ -256,8 +366,19 @@
 /* Define if you have the <stdarg.h> header file.  */
 #define HAVE_STDARG_H 1
 
+#ifdef __MINGW32__
 /* Define if you have the <stdlib.h> header file.  */
-/* #undef HAVE_STDLIB_H */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define if you have the 'unsigned long long' type. */
+#define HAVE_UNSIGNED_LONG_LONG 1
+#endif
 
 /* Define if you have the <string.h> header file.  */
 #define HAVE_STRING_H 1
@@ -280,7 +401,7 @@
 #define HAVE_SYS_TYPES_H 1
 
 /* Define if you have the <unistd.h> header file.  */
-#if defined(DJGPP)
+#if defined(DJGPP) || defined(__MINGW32__)
 # define HAVE_UNISTD_H 1
 #endif
 
@@ -296,8 +417,23 @@
 /* Name of package */
 #define PACKAGE "gawk"
 
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "bug-gawk@gnu.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "GNU Awk"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "GNU Awk 3.1.5a"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "gawk"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "3.1.5a"
+
 /* Version number of package */
-#define VERSION "3.0.89"
+#define VERSION "3.1.5a"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
@@ -311,6 +447,9 @@
 /* Define to make ftello visible on some hosts (e.g. glibc 2.1.3). */
 /* #undef _XOPEN_SOURCE */
 
+/* Define to 1 if *printf supports %F format */
+/* #undef PRINTF_HAS_F_FORMAT */
+
 /* Define if compiler has function prototypes */
 #define PROTOTYPES 1
 
@@ -330,7 +469,7 @@
 /* #undef HAVE_CATGETS */
 
 /* The size of `unsigned int' & `unsigned long', as computed by sizeof. */
-#if defined(DJGPP) || defined(_MSC_VER)
+#if defined(DJGPP) || defined(_MSC_VER) || defined(__MINGW32__)
 # include <limits.h>
 #endif
 
@@ -347,7 +486,11 @@
 #endif
 
 /* Library search path */
-#define DEFPATH  ".;c:/lib/awk;c:/gnu/lib/awk"
+#if defined(__DJGPP__) && (__DJGPP__ > 2 || __DJGPP_MINOR__ >= 3)
+# define DEFPATH  ".;/dev/env/DJDIR/share/awk"
+#else
+# define DEFPATH  ".;c:/lib/awk;c:/gnu/lib/awk"
+#endif
 
 #if defined (_MSC_VER)
 #if !defined(__STDC__)
@@ -362,13 +505,13 @@
 #define altzone timezone
 #endif
 
-# define HAVE_POPEN_H
+#define HAVE_POPEN_H 1
 
 #if defined(_MSC_VER) && defined(MSDOS)
 #define system(s) os_system(s)
 #endif
 
-#if defined(_MSC_VER) || defined(__MINGW32__)
+#ifdef _MSC_VER
 #define ssize_t long int /* DJGPP has ssize_t */
 #define intmax_t long
 #define uintmax_t unsigned long
@@ -382,8 +525,11 @@
 #if defined(DJGPP)
 # define HAVE_LIMITS_H 1
 # undef HAVE_POPEN_H
+# undef HAVE_ALLOCA
+# define HAVE_MKSTEMP 1
 #define intmax_t long long
 #define uintmax_t unsigned long long
+#define restrict /* nothing */
 #endif
 
 #if defined(__WIN32__) && defined(__CRTRSXNT__)
@@ -394,6 +540,12 @@
 #if defined(WIN32) && defined(_MSC_VER)
 #define alloca _alloca
 #define system(s) os_system(s)
+/* VC++ dosen't supprt restrict keyword */
+#define restrict
+/* VC++ have tmpfile */
+#define HAVE_TMPFILE
+/* sys/time.h is not exist in VC++? */
+#undef TIME_WITH_SYS_TIME
 #endif
 
 #if defined(__MINGW32__)
diff --git a/pc/dlfcn.c b/pc/dlfcn.c
index accfa8ef..f2394c63 100644
--- a/pc/dlfcn.c
+++ b/pc/dlfcn.c
@@ -10,7 +10,7 @@
  * 

  * GAWK is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

+ * the Free Software Foundation; either version 3 of the License, or

  * (at your option) any later version.

  * 

  * GAWK is distributed in the hope that it will be useful,

diff --git a/pc/dlfcn.h b/pc/dlfcn.h
index f2149055..bb7366bc 100644
--- a/pc/dlfcn.h
+++ b/pc/dlfcn.h
@@ -10,7 +10,7 @@
  * 

  * GAWK is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

+ * the Free Software Foundation; either version 3 of the License, or

  * (at your option) any later version.

  * 

  * GAWK is distributed in the hope that it will be useful,

diff --git a/pc/gawkmisc.pc b/pc/gawkmisc.pc
index 5164edb1..48d4bc3c 100644
--- a/pc/gawkmisc.pc
+++ b/pc/gawkmisc.pc
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/pc/popen.c b/pc/popen.c
index 77cedc15..287b0b9b 100644
--- a/pc/popen.c
+++ b/pc/popen.c
@@ -71,7 +71,7 @@ slashify(char *p, char *s)
 }
 
 static char *
-scriptify(char *command)
+scriptify(const char *command)
 {
   FILE *fp;
   char *cmd, *name, *s, *p;
@@ -119,22 +119,23 @@ unlink_and_free(char *cmd)
 }
 
 int
-os_system(char *cmd)
+os_system(const char *cmd)
 {
   char *s;
   int i;
+  char *cmd1;
 
 #if defined(OS2)
   if (_osmode == OS2_MODE)
     return(system(cmd));
 #endif
 
-  if ((cmd = scriptify(cmd)) == NULL) return(1);
+  if ((cmd1 = scriptify(cmd)) == NULL) return(1);
   if (s = getenv("SHELL"))
-    i = spawnlp(P_WAIT, s, s, cmd + strlen(s), NULL);
+    i = spawnlp(P_WAIT, s, s, cmd1 + strlen(s), NULL);
   else
-    i = system(cmd);
-  unlink_and_free(cmd);
+    i = system(cmd1);
+  unlink_and_free(cmd1);
   return(i);
 }
 #else
@@ -143,12 +144,15 @@ os_system(char *cmd)
 
 
 FILE *
-os_popen( char *command, char *mode )
+os_popen(const char *command, char *mode )
 {
     FILE *current;
     char *name;
     int cur;
     char curmode[4];
+#if defined(__MINGW32__) || (defined(_MSC_VER) && defined(WIN32))
+    char *cmd;
+#endif
     
 #if defined(OS2) && (_MSC_VER != 510)
     if (_osmode == OS2_MODE)
@@ -160,10 +164,10 @@ os_popen( char *command, char *mode )
     strncpy(curmode, mode, 3); curmode[3] = '\0';
 
 #if defined(__MINGW32__) || (defined(_MSC_VER) && defined(WIN32))
-    current = popen(command = scriptify(command), mode);
+    current = popen(cmd = scriptify(command), mode);
     cur = fileno(current);
     strcpy(pipes[cur].pmode, curmode);
-    pipes[cur].command = command;
+    pipes[cur].command = cmd;
     return(current);
 #endif
 
diff --git a/pc/popen.h b/pc/popen.h
index cc5d7cc3..0ec5756b 100644
--- a/pc/popen.h
+++ b/pc/popen.h
@@ -15,7 +15,7 @@
 #  endif
 #  define popen(c, m)	os_popen(c, m)
 #  define pclose(f)	os_pclose(f)
-   extern FILE *os_popen( char *, const char * );
+   extern FILE *os_popen( const char *, const char * );
    extern int  os_pclose( FILE * );
 # endif
 #endif
diff --git a/po/ChangeLog b/po/ChangeLog
index cf83ebb3..96616216 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,16 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Mon Sep 10 12:41:34 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* All .po files: Updated to GPL 3.
+
+2007-01-08  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.16.1.
+	* Makevar.template: New file, copied in from gettext-0.16.1.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/po/LINGUAS b/po/LINGUAS
index 64e24192..3f47fcaf 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -15,3 +15,4 @@ nl
 rw
 ga
 vi
+zh_CN
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 1f5cc285..5022b8b1 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -8,7 +8,7 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.14.4
+# Origin: gettext-0.16
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -23,18 +23,38 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
@@ -158,7 +178,7 @@ install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  for file in $(DISTFILES.common) Makevars.template; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -171,13 +191,13 @@ install-data: install-data-@USE_NLS@
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -217,19 +237,19 @@ installdirs: installdirs-exec installdirs-data
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
 installdirs-data-no:
 installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -374,8 +394,7 @@ update-gmo: Makefile $(GMOFILES)
 
 Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
 
 force:
 
diff --git a/po/ca.gmo b/po/ca.gmo
index 5bdbdd2a..ccb60f9c 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index c196a2ac..0c3ed601 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.31\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2003-05-07 21:13+0100\n"
 "Last-Translator: Antoni Bella Perez <bella5@teleline.es>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -35,359 +35,374 @@ msgstr "s'ha intentat usar la dada escalar «%s» com a una matriu"
 msgid "from %s"
 msgstr "%s (de %s)"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "referència a un element sense valor inicial «%s[\"%s\"]»"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "el subscript de la matriu «%s» és una cadena nul·la"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: l'índex «%s» no està en la matriu «%s»"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: buit (nul)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: buit (zero)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: mida_taula = %d, mida_matriu = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, fuzzy, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: és un paràmetre\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: ref_matriu a %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, fuzzy, c-format
 msgid "%s blocks must have an action part"
 msgstr "Els blocs FINAL han de tindre una part d'acció"
 
-#: awkgram.y:211
+#: awkgram.y:218
 #, fuzzy
 msgid "each rule must have a pattern or an action part"
 msgstr "Els blocs FINAL han de tindre una part d'acció"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "l'antic awk no suporta l'operador «**=»"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "«%s» és una funció interna, no pot ser redefinida"
 
-#: awkgram.y:313
+#: awkgram.y:328
 #, fuzzy
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "la constant d'expressió regular «/%s/» sembla un comentari en C, perà no ho "
 "és"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "la constant d'expressió regular «/%s/» sembla un comentari en C, perà no ho "
 "és"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "la declaració podria no tindre efecte"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, fuzzy, c-format
 msgid "`%s' used in %s action"
 msgstr "«next» és usat dintre de l'acció BEGIN o END"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "«nextfile» és una extensió de gawk"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "«return» és usat fora del context d'una funció"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "el «print» simple en la regla BEGIN o END probablement ha de ser «print \"\"»"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "«delete array» és una extensió de gawk"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 #, fuzzy
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "«delete array» és una extensió de gawk"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "les canonades bidireccionals multi-etapes no funcionen"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "expressió regular a la dreta d'una assignació"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "expressió regular a l'esquerra de l'operador «~» o «!~»"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "l'antic awk no suporta l'operador «**=»"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "expressió regular a la derta de la comparació"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "«getline» no redirigit sense definir dintre de l'acció FINAL"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "l'antic awk no suporta l'operador «**=»"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "la crida de «length» sense parèntesis no és portable"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "la crida de «length» sense parèntesis està desaprovada per POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr ""
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "expressió de subscript no vàlida"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 #, fuzzy
 msgid "unexpected newline or end of string"
 msgstr "nova línia inesperada"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "el text del programa en la línia de comandaments està buit"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "no es pot obrir el fitxer font «%s» per a lectura (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "no es pot llegir el fitxer font «%s» (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "el fitxer font «%s» està buit"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "el fitxer font no finalitza amb un retorn de carro"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "expressió regular sense finalitzar acaba amb «\\» al final del fitxer"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "expressió regular sense finalitzar"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "expressió regular sense finalitzar al final del fitxer"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "l'ús de «\\ #...» com a continuació de línia no és portable"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "la barra invertida no és l'últim caràcter en la línia"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX no permet l'operador «**=»"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "l'antic awk no suporta l'operador «**=»"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX no permet l'operador «**»"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "l'antic awk no suporta l'operador «**=»"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "l'operador «^=» no està suportat en l'antic awk"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "l'operador «^» no està suportat en l'antic awk"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "cadena sense finalitzar"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "caràcter «%c» no vàlid en l'expressió"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "«%s» és una extensió de gawk"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "«%s» és una extensió de Bell Labs"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX no permet «%s»"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "«%s» no està suportat en l'antic awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "«goto» se considera nefast!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d no és vàlid com a nombre d'arguments per a %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: el tercer argument és una extensió de gawk"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: la cadena literal com a últim argument de substitució no té efecte"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, fuzzy, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "sub: el tercer argument no és un objecte intercanviable"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: el segon argument és una extensió de gawk"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "l'ús de dcgettext(_\"...\") no és correcte: elimineu el guió baix inicial"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 #, fuzzy
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "l'ús de dcgettext(_\"...\") no és correcte: elimineu el guió baix inicial"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funció «%s»: paràmetre #%d, «%s», duplica al paràmetre #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funció «%s»: paràmetre «%s» ofusca la variable global"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "no es pot obrir «%s» per a escriptura (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "enviant el perfil a l'eixida d'error estàndard"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: tancament erroni (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() crida dos vegades!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr ""
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funció «%s»: no pot usar el nom de la funció com a paràmetre"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "nom de la funció «%s» definida prèviament"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "es crida a la funció «%s» però no s'ha definit"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "es defineix la funció «%s» però no s'ha cridat mai"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "l'expressió regular constant per al paràmetre #%d condueix a un valor booleà"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, fuzzy, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -396,202 +411,202 @@ msgstr ""
 "s'ha cridat a la funció «%s» amb espai entre el nom i el «(»,\n"
 "%s"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s a \"%s\" ha fallat (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "eixida estàndard"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "motiu desconegut"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: s'ha rebut un argument que no és un número"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: l'argument %g està fora de rang"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: no es pot netejar: la canonada «%s» s'ha obert per a lectura, no per "
 "a escriptura"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: no es pot netejar: el fitxer «%s» s'ha obert per a lectura, no per a "
 "escriptura"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: «%s» no és un fitxer obert, canonada o co-procés"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "índex: el primer argument rebut no és una cadena"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "índex: el segon argument rebut no és una cadena"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: s'ha rebut un argument no numèric"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "«delete array» és una extensió de gawk"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: s'ha rebut un argument no numèric"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: s'ha rebut l'argument negatiu %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr ""
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "no es permeten «$» en els formats awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "el compte d'arguments amb «$» ha de ser > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, fuzzy, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "el comte d'arguments %d és major que el nombre total d'arguments "
 "proporcionats"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "no es permet «$» després d'un punt en el format"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "no es proporciona «$» per a l'ample o precisió del camp de posició"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "«l» manca de significat en els formats awk; serà ignorat"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "«l» no està permés en els formats POSIX de awk"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "«L» manca de significat en els formats awk; serà ignorat"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "«L» no està permés en els formats POSIX de awk"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "«h» manca de significat en els formats awk; serà ignorat"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "«h» no està permés en els formats POSIX de awk"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "no hi ha prou arguments per a satisfer el format d'una cadena"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ desbordament per a aquest"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: l'especificador de format no conté lletra de control"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "s'han proporcionat masses arguments per a la cadena de format"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: sense arguments"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: s'ha rebut un argument no numèric"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: cridat amb l'argument negatiu %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: l'índex d'inici %g no és vàlid, usant 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: l'índex d'inici no enter %g serà truncat"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: la longitud %g és <= 0"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: la longitud %g és <= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: la longitud sobre un nombre no enter %g serà truncada"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: la cadena font és de longitud zero"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, fuzzy, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: l'índex d'inici %d sobrepassa l'acabament de la cadena"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, fuzzy, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -599,196 +614,196 @@ msgstr ""
 "substr: la longitud %d a l'índex d'inici %d excedeix la longitud del 1er "
 "argument (%d)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 #, fuzzy
 msgid "strftime: received non-string first argument"
 msgstr "strftime: el primer argument rebut no és una cadena"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: s'ha rebut una cadena de format buida"
 
-#: builtin.c:1493
+#: builtin.c:1573
 #, fuzzy
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: el segon argument rebut no és numèric"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:1601
+#: builtin.c:1695
 #, fuzzy
 msgid "system: received non-string argument"
 msgstr "system: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, fuzzy, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referència a una variable sense inicialitzar «%s»"
 
-#: builtin.c:1827
+#: builtin.c:1921
 #, fuzzy
 msgid "tolower: received non-string argument"
 msgstr "tolower: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:1857
+#: builtin.c:1951
 #, fuzzy
 msgid "toupper: received non-string argument"
 msgstr "toupper: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: el primer argument rebut no és numèric"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: el segon argument rebut no és numèric"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: s'ha rebut un argument que no és numèric"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: s'ha rebut un argument que no és numèric"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: s'ha rebut un argument que no és numèric"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: el tercer argument no és una matriu"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: el tercer argument de 0 és tractat com a 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: el primer argument rebut no és numèric"
 
-#: builtin.c:2717
+#: builtin.c:2768
 #, fuzzy
 msgid "lshift: received non-numeric second argument"
 msgstr "strftime: el segon argument rebut no és numèric"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): els valors negatius donaran resultats estranys"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): els valors fraccionaris sernn truncats"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "lshift(%lf, %lf): un valor de desplaçament massa gran donarà resultats "
 "estranys"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: el primer argument rebut no és numèric"
 
-#: builtin.c:2755
+#: builtin.c:2806
 #, fuzzy
 msgid "rshift: received non-numeric second argument"
 msgstr "strftime: el segon argument rebut no és numèric"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): els valors negatius donaran resultats estranys"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): els valors fraccionaris seran truncats"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "rshift(%lf, %lf): un valor de desplaçament massa gran donarà resultats "
 "estranys"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: el primer argument rebut no és numèric"
 
-#: builtin.c:2793
+#: builtin.c:2844
 #, fuzzy
 msgid "and: received non-numeric second argument"
 msgstr "atan2: el segon argument rebut no és numèric"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): els valors negatius donaran resultats estranys"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): els valors fraccionaris seran truncats"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: el primer argument rebut no és numèric"
 
-#: builtin.c:2829
+#: builtin.c:2880
 #, fuzzy
 msgid "or: received non-numeric second argument"
 msgstr "atan2: el segon argument rebut no és numèric"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): els valors negatius donaran resultats estranys"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): els valors fraccionaris seran truncats"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: el primer argument rebut no és numèric"
 
-#: builtin.c:2865
+#: builtin.c:2916
 #, fuzzy
 msgid "xor: received non-numeric second argument"
 msgstr "atan2: el segon argument rebut no és numèric"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): els valors negatius donaran resultats estranys"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): els valors fraccionaris seran truncats"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: s'ha rebut un argument que no és numèric"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): el valor negatiu donarà resultats estranys"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): el valor fraccionari serà truncat"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: «%s» no és una categoria local vàlida"
@@ -802,7 +817,7 @@ msgstr "tipo de node %d desconegut"
 msgid "buffer overflow in genflags2str"
 msgstr "desbordament del cau temporal en genflags2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "s'ha intentat usar la matriu «%s» en un context escalar"
@@ -850,7 +865,7 @@ msgstr "«nextfile» no es pot cridar des d'una regla FINAL"
 msgid "statement has no effect"
 msgstr "la sentència no té efecte"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "no es pot usar el nom de la funció «%s» com a variable o matriu"
@@ -860,7 +875,7 @@ msgstr "no es pot usar el nom de la funció «%s» com a variable o matriu"
 msgid "reference to uninitialized argument `%s'"
 msgstr "referència a un argument sense inicialitzar «%s»"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referència a una variable sense inicialitzar «%s»"
@@ -873,44 +888,44 @@ msgstr ""
 "concatenació: els efectes colaterals en una expressió han canviat la "
 "longitud d'una altra!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "assignació usada en un context condicional"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "s'ha intentat una divisió per zero"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "s'ha intentat una divisió per zero en «%%»"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "tipus il·legal (%s) en tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "s'ha intentat una divisió per zero en «/=»"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "s'ha intentat una divisió per zero en «%%=»"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "s'ha cridat a la funció «%s» amb més arguments dels declarats"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "la funció «%s» no està definida"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -921,673 +936,687 @@ msgstr ""
 "\t# Pila de Crides a les Funcions:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- principal --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "s'ha intentat una referència de camp a partir d'un valor no numèric"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "s'ha intentat una referència a partir d'una cadena nul·la"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "s'ha intentat accedir al camp %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr ""
 "no es permet l'assignació per a obtindre un resultat d'una funció interna"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "«IGNORECASE» és una extensió de gawk"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "«BINMODE» és una extensió de gawk"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "«%sFMT» especificació errònia «%s»"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "desactivant «--lint» degut a una assignació a «LINT»"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "«extension» és una extensió gawk"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: no es pot obrir «%s» (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: biblioteca «%s»: no es pot cridar a la funció «%s» (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:107
+#: ext.c:110
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: biblioteca «%s»: no es pot cridar a la funció «%s» (%s)\n"
 
-#: ext.c:113
+#: ext.c:116
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: no es pot obrir «%s» (%s)\n"
 
-#: ext.c:117
+#: ext.c:120
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "la funció «%s» no està definida"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:124
+#: ext.c:127
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "nom de la funció «%s» definida prèviament"
 
-#: ext.c:201
+#: ext.c:204
 #, fuzzy, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "es defineix la funció «%s» però no s'ha cridat mai"
 
-#: ext.c:204
+#: ext.c:207
 #, fuzzy, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "la funció «%s» no està definida"
 
-#: ext.c:214
+#: ext.c:217
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "s'ha intentat usar la dada escalar «%s» com a una matriu"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Operació No Suportada"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF s'inicialitza sobre un valor negatiu"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: el segon argument no és una matriu"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: la cadena nul·la per al tercer argument és una extensió de gawk"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "«FIELDWIDTHS» és una extensió de gawk"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "la cadena nul·la per a «FS» és una extensió de gawk"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "l'antic awk no suporta l'operador «**=»"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: l'opció «%s» és ambigua\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: l'opció «--%s» no admet cap argument\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'opció «%c%s» no admet cap argument\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'opció «%s» requereix un argument\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: no es reconeix l'opció «--%s»\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: no es reconeix l'opció «%c%s»\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opció il·legal -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opció no vàlida -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: l'opció requereix un argument -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'opció «-W %s» és ambigua\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opció «-W %s» no admet cap argument\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "no es pot obrir el fitxer «%s» per a lectura (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "la finalització del descriptor fd %d («%s») ha fallat  (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "tipus d'arbre %s no vàlid dintre de redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "l'expressió en la redirecció «%s» solt té un valor numèric"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "l'expressió per a la redirecció «%s» té un valor de cadena nul·la"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "el fitxer «%s» per a la redirecció «%s» pot ser resultat d'una expressió "
 "lògica"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mescla innecessària de «>» i «>>» per al fitxer «%.*s»"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "no es pot obrir la canonada «%s» per a l'eixida (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "no es pot obrir la canonada «%s» per a l'entrada (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "el fitxer «%s» és un directori"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr ""
 "no es pot obrir un socket bidireccional «%s» per a les entrades/eixides (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "no es pot obrir una canonada bidireccional «%s» per a les entrades/eixides (%"
 "s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "no es pot redirigir des de «%s» (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "no es pot redirigir cap a «%s» (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "s'ha arribat al límit del sistema per a fitxers oberts: es començarà a "
 "multiplexar els descriptors de fitxer"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "la finalització de «%s» ha fallat  (%s)"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "masses canonades o fitxers d'entrada oberts"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: el segon argument hauria de ser «to» o «from»"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: «%.*s» no és un fitxer obert, canonada o co-procés"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "finalització d'una redirecció que no s'ha obert"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: la redirecció «%s» no s'obre amb «|&», s'ignora el segon argument"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "estaus de falla (%d) en la finalització de la canonada «%s» (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "estatus de falla (%d) en la finalització del fitxer «%s» (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "no s'aporta la finalització explícita del socket «%s»"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "no s'aporta la finalització explícita del co-procés «%s»"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "no s'aporta la finalització explícita de la canonada «%s»"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "no s'aporta la finalització explícita del fitxer «%s»"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "error a l'escriure en l'eixida estàndard (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "error a l'escriure en l'eixida d'error estàndard (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "la neteja de la canonada de «%sx» ha fallat (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "la neteja de la canonada per al co-procés de «%sx» ha fallat (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "la neteja del fitxer «%sx» ha fallat (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "port local no vàlid en «%s»"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "el client /inet/raw encara no està a punt, ho sento"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "sols el root pot usar «/inet/raw»."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "el servidor /inet/raw encara no està a punt, ho sento"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "no s'aporta cap protocol (conegut) en el nom del fitxer especial «%s»"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "el nom del fitxer especial «%s» està incomplet"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "port local no vàlid en «%s»"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "s'ha de subministrar un nom de sistema remot a «/inet»"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "s'ha de subministrar un port remot a «/inet»"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "port remot no vàlid en «%s»"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "les comunicacions TCP/IP no estan suportades"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "el fitxer «%s» és un directori"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "useu «PROCINFO[\"%s\"]» en comptes de «%s»"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "useu «PROCINFO[...]» en comptes de «/dev/user»"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "no es pot obrir «%s», mode «%s»"
 
-#: io.c:1814
+#: io.c:1849
 #, fuzzy, c-format
 msgid "close of master pty failed (%s)"
 msgstr "ha fallat la finalització de la canonada (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr ""
 "ha fallat la finalització de l'eixida estàndard en els processos fills (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, fuzzy, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "ha fallat la redirecció cap a l'eixida estàndard dels processos fills (dup: %"
 "s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr ""
 "ha fallat la finalització de l'entrada estàndard en els processos fills (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, fuzzy, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "ha fallat la redirecció cap a l'entrada estàndard dels processos fills (dup: "
 "%s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, fuzzy, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "ha fallat la finalització de la canonada (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "ha fallat la redirecció cap a l'eixida estàndard dels processos fills (dup: %"
 "s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "ha fallat la redirecció cap a l'entrada estàndard dels processos fills (dup: "
 "%s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "ha fallat la restauració de l'eixida estàndard en el procés pare\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "ha fallat la restauració de l'entrada estàndard en el procés pare\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "ha fallat la finalització de la canonada (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "«|&» no està suportat"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "no es pot obrir la canonada «%s» (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "no es pot crear el procés fill per a «%s» (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "el fitxer de dades «%s» està buit"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "error en llegir el fitxer d'entrada «%s»: %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "el valor multicaràcter de «RS» és una extensió de gawk"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "l'opción «-m[fr]» és irrellevant en gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "ús de l'opció -m: «-m[fr] nnn»"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: no es reconeix l'opció «-W %s», serà ignorada\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "s'igonarà l'argument buit per a l'opció «--source»"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "la variable d'entorn «POSIXLY_CORRECT» està establerta: usant «--posix»"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "«--posix» solapa a «--traditional»"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "«--posix» i «--traditional» solapen a «--non-decimal-data»"
 
-#: main.c:487
+#: main.c:501
 #, fuzzy, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "executar %s com a setuid root pot ser un problema de seguretat"
 
-#: main.c:528
+#: main.c:542
 #, fuzzy, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "no es pot establir el mode en l'entrada estàndard (%s)"
 
-#: main.c:531
+#: main.c:545
 #, fuzzy, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "no es pot establir el mode en l'eixida estàndard (%s)"
 
-#: main.c:533
+#: main.c:547
 #, fuzzy, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "no es pot establir el mode en l'eixida d'error estàndard (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "no hi ha cap text per al programa!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Ús: %s [opcions d'estil POSIX o GNU] -f fitx_prog [--] fitxer ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Ús: %s [opcions d'estil POSIX o GNU] [--] %cprograma%c fitxer ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "Opcions POSIX:\t\tOpcions llargues GNU:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fitx_prog\t\t--file=fitx_prog\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs (fs=sep_camp)\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=valor\t\t--assign=var=valor\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] valor\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=fitxer] --dump-variables[=fitxer]\n"
 
-#: main.c:681
+#: main.c:706
 #, fuzzy
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W profile[=fitxer]\t--profile[=fitxer]\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=fitxer]\t--profile[=fitxer]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=text_prog\t--source=text_prog\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 #, fuzzy
 msgid ""
 "\n"
@@ -1596,28 +1625,28 @@ msgid ""
 "\n"
 msgstr "a la secció «Reporting Problems and Bugs» de la versió impresa.\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1625,11 +1654,11 @@ msgstr ""
 "\n"
 "Aquest programa és programari lliure; pot redistribuir-se i/o modificar-se\n"
 "sota els termes de la Llicència Pública General de GNU tal i como està\n"
-"publicada per la Free Software Foundation; ja siga en la versió 2 de la\n"
+"publicada per la Free Software Foundation; ja siga en la versió 3 de la\n"
 "Llicència, o (a la vostra elecció) qualsevol versió posterior.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1643,58 +1672,57 @@ msgstr ""
 "Per a més detalls consulteu la Llicència Pública General de GNU.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Junt amb aquest programa hauríeu d'haber rebut una còpia de la Llicència\n"
 "Pública General de GNU; si no és així, escriviu a la Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
 "USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft no permet inicialitzar FS a un tabulador en la versió POSIX de awk"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "excepció de coma flotant"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "error fatal: error intern"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "no s'ha pre-obert el descriptor fd per a %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "no es pot pre-obrir /dev/null per al descriptor fd %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "no es poden trobar els grups: %s"
@@ -1716,23 +1744,28 @@ msgstr "Error: "
 msgid "fatal: "
 msgstr "Fatal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "no es pot convertir la cadena a coma flotant"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "barra invertida al final de la cadena"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "l'antic awk no suporta l'operador «**=»"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX no permet seqüències d'escapada «\\x»"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "no hi ha dígits hexadecimals en la seqüència d'escapada «\\x»"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "la seqüència d'escapada «\\%c» és tractada com a una simple «%c»"
@@ -1742,31 +1775,31 @@ msgstr "la seqüència d'escapada «\\%c» és tractada com a una simple «%c»"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s «%s»: no es pot inicialitzar close-on-exec: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "no es pot obrir «%s» per a escriptura: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, fuzzy, c-format
 msgid "internal error: %s with null vname"
 msgstr "error intern: Node_var amb vname nul"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr ""
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr ""
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# perfil gawk, creat %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1775,7 +1808,7 @@ msgstr ""
 "\t# Bloc(s) INICI\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1784,7 +1817,7 @@ msgstr ""
 "\t# Regla(es)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1793,7 +1826,7 @@ msgstr ""
 "\t# Bloc(s) FINAL\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1802,83 +1835,86 @@ msgstr ""
 "\n"
 "\t# Funcions, llistades alfabèticament\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "tipus %s inesperat en prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Èxit"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "No hi ha concordança"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Expressió regular no vàlida"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Caràcter de comparació no vàlid"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Nom de classe de caràcters no vàlid"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Barra invertida extra al final"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Referència cap enradera no vàlida"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ o [^ desemparellats"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( o \\( desemparellats"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "\\{ desemparellat"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Contingut no vàlid de \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Final de rang no vàlid"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Memòria exhaurida"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Expressió regular precedent no vàlida"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Fí prematura de l'expressió regular"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "L'expressió regular és massa gran"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") o \\) desemparellats"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "No hi ha una expressió regular prèvia"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "port remot no vàlid en «%s»"
+
 #~ msgid "function %s called\n"
 #~ msgstr "s'ha cridat a la funció %s\n"
 
diff --git a/po/da.gmo b/po/da.gmo
index d5792903..dfea8eaa 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 64063fbc..f0aabcb3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.31\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2002-11-09 10:09+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -34,357 +34,372 @@ msgstr "forsøg på at bruge skalaren \"%s\" som vektor"
 msgid "from %s"
 msgstr "%s (fra %s)"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "reference til ikke-initieret element \"%s[\"%s\"]\""
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "indeks i vektoren \"%s\" er en tom streng"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: indeks \"%s\" findes ikke i vektoren \"%s\""
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: tom (nil)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: tom (nul)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: tabelstørrelse = %d, vektorstørrelse = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, fuzzy, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: er en parameter\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: vektorreference til %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, fuzzy, c-format
 msgid "%s blocks must have an action part"
 msgstr "END-blok skal have en handlingsdel"
 
-#: awkgram.y:211
+#: awkgram.y:218
 #, fuzzy
 msgid "each rule must have a pattern or an action part"
 msgstr "END-blok skal have en handlingsdel"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "gamle awk understøtter ikke operatoren \"**\""
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "\"%s\" er en indbygget funktion, den kan ikke omdefineres"
 
-#: awkgram.y:313
+#: awkgram.y:328
 #, fuzzy
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "regexp-konstanten \"/%s/\" ser ud som en C-kommentar, men er det ikke"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "regexp-konstanten \"/%s/\" ser ud som en C-kommentar, men er det ikke"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "kommandoen har måske ikke nogen effekt"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, fuzzy, c-format
 msgid "`%s' used in %s action"
 msgstr "\"next\" brugt i BEGIN- eller END-handling"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "\"nextfile\" er en gawk-udvidelse"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "\"return\" brugt uden for funktion"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "alenestående \"print\" i BEGIN eller END-regel bør muligvis være 'print \"\"'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "\"delete array\" er en gawk-udvidelse"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 #, fuzzy
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "\"delete array\" er en gawk-udvidelse"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "flertrins dobbeltrettede datakanaler fungerer ikke"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "regulært udtryk i højreleddet af en tildeling"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "regulært udtryk på venstre side af en \"~\"- eller \"!~\"-operator"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "gamle awk understøtter ikke operatoren \"**\""
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "regulært udtryk i højreleddet af en sammenligning"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "ikke-omdirigeret \"getline\" udefineret inde i END-handling"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "gamle awk understøtter ikke operatoren \"**\""
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "kald af \"length\" uden parenteser er ikke portabelt"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "kald af \"length\" uden parenteser er forældet ifølge POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr ""
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "ugyldig indeksudtryk"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 #, fuzzy
 msgid "unexpected newline or end of string"
 msgstr "uventet nylinjetegn"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "tom programtekst på kommandolinjen"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "kan ikke åbne kildefilen \"%s\" for læsning (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "kan ikke læse kildefilen \"%s\" (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "kildefilen \"%s\" er tom"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "kildefilen slutter ikke med en ny linje"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "uafsluttet regulært udtryk slutter med \"\\\" i slutningen af filen"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "uafsluttet regulært udtryk"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "uafsluttet regulært udtryk i slutningen af filen"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "Brug af \"\\ #...\" for linjefortsættelse er ikke portabelt"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "sidste tegn på linjen er ikke en omvendt skråstreg"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX tillader ikke operatoren \"**=\""
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "gamle awk understøtter ikke operatoren \"**=\""
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX tillader ikke operatoren \"**\""
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "gamle awk understøtter ikke operatoren \"**\""
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "operatoren \"^=\" understøttes ikke i gamle awk"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "operatoren \"^\" understøttes ikke i gamle awk"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "uafsluttet streng"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "ugyldigt tegn \"%c\" i udtryk"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "\"%s\" er en gawk-udvidelse"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "\"%s\" er en Bell Labs-udvidelse"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX tillader ikke \"%s\""
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "\"%s\" understøttes ikke i gamle awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "\"goto\" anses for skadlig!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d er et ugyldigt antal argumenter for %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: tredje argument er en gawk-udvidelse"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: bogstavelig streng som sidste argument til erstatning har ingen effekt"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, fuzzy, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "sub: tredje argument er ikke et ændringsbart objekt"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: andet argument er en gawk-udvidelse"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "brug af dcgettext(_\"...\") er fejlagtigt: fjern det indledende "
 "understregningstegn"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 #, fuzzy
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "brug af dcgettext(_\"...\") er fejlagtigt: fjern det indledende "
 "understregningstegn"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funktionen \"%s\": parameter %d, \"%s\", er samme som parameter %d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funktionen \"%s\": parameteren \"%s\" overskygger en global variabel"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "kunne ikke åbne \"%s\" for skrivning (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "sender profilen til standard fejl"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: mislykkedes at lukke (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() kaldt to gange!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr ""
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funktionen \"%s\": kan ikke bruge funktionsnavn som parameternavn"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "funktionsnavnet \"%s\" er allerede defineret"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funktionen \"%s\" kaldt, men aldrig defineret"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "funktionen \"%s\" defineret, men aldrig kaldt"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "konstant regulært udtryk for parameter %d giver en boolesk værdi"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, fuzzy, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -393,197 +408,197 @@ msgstr ""
 "funktionen \"%s\" kaldt med blanktegn mellem navnet og \"(\",\n"
 "%s"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s til \"%s\" mislykkedes (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "standard ud"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "ukendt årsag"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: fik et ikke-numerisk argument"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argumentet %g er uden for tilladt område"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: kan ikke spole: datakanalen \"%s\" åbnet for læsning, ikke skrivning"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr "fflush: kan ikke spole: filen \"%s\" åbnet for læsning, ikke skrivning"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: \"%s\" er ikke en åben fil, datakanal eller ko proces"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "indeks: første argument er ikke en streng"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "indeks: andet argument er ikke en streng"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: fik et ikke-numerisk argument"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "\"delete array\" er en gawk-udvidelse"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: fik et argument som ikke er en streng"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: fik et ikke-numerisk argument"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: fik et negativt argument %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr ""
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "\"$\" tillades ikke i awkformat"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "argumentantallet med \"$\" skal være > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, fuzzy, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "argumentantallet %d er større end antal givne argumenter"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "\"$\" tillades ikke efter et punktum i formatet"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "intet \"$\" angivet for positionsangivet feltbredde eller præcision"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "\"l\" er meningsløst i awk-formater, ignoreret"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "\"l\" tillades ikke i POSIX awk-formater"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "\"L\" er meningsløst i awk-formater, ignoreret"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "\"L\" tillades ikke i POSIX awk-formater"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "\"h\" er meningsløst i awk-formater, ignoreret"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "\"h\" tillades ikke i POSIX awk-formater"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "for få argumenter til formatstrengen"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ sluttede her"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: formatspecifiereren har intet kommandobogstav"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "for mange argumenter til formatstrengen"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: ingen argumenter"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: fik ikke-numerisk argument"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: kaldt med negativt argument %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: startindeks %g er ugyldigt, bruger 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: startindeks %g som ikke er et heltal bliver trunkeret"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: længden %g er <= 0"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: længden %g er <= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: længden %g som ikke er et heltal bliver trunkeret"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: kildestrengen er tom"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, fuzzy, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: startindeks %d er forbi slutningen på strengen"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, fuzzy, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -591,194 +606,194 @@ msgstr ""
 "substr: længden %d ved startindeks %d overskrider længden af første argument "
 "(%d)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 #, fuzzy
 msgid "strftime: received non-string first argument"
 msgstr "strftime: fik et første argument som ikke er en streng"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: fik en tom formatstreng"
 
-#: builtin.c:1493
+#: builtin.c:1573
 #, fuzzy
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: fik et ikke-numerisk andet argument"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: fik et argument som ikke er en streng"
 
-#: builtin.c:1601
+#: builtin.c:1695
 #, fuzzy
 msgid "system: received non-string argument"
 msgstr "system: fik et argument som ikke er en streng"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, fuzzy, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "reference til ikke-initieret variabel \"%s\""
 
-#: builtin.c:1827
+#: builtin.c:1921
 #, fuzzy
 msgid "tolower: received non-string argument"
 msgstr "tolower: fik et argument som ikke er en streng"
 
-#: builtin.c:1857
+#: builtin.c:1951
 #, fuzzy
 msgid "toupper: received non-string argument"
 msgstr "toupper: fik et argument som ikke er en streng"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: fik et ikke-numerisk første argument"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: fik et ikke-numerisk andet argument"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: fik et ikke-numerisk argument"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: fik et ikke-numerisk argument"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: fik et ikke-numerisk argument"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: tredje argument er ikke en vektor"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: Nullet i tredje argument behandlet som et ét-tal"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: fik et ikke-numerisk første argument"
 
-#: builtin.c:2717
+#: builtin.c:2768
 #, fuzzy
 msgid "lshift: received non-numeric second argument"
 msgstr "strftime: fik et ikke-numerisk andet argument"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): flydendetalsværdier vil blive trunkeret"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "lshift(%lf, %lf): for store skifteværdier vil give mærkelige resultater"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: fik et ikke-numerisk første argument"
 
-#: builtin.c:2755
+#: builtin.c:2806
 #, fuzzy
 msgid "rshift: received non-numeric second argument"
 msgstr "strftime: fik et ikke-numerisk andet argument"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): flydendetalsværdier vil blive trunkeret"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "rshift(%lf, %lf): for store skifteværdier vil give mærkelige resultater"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: fik et ikke-numerisk første argument"
 
-#: builtin.c:2793
+#: builtin.c:2844
 #, fuzzy
 msgid "and: received non-numeric second argument"
 msgstr "atan2: fik et ikke-numerisk andet argument"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): flydendetalsværdier vil blive trunkeret"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: fik et ikke-numerisk første argument"
 
-#: builtin.c:2829
+#: builtin.c:2880
 #, fuzzy
 msgid "or: received non-numeric second argument"
 msgstr "atan2: fik et ikke-numerisk andet argument"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): flydendetalsværdier vil blive trunkeret"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: fik et ikke-numerisk første argument"
 
-#: builtin.c:2865
+#: builtin.c:2916
 #, fuzzy
 msgid "xor: received non-numeric second argument"
 msgstr "atan2: fik et ikke-numerisk andet argument"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): flydendetalsværdier vil blive trunkeret"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: fik et ikke-numerisk argument"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): flydendetalsværdier vil blive trunkeret"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: \"%s\" er ikke en gyldig lokalekategori"
@@ -792,7 +807,7 @@ msgstr "ukendt nodetype %d"
 msgid "buffer overflow in genflags2str"
 msgstr "bufferoverløb i genflags2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "forsøg på at bruge vektoren \"%s\" i skalarsammenhæng"
@@ -840,7 +855,7 @@ msgstr "\"nextfile\" kan ikke kaldes fra en END-regel"
 msgid "statement has no effect"
 msgstr "kommandoen har ingen effekt"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "kan ikke bruge funktionsnavnet \"%s\" som variabel eller vektor"
@@ -850,7 +865,7 @@ msgstr "kan ikke bruge funktionsnavnet \"%s\" som variabel eller vektor"
 msgid "reference to uninitialized argument `%s'"
 msgstr "reference til ikke-initieret argument \"%s\""
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "reference til ikke-initieret variabel \"%s\""
@@ -862,44 +877,44 @@ msgid ""
 msgstr ""
 "concatenation: sideeffekter i et udtryk har ændret længden af et andet!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "tildeling brugt i sammenligningsammenhæng"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "forsøgte at dividere med nul"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "forsøgte at dividere med nul i \"%%\""
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "ikke tilladt type (%s) i tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "forsøgte at dividere med nul i \"/=\""
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "forsøgte at dividere med nul i \"%%=\""
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "funktionen \"%s\" kaldt med flere argumenter end deklareret"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "funktionen \"%s\" er ikke defineret"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -910,659 +925,673 @@ msgstr ""
 "\t# Funktionskaldsstak:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- main --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "forsøg på at feltreferere fra ikke-numerisk værdi"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "forsøg på at referere fra tom streng"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "forsøg på at få adgang til felt nummer %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "tildeling er ikke tilladt til resultatet fra en indbygget funktion"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "\"IGNORECASE\" er en gawk-udvidelse"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "\"BINMODE\" er en gawk-udvidelse"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "fejlagtig \"%sFMT\"-specifikation \"%s\""
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "deaktiverer \"--lint\" på grund af en tildeling til \"LINT\""
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "\"extension\" er en gawk-udvidelse"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: kan ikke åbne \"%s\" (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: bibliotek \"%s\": kan ikke kalde funktionen \"%s\" (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:107
+#: ext.c:110
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: bibliotek \"%s\": kan ikke kalde funktionen \"%s\" (%s)\n"
 
-#: ext.c:113
+#: ext.c:116
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: kan ikke åbne \"%s\" (%s)\n"
 
-#: ext.c:117
+#: ext.c:120
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "funktionen \"%s\" er ikke defineret"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:124
+#: ext.c:127
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "funktionsnavnet \"%s\" er allerede defineret"
 
-#: ext.c:201
+#: ext.c:204
 #, fuzzy, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funktionen \"%s\" defineret, men aldrig kaldt"
 
-#: ext.c:204
+#: ext.c:207
 #, fuzzy, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funktionen \"%s\" er ikke defineret"
 
-#: ext.c:214
+#: ext.c:217
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "forsøg på at bruge skalaren \"%s\" som vektor"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Operationen understøttes ikke"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF sat til en negativ værdi"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: andet argument er ikke en vektor"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: tom streng som tredje argument er en gawk-udvidelse"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "\"FIELDWIDTHS\" er en gawk-udvidelse"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "tom streng som \"FS\" er en gawk-udvidelse"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "gamle awk understøtter ikke operatoren \"**\""
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flaget \"%s\" er flertydigt\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: flaget \"--%s\" tillader ikke noget argument\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: flaget \"%c%s\" tillader ikke noget argument\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flaget \"%s\" kræver et argument\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ukendt flag \"--%s\"\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ukendt flag \"%c%s\"\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ikke tilladt flag -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ugyldig flag -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flaget kræver et argument -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flaget \"-W %s\" er flertydigt\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaget \"-W %s\" tillader ikke noget argument\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "kan ikke åbne filen \"%s\" for læsning (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "lukning af fd %d (\"%s\") mislykkedes (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "ugyldig trætype %s i redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "udtrykket i \"%s\"-omdirigering har kun numerisk værdi"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "udtrykket for \"%s\"-omdirigering har en tom streng som værdi"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "filnavnet \"%s\" for \"%s\"-omdirigering kan være resultatet af et logisk "
 "udtryk"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "unødig blanding af \">\" og \">>\" for filen \"%.*s\""
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "kan ikke åbne røret \"%s\" for udskrivning (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "kan ikke åbne røret \"%s\" for indtastning (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "filen \"%s\" er et katalog"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr "kan ikke åbne tovejssoklen \"%s\" for ind-/uddata (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "kan ikke åbne tovejsrøret \"%s\" for ind-/uddata (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "kan ikke omdirigere fra \"%s\" (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "kan ikke omdirigere til \"%s\" (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "nåede systembegrænsningen for åbne filer: begynder at multiplekse "
 "fildeskriptorer"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "lukning af \"%s\" mislykkedes (%s)"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "for mange rør eller inddatafiler åbne"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: andet argument skal være \"to\" eller \"from\""
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: \"%.*s\" er ikke en åben fil, datakanal eller ko-proces"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "lukning af omdirigering som aldrig åbnedes"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: omdirigeringen \"%s\" åbnedes ikke med \"|&\", andet argument "
 "ignoreret"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "fejlstatus (%d) fra rørlukning af \"%s\" (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "fejlstatus (%d) fra fillukning af \"%s\" (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "ingen eksplicit lukning af soklen \"%s\" angivet"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "ingen eksplicit lukning af ko-processen \"%s\" angivet"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "ingen eksplicit lukning af røret \"%s\" angivet"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "ingen eksplicit lukning af filen \"%s\" angivet"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "fejl ved skrivning til standard ud (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "fejl ved skrivning til standard fejl (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "rørspuling af \"%s\" mislykkedes (%s)"
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "ko-processpuling af røret til \"%s\" mislykkedes (%s)"
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "filspuling af \"%s\" mislykkedes (%s)"
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "lokal port ugyldig i \"%s\""
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "/inet/raw-klient er desværre ikke klar endnu"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "kun root kan bruge \"/inet/raw\"."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "/inet/raw-server er desværre ikke klar endnu"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "ingen (kendt) protokol opgivet i special-filnavn \"%s\""
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "special-filnavn \"%s\" er ufuldstændigt"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "lokal port ugyldig i \"%s\""
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "skal angive et fjernmaskinenavn til \"/inet\""
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "skal angive en fjernport til \"/inet\""
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "fjernporten ugyldig i \"%s\""
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-kommunikation understøttes ikke"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "filen \"%s\" er et katalog"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "brug \"PROCINFO[\"%s\"]\" i stedet for \"%s\""
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "brug \"PROCINFO[...]\" i stedet for \"dev/user\""
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "kunne ikke åbne \"%s\", tilstand \"%s\""
 
-#: io.c:1814
+#: io.c:1849
 #, fuzzy, c-format
 msgid "close of master pty failed (%s)"
 msgstr "lukning af røret mislykkedes (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "lukning af standard ud i barnet mislykkedes (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, fuzzy, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "flytning af rør til standard ud i barnet mislykkedes (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "lukning af standard ind i barnet mislykkedes (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, fuzzy, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "flytning af rør til standard ind i barnet mislykkedes (dup: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, fuzzy, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "lukning af røret mislykkedes (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "flytning af rør til standard ud i barnet mislykkedes (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "flytning af rør til standard ind i barnet mislykkedes (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "genskabelse af standard ud i forælderprocessen mislykkedes\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "genskabelse af standard ind i forælderprocessen mislykkedes\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "lukning af røret mislykkedes (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "\"|&\" understøttes ikke"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "kan ikke åbne røret \"%s\" (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "kan ikke oprette barneproces for \"%s\" (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "datafilen \"%s\" er tom"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "fejl ved læsning af inddatafilen \"%s\": %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "flertegnsværdien af \"RS\" er en gawk-udvidelse"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "\"-m[fr]\"-flaget er irrelevant i gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "-m-flagets brug: \"-m[fr] nnn\""
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: flaget \"-W %s\" ukendt, ignoreret\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "tomt argument til \"--source\" ignoreret"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "miljøvariablen \"POSIXLY_CORRECT\" sat: aktiverer \"--posix\""
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "\"--posix\" tilsidesætter \"--traditional\""
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "\"--posix\"/\"--traditional\" tilsidesætter \"--non-decimal-data\""
 
-#: main.c:487
+#: main.c:501
 #, fuzzy, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "at køre %s setuid root kan være et sikkerhedsproblem"
 
-#: main.c:528
+#: main.c:542
 #, fuzzy, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "kan ikke sætte tilstand på standard ind (%s)"
 
-#: main.c:531
+#: main.c:545
 #, fuzzy, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "kan ikke sætte tilstand på standard ud (%s)"
 
-#: main.c:533
+#: main.c:547
 #, fuzzy, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "kan ikke sætte tilstand på standard fejl (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "ingen programtekst overhovedet!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Brug: %s [POSIX- eller GNU-stilflag] -f progfil [--] fil ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Brug: %s [POSIX- eller GNU-stilflag] %cprogram%c fil ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "POSIX-flag:\t\tGNU lange flag:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f progfil\t\t--file=progfil\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=værdi\t\t--assign=var=værdi\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] værdi\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=fil]\t--dump-variables[=fil]\n"
 
-#: main.c:681
+#: main.c:706
 #, fuzzy
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W profile[=fil]\t--profile[=fil]\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=fil]\t--profile[=fil]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=programtekst\t--source=programtekst\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 #, fuzzy
 msgid ""
 "\n"
@@ -1573,28 +1602,28 @@ msgstr ""
 "sektionen \"Reporting Problems and Bugs\" i den trykte version.\n"
 "Rapportér synpunkter på oversættelsen til <dansk@klid.dk>.\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1602,11 +1631,11 @@ msgstr ""
 "\n"
 "Dette program er frit programmel. Du kan distribuere det og/eller\n"
 "ændre det under betingelserne i GNU General Public License, offentliggjort\n"
-"af Free Software Foundation, enten version 2 eller (hvis du vil)\n"
+"af Free Software Foundation, enten version 3 eller (hvis du vil)\n"
 "enhver senere version.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1620,57 +1649,56 @@ msgstr ""
 "General Public License for yderligere information.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Du bør have fået en kopi af GNU General Public License sammen\n"
 "med dette program. Hvis ikke, så skriv til Free Software Foundation,\n"
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft sætter ikke FS til tab i POSIX-awk"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "flydendetalsundtagelse"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "fatal fejl: intern fejl"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "ingen for-åbnet fd %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "kunne ikke for-åbne /dev/null for fd %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "kunne ikke finde grupper: %s"
@@ -1692,23 +1720,28 @@ msgstr "fejl: "
 msgid "fatal: "
 msgstr "fatal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "kan ikke konvertere en streng til flydende tal"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "omvendt skråstreg i slutningen af strengen"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "gamle awk understøtter ikke operatoren \"**\""
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX tillader ikke \"\\x\"-kontrolsekvenser"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "ingen heksadecimale cifre i \"\\x\"-kontrolsekvenser"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "kontrolsekvensen \"\\%c\" behandlet som kun \"%c\""
@@ -1718,31 +1751,31 @@ msgstr "kontrolsekvensen \"\\%c\" behandlet som kun \"%c\""
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s \"%s\": kunne ikke sætte luk-ved-exec (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "kunne ikke åbne \"%s\" for skrivning: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, fuzzy, c-format
 msgid "internal error: %s with null vname"
 msgstr "intern fejl: Node_var med null vname"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr ""
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr ""
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawkprofil, oprettet %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1751,7 +1784,7 @@ msgstr ""
 "\t# BEGIN-blok\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1760,7 +1793,7 @@ msgstr ""
 "\t# Regel/regler\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1769,7 +1802,7 @@ msgstr ""
 "\t# END-blok\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1778,83 +1811,86 @@ msgstr ""
 "\n"
 "\t# Funktioner, listede alfabetisk\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "uventet type %s i prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Lykkedes"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Mislykkedes"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Ugyldigt regulært udtryk"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Ugyldigt kollationeringstegn"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Ugyldigt tegnklassenavn"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Efterfølgende omvendt skråstreg"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Ugyldig bagudreference"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "Ubalanceret [ eller [^"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "Ubalanceret ( eller \\("
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "Ubalanceret \\{"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Ugyldigt indhold i \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Ugyldig intervalslutning"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Hukommelsen opbrugt"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Ugyldigt foregående regulært udtryk"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "For tidligt slut på regulært udtryk"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Regulært udtryk for stort"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "Ubalanceret ) eller \\)"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Intet foregående regulært udtryk"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "fjernporten ugyldig i \"%s\""
+
 #~ msgid "function %s called\n"
 #~ msgstr "funktionen %s kaldt\n"
 
diff --git a/po/de.gmo b/po/de.gmo
index 30dd45d8..9e6a1f2a 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 503bcfbc..227046e6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.0\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2002-04-03 18:55+02:00\n"
 "Last-Translator: Christian Kirsch <ck@held.mind.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -34,364 +34,379 @@ msgstr "Versuch, Skalar '%s' als Array zu verwenden."
 msgid "from %s"
 msgstr "%s (von %s)"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "Bezug auf nicht-initialisiertes Element »%s[\"%s\"]«"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "Index in Array »%s« ist Nullstring."
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: Index »%s« nicht in Feld »%s« vorhanden."
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: leer (Null)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: leer (0)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: Table_size = %d, array_size = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, fuzzy, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: ist ein Parameter\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: Array-Referenz auf %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, fuzzy, c-format
 msgid "%s blocks must have an action part"
 msgstr "END-Blöcke müssen einen Aktionsteil haben."
 
-#: awkgram.y:211
+#: awkgram.y:218
 #, fuzzy
 msgid "each rule must have a pattern or an action part"
 msgstr "END-Blöcke müssen einen Aktionsteil haben."
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "Das alte awk erlaubt den Operator '**' nicht."
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "'%s' ist eine eingebaute Funktion und kann nicht umdefiniert werden."
 
-#: awkgram.y:313
+#: awkgram.y:328
 #, fuzzy
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "Konstanter Regulärer Ausdruck '/%s' sieht wie ein C-Kommentar aus, ist aber "
 "keiner."
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "Konstanter Regulärer Ausdruck '/%s' sieht wie ein C-Kommentar aus, ist aber "
 "keiner."
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "Statement möglicherweise ohne Effekt."
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, fuzzy, c-format
 msgid "`%s' used in %s action"
 msgstr "'next' in BEGIN- oder END-Aktion benutzt."
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "'nextfile' ist eine gawk-Erweiterung."
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "'return' außerhalb einer Funktion benutzt."
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "Einfaches 'print' in BEGIN- oder END-Regel soll vermutlich 'print \"\"' sein."
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "'delete array' ist eine gawk-Erweiterung."
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 #, fuzzy
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "'delete array' ist eine gawk-Erweiterung."
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "'multistage' Zweiwege-Pipes funktionieren nicht."
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "Regulärer Ausdruck auf der rechten Seite einer Zuweisung."
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "Regulärer Ausdruck links vom '~'- oder '!~'-Operator."
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "Das alte awk erlaubt den Operator '**' nicht."
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "Regulärer Ausdruck rechts von einem Vergleich."
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
 "Nicht-umgelenktes 'getline' ist innerhalb der END-Aktion nicht definiert."
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "Das alte awk erlaubt den Operator '**' nicht."
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "Aufruf von 'length' ohne Klammern ist nicht portabel."
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "Aufruf von 'length' ohne Klammern ist in POSIX-Mode veraltet."
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr ""
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "Ungültiger Index-Ausdruck."
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 #, fuzzy
 msgid "unexpected newline or end of string"
 msgstr "Unerwartetes Zeilenende"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "Kein Programmtext auf der Kommandozeile."
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "Kann Quelldatei '%s' nicht zum Lesen öffnen (%s)."
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "Kann Quelldatei '%s' nicht lesen (%s)."
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "Quelldatei '%s' ist leer."
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "Quelldatei hört nicht mit Zeilenende auf."
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 "Nicht-beendeter Regulärer Ausdruck (hört mit '\\' auf) am Ende der Datei."
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "Nicht-beendeter Regulärer Ausdruck"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "Nicht-beendeter Regulärer Ausdruck am Dateiende."
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr ""
 "Die Verwendung von '\\#...' zur Fortsetzung von Zeilen ist nicht portabel."
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "Backslash ist nicht letztes Zeichen auf der Zeile."
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX erlaubt den Operator '**=' nicht."
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "Das alte awk erlaubt den Operator '**=' nicht."
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX erlaubt den Operator '**' nicht."
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "Das alte awk erlaubt den Operator '**' nicht."
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "Das alte awk kennt den Operator '^=' nicht."
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "Das alte awk kennt den Operator '^' nicht."
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "Nicht-beendeter String"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "Ungültiges Zeichen '%c' in einem Ausdruck."
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "'%s' ist eine gawk-Erweiterung"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "'%s' ist eine Erweiterung der Bell Labs."
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX gestattet '%s' nicht."
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "Das alte awk gestattet '%s' nicht."
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "'goto' gilt als schlechter Stil!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "Unzulässige Argumentzahl %d für %s."
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: Das dritte Argument ist eine gawk-Erweiterung."
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: Ein String als letztes Argument von substitute hat keinen Effekt."
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, fuzzy, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "Der dritte Parameter von sub ist ein unveränderliches Objekt."
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: Das zweite Argument ist eine gawk-Erweiterung."
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "Fehlerhafte Verwendung von dcgettext(_\"...\"): \n"
 "Entfernen Sie den führenden Unterstrich."
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 #, fuzzy
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "Fehlerhafte Verwendung von dcgettext(_\"...\"): \n"
 "Entfernen Sie den führenden Unterstrich."
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "Funktion '%s': Parameter #%d, '%s' wiederholt Parameter #%d."
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "Funktion '%s': Parameter '%s' verdeckt eine globale Variable."
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "Kann '%s' nicht zum Schreiben öffnen (%s)."
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "Schicke Profile auf Stadard-Fehlerausgabe."
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: close gescheitert (%s)."
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() zweimal aufgerufen!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr ""
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "Funktion '%s': Kann Funktionsnamen nicht als Parameternamen benutzen."
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "Funktion '%s' ist bereits definiert."
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "Aufgerufene funktion '%s' ist nirgends definiert."
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "Funktion '%s' wird nirgends aufgerufen."
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "Konstanter Regulärer Ausdruck für Parameter #%d ergibt einen logischen Wert."
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, fuzzy, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -400,201 +415,201 @@ msgstr ""
 "Funktion '%s' mit Leerzeichen zwischen Name und '(' aufgerufen, \n"
 "%s"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s to \"%s\" fehlgeschlagen (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "Standardausgabe"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "Unbekannte Ursache"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: Argument ist keine Zahl."
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: Argument %g außerhalb des gültigen Zahlenbereichs."
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: Leeren der Puffer nicht möglich, Pipe »%s« ist nur zum Lesen "
 "geöffnet."
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: Leeren der Puffer nicht möglich, Datei »%s« ist nur zum Lesen "
 "geöffnet."
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: »%s« ist keine geöffnete Datei, Pipe oder Prozess."
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: Erstes Argument ist kein String."
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: Zweites Argument ist kein string."
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "Argument ist keine Zahl."
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "'delete array' ist eine gawk-Erweiterung."
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: Argument ist kein String."
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: Argument ist keine Zahl."
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: Negatives Argument %g."
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr ""
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "»$« ist in awk-Formaten nicht zulässig."
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "Argumentnummer bei »$« muss > 0 sein."
 
-#: builtin.c:786
+#: builtin.c:807
 #, fuzzy, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "Argumentnummer %d ist größer als Anzahl angegebener Argumente."
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "»$« nach Punkt in Formatangabe nicht zulässig."
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "»$« fehlt in positionsabhängiger Feldbreite oder Genauigkeit."
 
 # 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "»l« ist in awk-Formaten bedeutungslos, ignoriert."
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "»l« in POSIX-awk-Formaten nicht zulässig."
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "»L« ist in awk-Formaten bedeutungslos, ignoriert."
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "»L« in POSIX-awk-Formaten nicht zulässig."
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "»h« ist in awk-Formaten bedeutungslos, ignoriert."
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "»h« in POSIX-awk-Formaten nicht zulässig.<"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "Nicht genügend Argumente für Formatangabe."
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ ran out for this one"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: Format-Specifier hat keinen Controlcode."
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "Zu viele Argumente für Formatstring."
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: Keine Argumente"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: Argument ist keine Zahl."
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: Argument %g ist negativ."
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: Start-Index %g ist ungültig, 1 wird benutzt."
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: Start-Wert %g wird abgeschnitten."
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: Länge %g ist kleiner oder gleich 0."
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: Länge %g ist kleiner oder gleich 0."
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: Länge %g wird abgeschnitten."
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: String ist leer."
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, fuzzy, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: Start-Wert %d liegt hinter dem Ende des Strings."
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, fuzzy, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -602,196 +617,196 @@ msgstr ""
 "substr: Länge %d am Start-Wert %d überschreitet Länge des ersten Arguments (%"
 "d)."
 
-#: builtin.c:1478
+#: builtin.c:1558
 #, fuzzy
 msgid "strftime: received non-string first argument"
 msgstr "strftime: Erstes Argument ist kein String."
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: Format-String ist leer."
 
-#: builtin.c:1493
+#: builtin.c:1573
 #, fuzzy
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime. Zweites Argument ist keine Zahl."
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: Argument ist kein String."
 
-#: builtin.c:1601
+#: builtin.c:1695
 #, fuzzy
 msgid "system: received non-string argument"
 msgstr "system: Argument ist kein String."
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, fuzzy, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "Referenz auf die nicht-initialisierte Variable '%s'."
 
-#: builtin.c:1827
+#: builtin.c:1921
 #, fuzzy
 msgid "tolower: received non-string argument"
 msgstr "tolower: Argument ist kein String."
 
-#: builtin.c:1857
+#: builtin.c:1951
 #, fuzzy
 msgid "toupper: received non-string argument"
 msgstr "toupper: Argument ist kein String."
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: Erstes Argument ist keine Zahl."
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: Zweites Argument ist keine Zahl."
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: Argument istk eine Zahl."
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: Argument ist keine Zahl."
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: Argument ist keine Zahl."
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: Drittes Argument ist kein Array."
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: Drittes Argument 0 als 1 interpretiert"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: Erstes Argument ist keine Zahl."
 
-#: builtin.c:2717
+#: builtin.c:2768
 #, fuzzy
 msgid "lshift: received non-numeric second argument"
 msgstr "strftime. Zweites Argument ist keine Zahl."
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr ""
 "lshift(%lf, %lf): Negative Werte werden merkwürdige Ergebnisse liefern."
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): Dezimalteil wird abgeschnitten."
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "lshift(%lf, %lf): Zu große Shift-Werte werden merkwürdige Ergebnisse liefern."
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: Erstes Argument ist keine Zahl."
 
-#: builtin.c:2755
+#: builtin.c:2806
 #, fuzzy
 msgid "rshift: received non-numeric second argument"
 msgstr "strftime. Zweites Argument ist keine Zahl."
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr ""
 "rshift (%lf, %lf): Negative Werte werden merkwürdige Ergebnisse liefern."
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): Dezimalteil wird abgeschnitten."
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "rshift(%lf, %lf): Zu große Shift-Werte werden merkwürdige Ergebnisse liefern."
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: Erstes Argument ist keine Zahl."
 
-#: builtin.c:2793
+#: builtin.c:2844
 #, fuzzy
 msgid "and: received non-numeric second argument"
 msgstr "atan2: Zweites Argument ist keine Zahl."
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): Negative Werte werden merkwürdige Ergebnisse liefern."
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): Dezimalteil wird abgeschnitten."
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: Erstes Argument ist keine Zahl."
 
-#: builtin.c:2829
+#: builtin.c:2880
 #, fuzzy
 msgid "or: received non-numeric second argument"
 msgstr "atan2: Zweites Argument ist keine Zahl."
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): Negative Werte werden merkwürdige Ergebnisse liefern."
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): Dezimalteil wird abgeschnitten."
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: Erstes Argument ist keine Zahl."
 
-#: builtin.c:2865
+#: builtin.c:2916
 #, fuzzy
 msgid "xor: received non-numeric second argument"
 msgstr "atan2: Zweites Argument ist keine Zahl."
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf: Negative Werte werden merkwürdige Ergebnisse liefern."
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): Dezimalteil wird abgeschnitten."
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: Erstes Argument ist keine Zahl."
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): Negativer Wert wird merkwürdige Ergebnisse liefern."
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): Dezimalteil wird abgeschnitten."
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: '%s' ist keine gültige Locale-Kategorie."
@@ -805,7 +820,7 @@ msgstr "Unbekannter Knotentyp %d"
 msgid "buffer overflow in genflags2str"
 msgstr "Pufferüberlauf in genflags2str."
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "Versuch, das Array '%s' in Skalarkontext zu verwenden."
@@ -852,7 +867,7 @@ msgstr "'nextfile' kann nicht in einer END-Regel benutzt werden."
 msgid "statement has no effect"
 msgstr "Anweisung hat keinen Effekt."
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "Kann Funktion '%s' nicht als Variable oder Array verwenden."
@@ -862,7 +877,7 @@ msgstr "Kann Funktion '%s' nicht als Variable oder Array verwenden."
 msgid "reference to uninitialized argument `%s'"
 msgstr "Referenz auf nicht-initialisiertes Argument '%s'."
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "Referenz auf die nicht-initialisierte Variable '%s'."
@@ -875,44 +890,44 @@ msgstr ""
 "Konkatenierung: Seiteneffekte in einem Ausdruck haben die Länge des anderen\n"
 "geändert!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "Zuweisung in einer Bedingung."
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "Division durch Null versucht."
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "Division durch Null versucht in '%%'."
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "Illegaler Typ (%s) in tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "Division durch Null versucht in '/='."
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "Division durch Null versucht in '%%='."
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "Funktion '%s' mit zu vielen Argumenten aufgerufen."
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "Funktion '%s' ist nicht definiert."
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -923,661 +938,675 @@ msgstr ""
 "\t# Funktion Aufruf-Stack\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- main --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "Nicht-numerischer Wert für Feldreferenz verwendet."
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "Referenz von einem Null-String"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "Versuch des Zugriffs auf Feld %d."
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr ""
 "Zuweisungen an das Ergebnis einer eingebauten Funktion sind nicht erlaubt."
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "'IGNORECASE' ist eine gawk-Erweiterung"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "'BINMODE' ist eine gawk-Erweiterung."
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "Falsche '%sFMT'-Angabe '%s'"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "'--lint' wird abgeschaltet, da 'LINT' gesetzt ist."
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "'extension' ist eine gawk-Erweiterung."
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: Kann '%s' nicht öffnen (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: Bibliothek '%s': kann Funktion '%s' nicht aufrufen (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:107
+#: ext.c:110
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: Bibliothek '%s': kann Funktion '%s' nicht aufrufen (%s)\n"
 
-#: ext.c:113
+#: ext.c:116
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: Kann '%s' nicht öffnen (%s)\n"
 
-#: ext.c:117
+#: ext.c:120
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "Funktion '%s' ist nicht definiert."
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:124
+#: ext.c:127
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "Funktion '%s' ist bereits definiert."
 
-#: ext.c:201
+#: ext.c:204
 #, fuzzy, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "Funktion '%s' wird nirgends aufgerufen."
 
-#: ext.c:204
+#: ext.c:207
 #, fuzzy, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "Funktion '%s' ist nicht definiert."
 
-#: ext.c:214
+#: ext.c:217
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "Versuch, Skalar '%s' als Array zu verwenden."
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Operation nicht möglich."
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr ""
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: Zweites Argument ist kein Array."
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: Null-String als drittes Argument ist eine gawk-Erweiterung."
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "'FIELDWIDTHS' ist eine gawk-Erweiterung."
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "Null-String für 'FS' ist eine gawk-Erweiterung."
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "Das alte awk erlaubt den Operator '**' nicht."
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option '%s' ist mehrdeutig.\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: Option '--%s' erlaubt kein Argument.\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: Option '%c%s\" erlaubt kein Argument.\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option '%s' erfordert ein Argument.\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: Unbekannte Option '--%s'.\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: Unbekannte Option '%c%s'.\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: Illegale Option -- %c.\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: Ungültige Option -- %c.\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s Option erfordert ein Argument -- %c.\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig.\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s. Option '-W %s' erlaubt kein Argument.\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "Kann Datei '%s' nicht zum Lesen öffnen (%s)."
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "Schließen von Dateideskriptor %d ('%s') gescheitert (%s)."
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "Ungültiger Tree-Typ %s in redirect()."
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "Ausdruck in '%s' Umlenkung hat nur einen numerischen Wert."
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "Ausdruck für '%s' Umlenkung ist ein leerer String."
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "Dateiname '%s' für '%s' Umlenkung kann Ergebnis eines logischen Ausdrucks "
 "sein."
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "Unnötige Kombination von '>' und '>>' für Datei '%.*s'."
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "Kann Pipe '%s' nicht für Ausgabe öffnen (%s)."
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "Kann Pipe '%s' nicht für Eingabe öffnen (%s)."
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "Datei '%s' ist ein Verzeichnis."
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr "Kann bidirektionalen Socket '%s' nicht für Ein-/Ausgabe öffnen (%s)."
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "Kann bidirektionale Pipe '%s' nicht für Ein-/Ausgabe öffnen (%s)."
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "Kann nicht von '%s' umlenken (%s)."
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "Kann nicht auf '%s' umlenken (%s)."
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "Systemgrenze offener Dateien erreicht; beginne mit Multiplexing von "
 "Dateideskriptoren."
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "Schließen von '%s' gescheitert (%s)."
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "Zu viele Pipes oder Eingabedateien offen."
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: Zweites Argument muss 'to' oder 'from' sein."
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: '%.*s' ist keine offene Datei, Pipe oder Ko-Prozess."
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "'close' für eine Umlenkung, die nie geöffnet wurde."
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: Umlenkung '%s' nicht mit '[&' geöffnet, zweites Argument wird "
 "ignoriert."
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "Fehlerstatus (%d) beim Schließen der Pipe '%s' (%s)."
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "Fehlerstatus (%d) beim Schließen de rDatei '%s' (%s)."
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "Das explizite des Sockets '%s' fehlt."
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "Das explizite Schließen des Ko-Prozesses '%s' fehlt."
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "Das explizite Schließen der Pipe '%s' fehlt."
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "Das explizite Schließen der Datei '%s' fehlt."
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "Fehler beim Schreiben auf stdout (%s)."
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "Fehler beim Schreiben auf stderr (%s)."
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "Leeren der Pipe '%s' gescheitert (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "Ko-Prozess: Leeren der Pipe zu '%s' gescheitert (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "Flush der Datei '%s' gescheitert (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "Lokaler Port in '%s' ist ungültig."
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "/inet/raw Client noch nicht fertig."
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "Nur root darf '/inet/raw' benutzen"
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "'/inet/raw'-Server noch nicht fertig."
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "Kein bekanntes Protokoll in Dateinamen '%s' angegeben."
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "Dateiname '%s' ist unvollständig."
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "Lokaler Port in '%s' ist ungültig."
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "Sie müssen einen Rechnernamen in '/inet' angeben."
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "Sie müssen einen Port in '/inet' angeben."
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "Port-Angabe in '%s' ist ungültig."
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-Verbindungen sind nicht möglich."
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "Datei '%s' ist ein Verzeichnis."
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "Benutzen Sie 'PROCINFO[\"%s\"]' statt '%s'"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "Benutzen Sie 'PROCINFO[...] statt '/dev/user'."
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "Konnte '%s' nicht öffnen, Mode '%s'."
 
-#: io.c:1814
+#: io.c:1849
 #, fuzzy, c-format
 msgid "close of master pty failed (%s)"
 msgstr "Schließen der Pipe gescheitert (%s)."
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "Schließen von stdout in Kindprozess gescheitert (%s)."
 
-#: io.c:1819
+#: io.c:1854
 #, fuzzy, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "Verschieben der Pipe zu stdout in Kindprozess gescheitert (dup: %s)."
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "Schließen von stdin im Kindprozess gescheitert (%s)."
 
-#: io.c:1824
+#: io.c:1859
 #, fuzzy, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "Verschieben der Pipe zu stdin in Kindprozess gescheitert (dup: %s)."
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, fuzzy, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "Schließen der Pipe gescheitert (%s)."
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "Verschieben der Pipe zu stdout in Kindprozess gescheitert (dup: %s)."
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "Verschieben der Pipe zu stdin in Kindprozess gescheitert (dup: %s)."
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr ""
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr ""
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "Schließen der Pipe gescheitert (%s)."
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "'|&' nicht möglich."
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "Kann Pipe '%s' nicht öffnen (%s)."
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "Kann Kindprozess für '%s' nicht erzeugen (fork: %s)."
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "Datei '%s' ist leer."
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "Fehler beim Lesen der Eingabedatei '%s': %s."
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "Multicharacter-Wert von 'RS' ist eine gawk-Erweiterung."
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "Option '-m[fr]' ist in gawk bedeutungslos."
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "Anwendung der Option -m: '-m[fr] nnn'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: Option '-W %s' unbekannt, ignoriert.\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "Leeres Argument für '--source' ignoriert."
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "Umgebungsvariable 'POSIXLY_CORRECT' ist gesetzt: '--posix' angeschaltet."
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "'--posix' hat Vorrang vor '--traditional'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "'--posix' /'--traditional' hat Vorrang vor '--non-decimal-data'."
 
-#: main.c:487
+#: main.c:501
 #, fuzzy, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "%s als setuid root auszuführen, kann zu Sicherheitsproblemen führen."
 
-#: main.c:528
+#: main.c:542
 #, fuzzy, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "Kann Mode für stdin nicht setzen (%s)."
 
-#: main.c:531
+#: main.c:545
 #, fuzzy, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "Kann Mode für stdout nicht setzen (%s)."
 
-#: main.c:533
+#: main.c:547
 #, fuzzy, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "Kann Mode für stderr nicht setzen (%s)."
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "Kein Programmtext."
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Anwendung: %s [POSIX- oder GNU-Optionen] -f PROGRAM [--] Datei ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Anwendung: %s [POSIX- oder GNU-Optionen] -- %cPROGRAM%c Datei ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "POSIX-Optionen\t\tGNU-Optionen (lang):\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f PROGRAM\t\t--file=PROGRAM\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F Feldtrenner\t\t\t--field-separator=Feldtrenner\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=Wert\t\t--assign=var=Wert\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] Wert\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=Datei]\t--dump-variables[=Datei]\n"
 
-#: main.c:681
+#: main.c:706
 #, fuzzy
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W profile[=Datei]\t--profile[=Datei]\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=Datei]\t--profile[=Datei]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=Programmtext\t--source=Programmtext\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 #, fuzzy
 msgid ""
 "\n"
@@ -1588,28 +1617,28 @@ msgstr ""
 "den Sie im Kapitel 'Reporting Problems and Bugs' in der \n"
 "gedruckten Version finden.\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
 
-#: main.c:731
+#: main.c:762
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1618,11 +1647,11 @@ msgstr ""
 "Dieses Programm ist Freie Software. Sie können es unter den Bedingungen\n"
 "der von der Free Software Foundation veröffentlichten GNU \n"
 "General Public License weitergeben und/oder ändern.\n"
-"Es gilt Version 2 dieser Lizenz oder (nach Ihrer Wahl) irgendeine\n"
+"Es gilt Version 3 dieser Lizenz oder (nach Ihrer Wahl) irgendeine\n"
 "spätere Version.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1636,58 +1665,57 @@ msgstr ""
 "GNU General Public License for more details.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Sie sollten eine Kopie der GNU General Publice License zusammen mit\n"
 "diesem Programm erhalten haben. Wenn nicht, schreiben Sie an die Free \n"
 "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02111-"
 "1307, USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft setzt FS im POSIX-awk nicht auf Tab."
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "Floating point exception"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "Fataler Fehler: interner Fehler"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "Kein geöffneter Dateideskriptor %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "Konnte /dev/null nicht für Dateideskriptor %d öffnen."
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "Konnte Gruppen nicht finden: %s"
@@ -1709,23 +1737,28 @@ msgstr "Fehler: "
 msgid "fatal: "
 msgstr "Fatal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "Kann String nicht in Gleitkommazahl konvertieren."
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "Backslash am String-Ende."
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "Das alte awk erlaubt den Operator '**' nicht."
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX erlabut keine '\\x'-Escapes."
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "Keine Hex-Ziffern in '\\x'-Escape."
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "Escape-Sequenz '\\%c' als '%c' behandelt."
@@ -1735,31 +1768,31 @@ msgstr "Escape-Sequenz '\\%c' als '%c' behandelt."
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s '%s': Konnte close-on-exec nicht setzen: %s"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, fuzzy, c-format
 msgid "internal error: %s with null vname"
 msgstr "Interner Fehler: Node_var with null vname."
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr ""
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr ""
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawk-Profil, erzeugt %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1768,7 +1801,7 @@ msgstr ""
 "\t# BEGIN block(s)\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1777,7 +1810,7 @@ msgstr ""
 "\t# Rule(s)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1786,7 +1819,7 @@ msgstr ""
 "\t# END block(s)\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1795,83 +1828,86 @@ msgstr ""
 "\n"
 "\t# Functionen, alphabetisch sortiert\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "Unerwarteter Typ %s in prec_level."
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Erfolg"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Kein Treffer"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Ungültiger Regulärer Ausdruck."
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Ungültiges Zeichen."
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Ungültier Name für Zeichenklasse."
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Angehängter Backslash"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Ungültige Referenze"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ oder [^ nicht geschlossen"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( oder \\( nicht geschlossen"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "\\{ nicht geschlossen"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Ungültiger Inhalt von \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Ungültiges Bereichsende"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Kein Speicher mehr."
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Vorangehender Regulärer Ausdruck ist ungültig."
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Vorzeitiges Ende des Regulären Ausdrucks."
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Regulärer Ausdruck zu groß."
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") oder \\) nicht geöffnet"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Kein vorangehender Regulärer Ausdruck."
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "Port-Angabe in '%s' ist ungültig."
+
 #~ msgid "function %s called\n"
 #~ msgstr "Funktion %s aufgerufen\n"
 
diff --git a/po/es.gmo b/po/es.gmo
index 21a6e620..8f82cbbb 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 0f1ad9f4..f94b40d4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,13 +1,13 @@
-# Mensajes en español para gawk-3.1.4l.
-# Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Cristian Othón Martínez Vera <cfuga@itam.mx>, 2001, 2002, 2003, 2004, 2005.
+# Mensajes en español para gawk-3.1.5f.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Cristian Othón Martínez Vera <cfuga@itam.mx>, 2001, 2002, 2003, 2004, 2005, 2006, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 3.1.4l\n"
+"Project-Id-Version: gawk 3.1.5f\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
-"PO-Revision-Date: 2005-06-27 09:20-0500\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
+"PO-Revision-Date: 2007-07-20 01:10-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@itam.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,359 +34,372 @@ msgstr "se intentó usar el dato escalar `%s' como una matriz"
 msgid "from %s"
 msgstr "desde %s"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
-msgstr "referencia al elemento sin valor inicial `%s[\"%s\"]'"
+msgstr "referencia al elemento sin inicializar `%s[\"%s\"]'"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "el subíndice de la matriz `%s' es la cadena nula"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: el índice `%s' no está en la matriz `%s'"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: vacío (nulo)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: vacío (cero)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: tamaño_tabla = %d, tamaño_matriz = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: es un parámetro\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: array_ref a %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "Los bloques %s deben tener una parte de acción"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "cada regla debe tener un patrón o una parte de acción"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "el awk antiguo no admite múltiples reglas `BEGIN' o `END'"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' es una función interna, no se puede redefinir"
 
-#: awkgram.y:313
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "la constante de expresión regular `//' parece un comentario de C++, pero no "
 "lo es"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "la constante de expresión regular `/%s/' parece un comentario de C, pero no "
 "lo es"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "la sentencia puede no tener efecto"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "se usó `%s' en la acción %s"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "`nextfile' es una extensión de gawk"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "se usó `return' fuera del contexto de la función"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "el `print' simple en la regla BEGIN o END probablemente debe ser `print \"\"'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "`delete array' es una extensión de gawk"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(array)' es una extensión de gawk que no es transportable"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "valores case duplicados en el cuerpo de un switch: %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr "Se detectó un `default' duplicado en el cuerpo de un switch"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "las líneas de trabajo de dos vías multiestado no funcionan"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "expresión regular del lado derecho de una asignación"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "expresión regular a la izquierda del operador `~' o `!~'"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr ""
+"el awk antiguo no admite la palabra clave `in' excepto después de `for'"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "expresión regular a la derecha de una comparación"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "`getline' no redirigido indefinido dentro de la acción de END"
 
-#: awkgram.y:906
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr "el awk antiguo no admite matrices multidimensionales"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "la llamada de `length' sin paréntesis no es transportable"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "la llamada de `length' sin paréntesis está obsoleta por POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr "uso de una matriz que no es matriz"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "expresión de subíndice inválida"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "nueva línea o fin de la cadena inesperados"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "texto de programa vacío en la linea de comando"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "no se puede abrir el fichero fuente `%s' para lectura (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "no se puede leer el fichero fuente `%s' (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "el fichero fuente `%s' está vacío"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "el fichero fuente no termina con línea nueva"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "expresión regular sin terminar termina con `\\` al final del fichero"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: el modificador de expresión regular `/.../%c` de tawk no funciona en "
 "gawk"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "el modificador de expresión regular `/.../%c` de tawk no funciona en gawk"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "expresión regular sin terminar"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "expresión regular sin terminar al final del fichero"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "el uso de la continuación de línea `\\ #...' no es transportable"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "la barra invertida no es el último caracter en la línea"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX no permite el operador `**='"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
-msgstr "el awk antiguo no da soporte al operador `**='"
+msgstr "el awk antiguo no admite el operador `**='"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX no permite el operador `**'"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
-msgstr "el awk antiguo no da soporte al operador `**='"
+msgstr "el awk antiguo no admite el operador `**='"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
-msgstr "el operador `^=' no tiene soporte en el awk antiguo"
+msgstr "el operador `^=' no se admite en el awk antiguo"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
-msgstr "el operador `^' no tiene soporte en el awk antiguo"
+msgstr "el operador `^' no se admite en el awk antiguo"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "cadena sin terminar"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "caracter '%c' inválido en la expresión"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' es una extensión de gawk"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "`%s' es una extensión de Bell Labs"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX no permite `%s'"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
-msgstr "`%s' no tiene soporte en el awk antiguo"
+msgstr "`%s' no se admite en el awk antiguo"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "¡`goto' se considera dañino!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d es inválido como número de argumentos para %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: el tercer argumento es una extensión de gawk"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: la literal de cadena como último argumento de substitute no tiene efecto"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "el tercer argumento de %s no es un objecto que se puede cambiar"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: el segundo argumento es una extensión de gawk"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "el uso de dcgettext(_\"...\") es incorrecto: quite el subrayado inicial"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "el uso de dcngettext(_\"...\") es incorrecto: quite el subrayado inicial"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "función `%s': parámetro #%d, `%s', duplica el parámetro #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
-msgstr "función `%s': parámetro `%s' obscurece la variable global"
+msgstr "función `%s': parámetro `%s' oscurece la variable global"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "no se puede abrir `%s' para escritura (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
-msgstr "enviando perfil a la salida estándar de error"
+msgstr "se envía el perfil a la salida estándar de error"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: falló close (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
-msgstr "¡shadow_funcs() llamada dos veces!"
+msgstr "¡se llamó shadow_funcs() dos veces!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "hay variables opacadas."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr ""
 "función `%s': no se puede usar un nombre de función como nombre de parámetro"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "el nombre de función `%s' se definió previamente"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "se llamó a la función `%s' pero nunca se definió"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
-msgstr "la función `%s' está definida pero nunca se llamó"
+msgstr "se definió la función `%s' pero nunca se llamó"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "la constante de expresión regular para el parámetro #%d da un valor booleano"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -395,205 +408,204 @@ msgstr ""
 "se llamó la función `%s' con espacio entre el nombre y el `(',\n"
 "o se usó como una variable o una matriz"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "falló %s a \"%s\" (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "salida estándar"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "razón desconocida"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: se recibió un argumento que no es un número"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: el argumento %g está fuera de rango"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: no se puede limpiar: se abrió la tubería `%s' para lectura, no para "
 "escritura"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: no se puede limpiar: se abrió el fichero `%s' para lectura, no para "
 "escritura"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' no es un fichero abierto, tubería o co-proceso"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: el primer argumento recibido no es una cadena"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: el segundo argumento recibido no es una cadena"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: se recibió un argumento que no es un número"
 
-#: builtin.c:472
-#, fuzzy
+#: builtin.c:448
 msgid "`length(array)' is a gawk extension"
-msgstr "`delete array' es una extensión de gawk"
+msgstr "`length(array)' es una extensión de gawk"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: se recibió un argumento que no es una cadena"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: se recibió un argumento que no es un número"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: se recibió el argumento negativo %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "se debe utilizar `count$' en todos los formatos o en ninguno"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "no se permite `$' en los formatos de awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "la cuenta de argumentos con `$' debe ser > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "la cuenta de argumentos %ld es mayor que el número total de argumentos "
 "proporcionados"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "no se permite `$' después de un punto en el formato"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr ""
 "no se proporciona `$' para el ancho o la precisión del campo posicional"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
-msgstr "`l' no tiene significado en los formatos de awk; ignorado"
+msgstr "`l' no tiene significado en los formatos de awk; se descarta"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "no se permite `l' en los formatos POSIX de awk"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
-msgstr "`L' no tiene significado en los formatos de awk; ignorado"
+msgstr "`L' no tiene significado en los formatos de awk; se descarta"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "no se permite `L' en los formatos POSIX de awk"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
-msgstr "`h' no tiene significado en los formatos de awk; ignorado"
+msgstr "`h' no tiene significado en los formatos de awk; se descarta"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "no se permite `h' en los formatos POSIX de awk"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
-msgstr "[s]printf: el valor %g está fuera del rango del formato `%%%c'"
+msgstr "[s]printf: el valor %g está fuera del rango para el formato `%%%c'"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "no hay suficientes argumentos para satisfacer a la cadena de formato"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "se acabó ^ para éste"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: el especificador de formato no tiene letras de control"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "se proporcionaron demasiados argumentos para la cadena de formato"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: sin argumentos"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: se recibió un argumento que no es un número"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
-msgstr "sqrt: llamado con el argumento negativo %g"
+msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
-msgstr "substr: el índice de inicio %g es inválido, usando 1"
+msgstr "substr: el índice de inicio %g es inválido, se usa 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
-msgstr "substr: el índice de inicio no entero %g será truncado"
+msgstr "substr: se truncará el índice de inicio no entero %g"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: la longitud %g no es >= 1"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: la longitud %g no es >= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
-msgstr "substr: la longitud no entera %g será truncada"
+msgstr "substr: se truncará la longitud no entera %g"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: la longitud %g es demasiado grande para ser índice de cadena, se "
 "trunca a %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: la cadena de origen es de longitud cero"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: el índice de inicio %g está después del fin de la cadena"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -601,186 +613,186 @@ msgstr ""
 "substr: la cadena %g en el índice de inicio %g excede la longitud del primer "
 "argumento (%lu)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftime: el primer argumento recibido no es una cadena"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: se recibió una cadena de formato vacía"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: el segundo argumento recibido no es un número"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: se recibió un argumento que no es una cadena"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: se recibió un argumento que no es una cadena"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referencia al campo sin inicializar `$%d'"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: se recibió un argumento que no es una cadena"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: se recibió un argumento que no es una cadena"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: el primer argumento recibido no es un número"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: el segundo argumento recibido no es un número"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: se recibió un argumento que no es un número"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: se recibió un argumento que no es un número"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: se recibió un argumento que no es un número"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: el tercer argumento no es una matriz"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: el tercer argumento de 0 se trata como 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: el primer argumento recibido no es un número"
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: el segundo argumento recibido no es un número"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
-msgstr "lshift(%lf, %lf): los valores fraccionarios serán truncados"
+msgstr "lshift(%lf, %lf): los valores fraccionarios se truncarán"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "lshift(%lf, %lf): un valor de desplazamiento muy grande dará resultados "
 "extraños"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: el primer argumento recibido no es un número"
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: el segundo argumento recibido no es un número"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): los valores fraccionarios serán truncados"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "rshift(%lf, %lf): un valor de desplazamiento muy grande dará resultados "
 "extraños"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: el primer argumento recibido no es un número"
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
 msgstr "and: el segundo argumento recibido no es un número"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): los valores fraccionarios serán truncados"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: el primer argumento recibido no es un número"
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
 msgstr "or: el segundo argumento recibido no es un número"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): los valores fraccionarios serán truncados"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: el primer argumento recibido no es un número"
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
 msgstr "xor: el segundo argumento recibido no es un número"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
-msgstr "xor(%lf, %lf): los valores fraccionarios serán truncados"
+msgstr "xor(%lf, %lf): los valores fraccionarios se truncarán"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: se recibió un argumento que no es un número"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): el valor negativo dará resultados extraños"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
-msgstr "compl(%lf): el valor fraccionario será truncado"
+msgstr "compl(%lf): el valor fraccionario se truncará"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' no es una categoría local válida"
@@ -794,7 +806,7 @@ msgstr "tipo de nodo %d desconocido"
 msgid "buffer overflow in genflags2str"
 msgstr "desbordamiento de almacenamiento temporal en genflags2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "se intentó usar la matriz `%s' en un contexto escalar"
@@ -840,9 +852,9 @@ msgstr "`nextfile' no se puede llamar desde una regla END"
 
 #: eval.c:875
 msgid "statement has no effect"
-msgstr "la sentencia no tiene efecto"
+msgstr "la declaración no tiene efecto"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "no se puede usar el nombre de la función `%s' como variable o matriz"
@@ -852,7 +864,7 @@ msgstr "no se puede usar el nombre de la función `%s' como variable o matriz"
 msgid "reference to uninitialized argument `%s'"
 msgstr "referencia al argumento sin inicializar `%s'"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referencia a la variable sin inicializar `%s'"
@@ -865,44 +877,44 @@ msgstr ""
 "concatenación: ¡Los efectos laterales en una expresión han cambiado la "
 "longitud de otra!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "se usó una asignación en un contexto condicional"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "se intentó una división por cero"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "se intentó una división por cero en `%%'"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "tipo ilegal (%s) en tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "se intentó una división por cero en `/='"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "se intentó una división por cero en `%%='"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "se llamó a la función `%s' con más argumentos de los declarados"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "la función `%s' no está definida"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -913,680 +925,693 @@ msgstr ""
 "\t# Pila de Llamadas de Funciones:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- principal --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "se intentó una referencia de campo desde un valor que no es un número"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "se intentó una referencia desde una cadena nula"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "se intentó accesar al campo %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
-msgstr "no se permite asignación como resultado de una función interna"
+msgstr "no se permite la asignación como resultado de una función interna"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' es una extensión de gawk"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' es una extensión de gawk"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "especificación `%sFMT' `%s' errónea"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
-msgstr "desactivando `--lint' debido a una asignación a `LINT'"
+msgstr "se desactiva `--lint' debido a una asignación a `LINT'"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "`extension' es una extensión de gawk"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: no se puede abrir `%s' (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
-"extension: biblioteca `%s': no se puede llamar a la función `%s' (%s)\n"
+"extension: la biblioteca `%s': no puede llamar a la función `%s' (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr "extension: falta el nombre de la función"
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: carácter ilegal `%c' en el nombre de la función `%s'"
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: no se puede redefinir la función `%s'"
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: la función `%s' ya está definida"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension: no se puede utilizar la orden interna de gawk `%s' como nombre de "
 "función"
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: el nombre de función `%s' se definió previamente"
 
-#: ext.c:201
+#: ext.c:204
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
-msgstr "la función `%s' está definida para tomar no más de %d argumento(s)"
+msgstr "la función `%s' se definió para tomar no más de %d argumento(s)"
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "función `%s': falta el argumento #%d"
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 "función `%s': argumento #%d: se intentó usar un escalar como una matriz"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 "función `%s': argumento #%d: se intentó usar una matriz como un escalar"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "No Se Da Soporte A La Operación"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF con un valor negativo"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: el segundo argumento no es una matriz"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr ""
 "split: la cadena nula para el tercer argumento es una extensión de gawk"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' es una extensión gawk"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "valor de FIELDWIDTHS inválido, cerca de `%s'"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "la cadena nula para `FS' es una extensión de gawk"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "el awk antiguo no admite expresiones regulares como valor de `FS'"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: la opción `%c%s' no admite ningún argumento\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: no se reconoce la opción `--%s'\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: no se reconoce la opción `%c%s'\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción inválida -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción `-W %s' es ambigua\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "no se puede abrir el fichero `%s' para lectura (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "falló al cerrar el df %d (`%s') (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "tipo de árbol %s inválido en redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "la expresión en la redirección `%s' sólo tiene un valor numérico"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "la expresión para la redirección `%s' tiene un valor de cadena nula"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "el fichero `%s' para la redirección `%s' puede ser resultado de una "
 "expresión lógica"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mezcla innecesaria de `>' y `>>' para el fichero `%.*s'"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "no se puede abrir la tubería `%s' para la salida (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "no se puede abrir la tubería `%s' para la entrada (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "el fichero `%s' es un directorio"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr ""
 "no se puede abrir el `socket' de dos vías `%s' para entrada/salida (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "no se puede abrir la tubería de dos vías `%s' para entrada/salida (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "no se puede redirigir desde `%s' (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "no se puede redirigir a `%s' (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "se alcanzó el límite del sistema para ficheros abiertos: comenzando a "
 "multiplexar los descriptores de fichero"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "falló al cerrar `%s' (%s)."
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "demasiadas tuberías o ficheros de entrada abiertos"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: el segundo argumento debe ser `to' o `from'"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: `%.*s' no es un fichero abierto, tubería o co-proceso"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "cerrado de una redirección que nunca fue abierta"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: la redirección `%s' no se abre con `|&', se ignoró el segundo "
 "argumento"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "estado de fallo (%d) al cerrar la tubería de `%s' (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "estado de fallo (%d) al cerrar el fichero de `%s' (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "no se provee el cerrado explícito del `socket' `%s'"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "no se provee el cerrado explícito del co-proceso `%s'"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "no se provee el cerrado explícito del la tubería `%s'"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "no se provee el cerrado explícito del fichero `%s'"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "error al escribir en la salida estándar (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "error al escribir en la salida estándar de error (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "falló la limpieza de la tubería de `%s' (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "falló la limpieza del co-proceso de la tubería a `%s' (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "falló la limpieza del fichero de `%s' (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "puerto local %s inválido en `/inet'"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr "anfitrión remoto e información de puerto (%s, %s) inválidos"
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "el cliente /inet/raw no está listo aún, perdón"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "sólo root puede utilizar `/inet/raw'."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "el servidor /inet/raw no está listo aún, perdón"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr ""
 "no se proporciona algún protocolo (conocido) en el nombre de fichero "
 "especial `%s'"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "el nombre de fichero especial `%s' está incompleto"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "puerto local inválido en `%s'"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "se debe proporcionar a `/inet' un nombre de anfitrión remoto"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "se debe proporcionar a `/inet' un puerto remoto"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "puerto remoto inválido en `%s'"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
-msgstr "No tienen soporte las comunicaciones TCP/IP"
+msgstr "No se admiten las comunicaciones TCP/IP"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "el fichero `%s' es un directorio"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "use `PROCINFO[\"%s\"]' en lugar de `%s'"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "use `PROCINFO[...]' en lugar de `/dev/user'"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "no se puede abrir `%s', modo `%s'"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "falló al cerrar el pty maestro (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "falló al cerrar la salida estándar en el hijo (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "falló el movimiento del pty esclavo a la salida estándar en el hijo (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "falló al cerrar la entrada estándar en el hijo (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "falló el movimiento del pty esclavo a la entrada estándar en el hijo (dup: %"
 "s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "falló al cerrar el pty esclavo (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "falló el movimiento a la salida estándar en el hijo (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "falló el movimiento de la tubería a la entrada estándar en el hijo (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "falló la restauración de la salida estándar en el proceso padre\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "falló la restauración de la entrada estándar en el proceso padre\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "falló al cerrar la tubería (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
-msgstr "`|&' no tiene soporte"
+msgstr "`|&' no se admite"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "no se puede abrir la tubería `%s' (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "no se puede crear el proceso hijo para `%s' (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "el fichero de datos `%s' está vacío"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "no se puede reservar más memoria de entrada"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "error al leer el fichero de entrada `%s': %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "el valor multicaracter de `RS' es una extensión de gawk"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "la opción -m[fr] es irrelevante en gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "uso de la opción -m: `-m[fr]' nnn"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: no se reconoce la opción `-W %s', se ignora\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "se ignora el argumento vacío para `--source'"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
-"la variable de ambiente `POSIXLY_CORRECT' está establecida: activando `--"
+"la variable de ambiente `POSIXLY_CORRECT' está establecida: se activa `--"
 "posix'"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--posix' se impone a `--traditional'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix'/`--traditional' se imponen a `--non-decimal-data'"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "ejecutar %s como setuid root puede ser un problema de seguridad"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "no se puede establecer el modo binario en la entrada estándar (%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "no se puede establecer el modo binario en la salida estándar (%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr ""
 "no se puede establecer el modo binario en la salida estándar de error (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "¡No hay ningún programa de texto!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Modo de empleo: %s [opciones estilo POSIX o GNU] -f fichprog [--] "
 "fichero ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Modo de empleo: %s [opciones estilo POSIX o GNU] [--] %cprograma%c "
 "fichero ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "Opciones POSIX:\t\tOpciones largas GNU:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fichprog\t\t--file=fichprog\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F sc\t\t\t--field-separator=sc\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=valor\t\t--assign=var=valor\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] valor\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=fichero]\t--dump-variables[=fichero]\n"
 
-#: main.c:681
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W exec=fichero\t\t--exec=fichero\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=fichero]\t--profile[=fichero]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
 # Esta es la línea más larga de la lista de argumentos.
 # Probar con gawk para revisar tabuladores. cfuga
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=texto-prog\t--source=texto-prog\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1597,9 +1622,10 @@ msgstr ""
 "Para reportar bichos, consulte el nodo `Bugs' en `gawk.info', el cual\n"
 "corresponde a la sección `Reporting Problems and Bugs' en la versión "
 "impresa.\n"
+"Reporte los errores de los mensajes en español a <es@li.org>.\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1609,7 +1635,7 @@ msgstr ""
 "Por omisión lee la entrada estándar y escribe en la salida estándar.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1619,14 +1645,14 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' fichero\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1635,11 +1661,11 @@ msgstr ""
 "Este programa es software libre; puede redistribuirse y/o ser modificado\n"
 "bajo los términos de la Licencia Pública General de GNU tal como es "
 "publicada\n"
-"por la Free Software Foundation; ya sea por la versión 2 de la Licencia, o\n"
+"por la Free Software Foundation; ya sea por la versión 3 de la Licencia, o\n"
 "(a su elección) cualquier versión posterior.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1653,23 +1679,22 @@ msgstr ""
 "Licencia Pública General de GNU para más detalles.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
-"Debió haber recibido una copia de la Licencia Pública General de GNU\n"
+"Debió recibir una copia de la Licencia Pública General de GNU\n"
 "junto con este programa; si no es así, escriba a la Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Quinto Piso, Boston, MA  02110-1301, "
 "USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft no establece FS a tabulador en el awk de POSIX"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -1678,35 +1703,35 @@ msgstr ""
 "%s: el argumento `%s' para `-v' no es de la forma `var=valor'\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' no es un nombre de variable legal"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' no es un nombre de variable, se busca el fichero `%s=%s'"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "excepción de coma flotante"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "error fatal: error interno"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "no existe el df %d abierto previamente"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "no se puede abrir previamente /dev/null para el df %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "no se pueden encontrar los grupos: %s"
@@ -1728,57 +1753,62 @@ msgstr "error: "
 msgid "fatal: "
 msgstr "fatal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "no se puede convertir una cadena a coma flotante"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "barra invertida al final de la cadena"
 
-#: node.c:604
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "el awk antiguo no admite la secuencia de escape `\\%c'"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX no permite escapes `\\x'"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "no hay dígitos hexadecimales en la secuencia de escape `\\x'"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
-msgstr "la secuencia de escape `\\%c' tratada como una simple `%c'"
+msgstr "la secuencia de escape `\\%c' se trata como una simple `%c'"
 
 #: posix/gawkmisc.c:172
 #, c-format
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s': no se puede establecer close-on-exec: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "no se puede abrir `%s' para escritura: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr "error interno: %s con vname nulo"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# se trata internamente como `delete'"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr "# esta es una función de extensión cargada dinámicamente"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# perfil de gawk, creado %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1787,7 +1817,7 @@ msgstr ""
 "\t# bloque(s) BEGIN\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1796,7 +1826,7 @@ msgstr ""
 "\t# Regla(s)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1805,7 +1835,7 @@ msgstr ""
 "\t# bloque(s) END\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1814,83 +1844,86 @@ msgstr ""
 "\n"
 "\t# Funciones, enumeradas alfabéticamente\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "tipo %s inesperado en prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Éxito"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "No hay coincidencia"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Expresión regular inválida"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Caracter de ordenación inválido"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Nombre de clase de caracter inválido"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Barra invertida extra al final"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Referencia hacia atrás inválida"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ o [^ desemparejados"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( o \\( desemparejados"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "\\{ desemparejado"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Contenido inválido de \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Final de rango inválido"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Memoria agotada"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Expresión regular precedente inválida"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Fin prematuro de la expresión regular"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "La expresión regular es demasiado grande"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") o \\) desemparejados"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "No hay una expresión regular previa"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "puerto remoto inválido en `%s'"
+
 #~ msgid "function %s called\n"
 #~ msgstr "se llamó a la función %s\n"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index dc729454..57376540 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 5108a949..42cda5c2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.4l\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2005-06-29 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -36,363 +36,378 @@ msgstr "tentative d'utilisation du scalaire « %s » comme un tableau"
 msgid "from %s"
 msgstr "à partir de %s"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "référence à un élément non initialisé « %s[\"%s\"] »"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "sous-description du tableau « %s » contient une chaîne nulle"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "destruction: index « %s » n'est pas dans le tableau « %s »"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: vide (null)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: vide (zéro)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: table_size = %d, array_size = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: est un paramètre\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: array_ref de %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "Les blocs %s doivent avoir une partie action"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "chaqque règle doit avoir un patron ou une partie action"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "l'ancien awk ne supporte pas l'opérateur « ** »"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "« %s » est une fonction interne, elle ne peut être redéfinie"
 
-#: awkgram.y:313
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "la constante d'expression régulière « // » ressemble à un commentaire en C, "
 "mais ne l'est pas"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "la constante d'expression régulière « /%s/ » ressemble à un commentaire en "
 "C, mais ne l'est pas"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "la déclaration peut n'avoir aucun effet"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "« %s » utilisé dans l'action %s"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "« nextfile » est une extension de gawk"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "« return » utilisé en dehors du contexte d'une fonction"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "utilisation de « print » dans une règle BEGIN ou END doit être probablement "
 "« print \"\" »"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "« delete array » est une extension de gawk"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "« delete(array) » est une extension de tawk qui n'est pas portable"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "duplicata de valeur de case dans le corps du switch: %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr "duplicata de « default » détecté dans le corps du switch"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "pipelines bidirectionnel à multi-étapes ne fonctionnent pas"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "expression régulière à la droite de l'affectation"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "expression régulière sur la gauche de l'opérateur « ~ » ou « !~ »"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "l'ancien awk ne supporte pas l'opérateur « ** »"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "expression régulière sur la droite de la comparaison"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "« getline » non redirigé indéfini à l'intérieur de l'action END"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "l'ancien awk ne supporte pas l'opérateur « ** »"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "l'appel de « length » sans les parenthèses n'est pas portable"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "l'appel de « length » sans les parenthèses est déprécié par POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr "utilisation d'une entité qui n'est pas un tableau comme tableau"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "sous-expression invalide"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "nouvelle ligne inattendue ou fin de la chaîne"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "texte du programme sur la ligne de commande est vide"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "ne peut ouvrir le fichier source « %s » pour lecture (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "ne peut lire le fichier source « %s » (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "fichier source « %s » est vide"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "fichier source ne se termine pas par un retour de chariot"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 "expression régulière non termineé se terminant par « \\ » à la fin du fichier"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: modificateur d'exp. rég. tawk `/.../%c' ne peut opérer dans gawk"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "modificateur d'exp. rég. tawk `/.../%c' ne peut opérer dans gawk"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "expression régulière non terminée"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "expression régulière non terminée à la fin du fichier"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr ""
 "utilisation de « \\ #... » comme continuation de ligne n'est pas portable"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "la barre oblique inverse n'est pas le dernier caractère sur la ligne"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX ne permet un opérateur « **= »"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "l'ancien awk ne supporte pas l'opérateur « **= »"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX ne permet pas l'opérateur « ** »"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "l'ancien awk ne supporte pas l'opérateur « ** »"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "l'opérateur « ^= » n'est pas supporté dans l'ancien awk"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "l'opérateur « ^ » n'est pas supporté dans l'ancien awk"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "chaîne non complétée"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "caractère invalide « %c » dans l'expression"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "« %s » est une extension de gawk"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "« %s » est une extension de Bell Labs"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX ne permet pas « %s »"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "« %s » n'est pas supporté dans l'ancien awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "« goto » considéré néfaste!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d est invalide comme nombre d'arguments pour %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: 3e argument est une extension de gawk"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: la chaîne litérale comme dernier arguement d'une substitution n'a aucun "
 "effet"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "3e paramètre %s n'est pas un objet interchangeable"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: 2e argument est une extension de gawk"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "utilisation de dcgettext(_\"...\") est incorrect: enlever les soulignés en "
 "en-tête"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "utilisation de dcngettext(_\"...\") est incorrect: enlever les soulignés en "
 "en-tête"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "fonction « %s »: paramètre #%d, « %s » est un double du paramètre #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "fonction « %s »: paramètre « %s » porte ombrage à la variable globale"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "ne peut ourvrir « %s » en écriture (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "redirection du profile vers stderr"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: échec de fermeture (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadows_funcs() appelé deux fois!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "il y avait des variables ombragées"
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "fonction « %s »: ne peut utilise le nom de la fonction comme paramètre"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "nom de la fonction « %s » définie précédemment"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "fonction « %s » appelé mais jamais définie"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "fonction « %s » définie mais jamais utilisée"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "expression régulière constante pour le paramètre #%d conduit à une valeur "
 "booléenne"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -401,201 +416,201 @@ msgstr ""
 "fonction « %s » appelée avec un espace entre le nom et « ( »,\n"
 "ou utilisé comme variable ou comme un tableau"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s vers « %s » échec (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "sortie standard"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "raison inconnue"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: argument n'est pas numérique"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argument %g est hors limite"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: ne peut vider: le pipe « %s » est oouvert en lecture, pas en écriture"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: ne peut vider: fichier « %s » ouvert en lecture, pas en écriture"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr ""
 "fflush: « %s » n'est pas ni un fichier ouvert, un pipe ou un co-processus"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: premier argument n'est pas une chaîne"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: second argument n'est pas une chaîne"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: argument n'est pas numérique"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "« delete array » est une extension de gawk"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: argument n'est pas une chaîne"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: argument n'est pas numérique"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: argument négatif %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "doit utiliser « count$ » sur tous les formats ou aucun"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "« $ » n'est pas permis dans les formats awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "décompte d'arguments avec « $ » doit être > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "compteur d'arguments %ld est > que le nombre total d'arguments fournis"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "« $ » n'est pas permis après le point"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "aucun « $ » fourni dans le champ positionnel (longueur ou précision)"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "« l » n'a aucun sens dans les formats de awk; ignoré"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "« l » n'est pas permis dans les format POSIX de awk"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "« L » n'a aucun sens dans les formats s de awk; ignoré"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "« L » n'est pas permis dans les formats POSIX de awk"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "« h » n'a aucun send dans les formats de awk; ignoré"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "« h » n'est pas permis dans les formats POSIX de awk"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: valeur %g est hors limite pour le format « %%%c »"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "pas assez d'arguments pour satisfaire le format d'une chaîne"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ débordement pour celle-ci"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr ""
 "[s]printf: spécificateur de format ne contient pas de lettre de contrôle"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "trop d'arguments pour la chaîne de format"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: aucun argument"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: argument n'est pas numérique"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: appelé avec un argument négatif %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: début de l'index %g est invalide, utilise 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: début avec un nombre non entier %g sera tronqué"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: longueur %g n'est pas >= 1"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: longueur %g n'est pas >= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: longueur avec un nombre non entier %g sera tronqué"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: longueur %g trop grande pour l'indexation de chaînes, truncation à %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: chaîne de départ est de longueur zéro"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: début de l'index %g dépasse la fin de la chaîne"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -603,182 +618,182 @@ msgstr ""
 "substr: longueur %g début avec l'index %g déborde la longueur du 1er "
 "arguement (%lu)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftim: premier argument reçu n'est pas une chaîne"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: chaîne de format vide"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: second argument reçu n'est pas numérique"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: argument n'est pas une chaîne"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: argument reçu n'est pas une chaîne"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "référence à un champ non initialisé « $%d »"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: argument reçu n'est pas une chaîne"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: argument reçu n'est pas une chaîne"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: premier argument n'est pas numérique"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: second argument n'est pas numérique"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: argument n'est pas numérique"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: argument n'est pas numérique"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: argument n'est pas numérique"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: le 3e argument n'est pas un tableau"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: le 3e argument de 0 traité comme un 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: premier argument n'est pas numérique"
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: second argument reçu n'est pas numérique"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): valeurs négatives donneront d'étranges résultats"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): valeurs fractionnaires seront tronquées"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "lshift(%lf, %lf): trop grand déplacement donnera d'étranges résultats"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: premier argument n'est pas numérique"
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: second argument reçu n'est pas numérique"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): valeurs négatives donneront d'étranges résultats"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): valeurs fractionnaires seront tronquées"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "rshift(%lf, %lf): trop grand déplacement donnera d'étranges résultats"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: premier argument n'est pas numérique"
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
 msgstr "and: second argument reçu n'est pas numérique"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): valeurs négatives donneront d'étranges résultats"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): valeurs fractionnaires seront tronquées"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: premier argument n'est pas numérique"
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
 msgstr "or: second argument reçu  n'est pas numérique"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): valeurs négatives donneront d'étranges résultats"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): valeurs fractionnaires seront tronquées"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: premier argument n'est pas numérique"
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
 msgstr "xor: second argument reçu n'est pas numérique"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): valeurs négatives donneront d'étranges résultats"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): valeurs fractionnaires seront tronquées"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: argument n'est pas numérique"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): valeurs négatives donneront d'étranges résultats"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): valeurs fractionnaires seront tronquées"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: « %s » n'est pas dans un catégorie de localisation valide"
@@ -792,7 +807,7 @@ msgstr "type de noeud inconnu %d"
 msgid "buffer overflow in genflags2str"
 msgstr "débordement de tampo dans genflag2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "tentative d'utilisation du tableau « %s » dans un contexte scalaire"
@@ -840,7 +855,7 @@ msgstr "« nextfile » ne peut être appelé depuis une règle END"
 msgid "statement has no effect"
 msgstr "la déclaration n'a aucun effet"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr ""
@@ -851,7 +866,7 @@ msgstr ""
 msgid "reference to uninitialized argument `%s'"
 msgstr "référence à un argument non initialisé « %s »"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "référence à une variable non initialisée « %s »"
@@ -864,44 +879,44 @@ msgstr ""
 "concaténation: effects de bord dans une expression a modifié la longueur "
 "d'une autre!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "affectation utilisé dans un contexte conditionnel"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "tentative de division par zéro"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "tentative de division par zéro dans « %% »"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "type illégal (%s) dans tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "tentative de division par zéro dans « /= »"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "tentative de division par zéro dans « %%= »"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "fonction « %s » appelée avec plus d'arguments que déclarées"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "fonction « %s » non définie"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -912,677 +927,691 @@ msgstr ""
 "\t# Appel d'une fonction sur la pile:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "#t# -- main --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "tentative de référence un champ à partir d'une valeur non numérique"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "tentative de référence à partir d'une chaîne nulle"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "tentative d'accès du champ %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr ""
 "l'affectation n'est pas permise pour obtenir un résultat d'une fonction "
 "interne"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "« IGNORECASE » est une extension de gawk"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "« BINMODE » est une extension de gawk"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "« %sFMT » spécification erronée « %s »"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "désactivation « --lint » en raison d'une affectation à « LINT »"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "« extension » est une extension de gawk"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: ne peut ouvrir « %s » (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: librairie « %s »: ne peut appeler la fonction « %s » (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr "extension: nom de fonction manquant"
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: caractère illégal « %c » dans le nom de la fonction « %s »"
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: ne peut redéfinir la fonction « %s »"
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: fonction « %s » est déjà définie"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension: ne peut utilisé la fonction interne gawk « %s » comme nom de "
 "fonction"
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: nom de la fonction « %s » définie précédemment"
 
-#: ext.c:201
+#: ext.c:204
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr ""
 "fonction « %s »  est définie pour ne prendre pas plus de « %d » argument(s)"
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "fonction « %s »: argument #%d manquant"
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 "fonction « %s »: argument #%d: tentative d'utilisation du scalaire comme un "
 "tableau"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 "fonction « %s »: argument #%d: tentative d'utiliser un tableau comme un "
 "scalaire"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Opération non supportée"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF initialisé avec une valeur négative"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: 2e argument n'est pas un tableau"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: chaîne vide pour le 3e argument est une extension de gawk"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "« FIELDWIDTHS » est une extension de gawk"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "valeur de FIELDWIDTHS invalide, près de `%s'"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "chaîne vide pour « FS » est une extension de gawk"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "l'ancien awk ne supporte pas l'opérateur « ** »"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: option « %s » est ambiguë\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: option « --%s » n'admet pas d'arguement\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'option « %c%s » ne requiert pas d'arguement\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'option « %s » requiert un argument\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: option non reconnue « --%s »\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: option non reconnue « %c%s »\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: option illégale -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: option invalide -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: l'option requiert un arguement -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'option « -W %s » est ambiguë\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option « -W %s » ne requiert pas d'arguement\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "ne peut ouvrir le fichier « %s » en lecture (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "fermeture de fd %d (« %s ») en échec (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "type d'arbre invalide %s dans redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr ""
 "l'expression de la redirection de « %s » a seulement une valeur numérique"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr ""
 "l'expression de la redirection de « %s » a une valeur nulle pour la chaîne"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "nom de fichier « %s » pour le redirection « %s » peut être le résultat d'une "
 "expression logique"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mélange non nécessaire de « > » et de « >> » pour le fichier « %.*s »"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "ne peut ouvrir un pipe « %s » en sortie (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "ne peut ouvrir un pipe « %s » en entrée (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "le fichier « %s » est un répertoire"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr ""
 "ne peut ouvrir un socket bidirectionnel « %s » pour les entrées/sorties (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "ne peut ouvrir un pipe bidirectionnel « %s » pour les entrées/sorties (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "ne peut rediriger de « %s » (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "ne peut rediriger vers « %s » (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "limite système atteinte pour l'ouverture des fichiers: début du multiplexage "
 "des descripteurs de fichiers"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "fermeture de « %s » en échec (%s)"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "trop de pipes ou de fichiers en lecture ouverts"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: 2e argument doit être « to » ou « from »"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: « %.*s » n'est pas ni un fichier ouvert, pipe ou co-processus"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "fermeture de la redirection qui n'a jamais été ouverte"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: redirection « %s » n'a pas été ouverte ave « |& » 2e argument ignoré"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "constat d'échec (%d) lors de la fermeture du pipe « %s » (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "constat d'échec (%d) lors de la fermeture du fichier « %s » (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "aucune fermeture explicite du socket « %s » fournie"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "aucune fermeture explicite du co-processus « %s » fournie"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "aucune fermeture explicite du pipe « %s » fournie"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "aucune fermeture explicite du fichier « %s » fournie"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "erreur lors de l'écriture vers stdout (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "erreur lors de l'écriture vers stderr (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "vidange du pipie de « %s » en échec (%s)"
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "vidange du pipe par le co-processus vers « %s » en échec (%s)"
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "vidange du fichier « %s » en échec (%s)"
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "port local invalide dans « %s »"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "le client /inet/raw n'est pas encore prêt, désolé"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "seul root peut utiliser « /inet/raw »"
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "le serveur /inet/raw n'est pas encore prêt, désolé"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "aucun protocole (connu) fourni dans le nom de fichier spécial « %s »"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "nom spécial de fichier « %s » est incomplet"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "port local invalide dans « %s »"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "un nom de hôte distant doit être fourni à « /inet »"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "un port distant doit être fournis à « /inet »"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "port distant invalide dans « %s »"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "les communications TCP/IP ne sont pas supportées"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "le fichier « %s » est un répertoire"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "utliser « PROCINFO[\"%s\"] » au lieu de « %s »"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "utliser « PROCINFO[\"%s\"] » au lieu de « /dev/user »"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "ne peut ouvrir « %s », mode « %s »"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "échec de la fermeture du pty maître (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "échec de fermeture de stdout du processus fils (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "échec de redirection de pty esclave vers stdout du processus fils (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "échec de fermeture de stdin du processus fils (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "échec de redirection du pty esclave vers stdin du processus fils (dup: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "échec de la fermeture du pty esclave (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "échec de redirection du pipe vers stdout du processus fils (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "échec de redirection du pipe vers stdin du processus fils (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "restauration de stdout par le processus parent a échoué\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "restauration de stdin par le processus parent a échoué\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "échec de la fermeture du pipe (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "« |& » non supporté"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "ne ouvrir un pipe « %s » (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "ne créer le processus fils pour « %s » (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "le fichier de données « %s » est vide"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "ne peut allouer plus de mémoire pour l'entrée"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "erreur lors de la lecture du fichier source « %s »: %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "valeur de « RS » avec multiple caractères est une extension gawk"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "« -m[fr] » est une option non pertinente en gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "-m usage de l'option: « -m[fr] nnn »"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: l'option « -W %s » n'est pas reconnue, ignorée\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "argument vide à l'option « --source », ignorée"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "variable d'environnement « POSIXLY__CORRECT » initialisée: utilisation de « "
 "--posix »"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "« --posix » écrase « --traditional »"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "« --posix »/« --traditional » écrase « --non-decimal-data »"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 "exécution de %s en mode setuid root peut causer un problème de sécurité"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "ne peut initialiser le mode binaire sur stdin (%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "ne peut initialiser le mode binaire sur stdout (%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "ne peut initialiser le mode binaire sur stderr (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "aucun programme!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Usage: %s [style des options POSIX ou GNU] -f fichierprog [--] fichier ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Usage: %s [style des options POSIX ou GNU] [--] %cprogram%c fichier ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "Options POSIX:\t\toptions de long format GNU:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fichierprog\t\t--file=fichierprog\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "#t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "#t-v var=valeur\t\t--assign=var=valeur\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] valeur\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=fichier]\t--dump-variables[=fichier]\n"
 
-#: main.c:681
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W exec=fichier\t\t--exec=fichier\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=fichier]\t--profile[=fichier]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=program-text\t--source=program-text\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1594,7 +1623,7 @@ msgstr ""
 "la section\n"
 "« Problems and Bugs » dans la version imprimée.\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1604,7 +1633,7 @@ msgstr ""
 "Par défaut, il lit de l'entrée standard et écrit sur la sortie standard.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1614,14 +1643,14 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1629,11 +1658,11 @@ msgstr ""
 "\n"
 "Ce programme est un logiciel libre; vous pouvez le redistribuer ou le\n"
 "modifier selon les termes de la License Publique Générale de GNU, publiée\n"
-"par la Free Software Foundation; soit la version 2 de la Licence ou,\n"
+"par la Free Software Foundation; soit la version 3 de la Licence ou,\n"
 "soit (selon vos préférences) toute version ultérieure.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1648,24 +1677,23 @@ msgstr ""
 "Pour plus d'informations à ce sujet, consulter la « GNU General Public "
 "License ».\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Vous devriez avoir reçu copie de la Licence Publique Générale de GNU\n"
 "avec ce programme; sinon, sinon écrire à la Free Software Foundation, Inc.,\n"
 "51 Franklin Street, FIth Floor, Boston, MA 02110-1301, USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr ""
 "-Ft ne permet pas d'initialiser FS à un tabulateur dans la version POSIX de "
 "awk"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -1674,35 +1702,35 @@ msgstr ""
 "%s: « %s » argument pour « -v » n'utilise pas la formulation « var=valeur »\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "« %s » n'est pas un nom légal de variable"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "« %s » n'est pas un nom de variable, recherche du fichier « %s=%s »"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "exception de la virgule flottante"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "erreur fatale: erreur interne"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "aucun fd pré-ouvert pour %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "ne peut pré-ouvrir /dev/null pour le descripteud fd %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "n'a pu trouvé les groupes: %s"
@@ -1724,23 +1752,28 @@ msgstr "Erreur: "
 msgid "fatal: "
 msgstr "Fatal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "ne peut convertir la chaîne en nombre flottant"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "barre oblique inverse à la fin de la chaîne"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "l'ancien awk ne supporte pas l'opérateur « ** »"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX ne permet pas de séquence d'échappement « \\x »"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "aucun chiffre hexadécimal dans la séquence d'échappement « \\x » "
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "séquence d'échappement « \\%c » traitée simplement comme « %c »"
@@ -1750,31 +1783,31 @@ msgstr "séquence d'échappement « \\%c » traitée simplement comme « %c »"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s « %s »: ne peut initialiser close-on-exec: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "ne peut ouvrir « %s » en écriture: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr "erreur interne: %s avec un vname nul"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# traité de manière interne comme « delete »"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr "# cela est un extension d'une fonction chargée dynamiquement"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# profile gawk, créé %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1783,7 +1816,7 @@ msgstr ""
 "#t# DÉBUT de bloc(s)\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1792,7 +1825,7 @@ msgstr ""
 "\t# Règle(s)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1801,7 +1834,7 @@ msgstr ""
 "\t# FIN de bloc(s)\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1810,83 +1843,86 @@ msgstr ""
 "\n"
 "\t# Liste alphabétique des fonctions\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "type %s inattendu dans prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Succès"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Aucune concordance"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Expression régulière invalide"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Caractère de collation invalide"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Nom de classe de caractères invalide"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Barre oblique inverse de terminaison"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Mauvaise référence arrière"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "Non appariement de [ ou [^"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "Non appariement de ( ou \\("
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "Non appariement de \\{"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Contenu invalide de \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Borne finale invalide"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Expression régulière précédente invalide"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Fin prématurée de l'expression régulière"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Expression régulière trop grande"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "Non appariement de ) ou \\)"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Aucune expression régulière antérieure"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "port distant invalide dans « %s »"
+
 #~ msgid "function %s called\n"
 #~ msgstr "fonction %s appelée\n"
 
diff --git a/po/ga.gmo b/po/ga.gmo
index 47945cff..fe79e270 100644
--- a/po/ga.gmo
+++ b/po/ga.gmo
diff --git a/po/ga.po b/po/ga.po
index ec5a47c5..a4694285 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,22 +1,22 @@
 # Irish translations for gawk.
 # Copyright (C) 2004 Free Software Foundation, Inc.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2004.
-# Peadar Ó Guilín <peadarog@oceanfree.net>, 2005.
+# Kevin Patrick Scannell <kscanne@gmail.com>, 2004.
+# Peadar Ó Guilín <peadarog@oceanfree.net>, 2005, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 3.1.31\n"
+"Project-Id-Version: gawk 3.1.5h\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
-"PO-Revision-Date: 2005-01-03 13:47-0500\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
+"PO-Revision-Date: 2007-10-01 13:47-0500\n"
 "Last-Translator: Peadar Ó Guilín <peadarog@oceanfree.net>\n"
-"Language-Team: Irish <ga@li.org>\n"
+"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: array.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "attempt to use function `%s' as an array"
 msgstr "iarracht feidhm `%s' a úsáid mar eagar"
 
@@ -31,750 +31,747 @@ msgid "attempt to use scalar `%s' as array"
 msgstr "iarracht scálach '%s' a úsáid mar eagar"
 
 #: array.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "from %s"
-msgstr "%s ( ó %s)"
+msgstr "ó %s"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
-msgstr "tagairt do eilimint gan túsú `%s[\"%s\"]'"
+msgstr "tagairt d'eilimint gan túsú `%s[\"%s\"]'"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "is teaghrán folamh é foscript an eagair `%s'"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: níl innéacs `%s' san eagar `%s'"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: folamh (neamhní)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: folamh (nialas)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: méid_tábla = %d, méid_eagair = %d\n"
 
-#: array.c:829
-#, fuzzy, c-format
+#: array.c:831
+#, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: is paraiméadar é\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: tagairt_eagair do %s\n"
 
-#: awkgram.y:208
-#, fuzzy, c-format
+#: awkgram.y:215
+#, c-format
 msgid "%s blocks must have an action part"
-msgstr "tá gá le páirt gníomhach ag blocanna CRÍOCH"
+msgstr "tá gá le páirt ghníomhach ag blocanna %s"
 
-#: awkgram.y:211
-#, fuzzy
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
-msgstr "tá gá le páirt gníomhach ag blocanna CRÍOCH"
+msgstr "tá gá le patrún nó páirt ghníomhach ag gach riail"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "ní thacaíonn sean-awk le rialacha iomadúla `BEGIN' nó `END'"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
-msgstr "is feidhm insuite í `%s', ní féidir í a shainmhíneadh"
+msgstr "is feidhm insuite í `%s', ní féidir í a shainmhíniú"
 
-#: awkgram.y:313
-#, fuzzy
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
-msgstr "tá cuma nóta tráchta C ar an dtairiseach `/%s/', ach ní nóta tráchta é"
+msgstr "tá cuma nóta tráchta C++ ar an dtairiseach `//', ach ní nóta tráchta é"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "tá cuma nóta tráchta C ar an dtairiseach `/%s/', ach ní nóta tráchta é"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "seans nach mbeidh éifeacht ag an ráiteas"
 
-#: awkgram.y:440 awkgram.y:460
-#, fuzzy, c-format
+#: awkgram.y:455 awkgram.y:479
+#, c-format
 msgid "`%s' used in %s action"
-msgstr "`next' á úsáid ag an gníomh TÚS nó CRÍOCH"
+msgstr "`%s' á úsáid i ngníomh %s"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "is feabhsúchán gawk é `nextfile'"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
-msgstr "`return' á úsáid lasmuigh den comhthéacs feidhmach"
+msgstr "`return' á úsáid lasmuigh den chomhthéacs feidhmeach"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
-"is dóigh gur chóir go mbeadh an gnáth `print' sa riail TÚS nó CRÍOCH "
-"scríobhtha mar `print \"\"'"
+"is dóigh gur chóir go mbeadh an gnáth `print' sa riail TÚS nó CRÍOCH scríofa "
+"mar `print \"\"'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "is feabhsúchán gawk é `delete array'"
 
-#: awkgram.y:540 awkgram.y:547
-#, fuzzy
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
-msgstr "is feabhsúchán gawk é `delete array'"
+msgstr "is feabhsúchán neamh-iniompartha tawk é `delete(eagar)'"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
-msgstr ""
+msgstr "luachanna cás dúbailte sa chorp laisce: %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
-msgstr ""
+msgstr "`default' dúbailte aimsithe sa chorp laisce"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
-msgstr "ní oibríonn pílínte déthreo ilchéimeacha"
+msgstr "ní oibríonn píblínte déthreo ilchéimeacha"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
-msgstr "slonn ionadaíochta ar dhéis an sannacháin"
+msgstr "slonn ionadaíochta ar dhéis an tsannacháin"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
-msgstr "slonn ionadaíochta ar chlé an oibreoirí `~' nó `!~'"
+msgstr "slonn ionadaíochta ar chlé na oibreoirí `~' nó `!~'"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "ní thacaíonn sean-awk le heochairfhocal `in' ach tar éis `for'"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "slonn ionadaíochta ar dhéis na comparáide"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "ní shannadh `getline' neamhatreoraithe lasmuigh den ghníomh CRÍOCH"
 
-#: awkgram.y:906
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr "ní thacaíonn sean-awk le heagair iltoiseacha"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
-msgstr "tá glao `length' gan lúibíní doiompairtha"
+msgstr "tá glao `length' gan lúibíní doiompartha"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "lochtaíonn POSIX glao `length' gan lúibíní"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
-msgstr ""
+msgstr "neamheagar á úsáid mar eagar"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "slonn foscripte neamhbhailí"
 
-#: awkgram.y:1171
-#, fuzzy
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
-msgstr "líne nua gan súil"
+msgstr "líne nua nó deireadh teaghráin gan choinne"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "téacs feidhmchlár folamh ar líne na n-orduithe"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "ní féidir an comhad foinseach `%s' a oscailt chun léamh (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "ní féidir an comhad foinseach `%s' a léamh (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "comhad foinseach `%s' folamh"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "ní chríochnaíonn an comhad foinseach le líne nua"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "críochnaíonn regexp gan chríochnú le `\\' ag an gcomhadchríoch"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
-msgstr ""
+msgstr "%s: %d: ní oibríonn an mionathraitheoir tawk regex `/.../%c' i ngawk"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
-msgstr ""
+msgstr "ní oibríonn an mionathraitheoir tawk regex `/.../%c' i ngawk"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "slonn ionadaíochta gan críochnú"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "slonn ionadaíochta gan críochnú ag an gcomhadchríoch"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "níl úsáid `\\ #...' mar leanúint líne doiompartha"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "ní cúlslais é carachtar deireanach an líne"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "ní cheadaíonn POSIX an t-oibreoir `**='"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
-msgstr "ní cheadaíonn sean awk an t-oibreoir `**='"
+msgstr "ní cheadaíonn sean-awk an t-oibreoir `**='"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "ní cheadaíonn POSIX an t-oibreoir `**='"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
-msgstr "ní cheadaíonn sean awk an t-oibreoir `**='"
+msgstr "ní cheadaíonn sean-awk an t-oibreoir `**='"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "tá an t-oibreoir `^=' gan tacaíocht sa shean awk"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "tá an t-oibreoir `^' gan tacaíocht sa shean awk"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "teaghrán gan chríochnú"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "carachtar neamhbhailí '%c' sa slonn"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "is feabhsúchán gawk é `%s'"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "is feabhsúchán Bell Labs é `%s'"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "ní cheadaíonn POSIX `%s'"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "tá `%s' gan tacaíocht sa shean awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
-msgstr "deirtear go bfhuil `goto' dochrach!\n"
+msgstr "deirtear go bhfuil `goto' dochrach!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d oiread argóintí neamhbhailí le haghaidh %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
-msgstr "meaitseáil: is feabhsúchán gawk é an tríú argóint"
+msgstr "meaitseáil: is feabhsúchán gawk é an tríú hargóint"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: ní bhíonn aon éifeacht ag teaghrán litriúil mar arg deireanach an ionadaí"
 
-#: awkgram.y:2339
-#, fuzzy, c-format
+#: awkgram.y:2467
+#, c-format
 msgid "%s third parameter is not a changeable object"
-msgstr "ní oibiacht athraitheach é an tríú paraiméadar ionadaíoch"
+msgstr "ní oibiacht athraitheach í an tríú paraiméadar %s"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: is feabhsúchán gawk é an dara hargóint"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
-msgstr "tá úsáid dcgettext(_\"...\") mí-cheart: bain amach an chéad fhostríoc"
+msgstr "tá úsáid dcgettext(_\"...\") mícheart: bain amach an chéad fhostríoc"
 
-#: awkgram.y:2394
-#, fuzzy
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
-msgstr "tá úsáid dcgettext(_\"...\") mí-cheart: bain amach an chéad fhostríoc"
+msgstr "tá úsáid dcgettext(_\"...\") mícheart: bain amach an chéad fhostríoc"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
-msgstr "feidhm `%s': is cóip é paraiméadar #%d, `%s', den paraiméadar #%d"
+msgstr "feidhm `%s': is cóip é paraiméadar #%d, `%s', den pharaiméadar #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
-msgstr "feidhm `%s': leanann paraiméadar `%s' an athróg domhanda"
+msgstr "feidhm `%s': leanann paraiméadar `%s' athróg chomhchoiteann"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "níorbh fhéidir `%s' a oscailt chun scríobh (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
-msgstr "ag seoladh cuntas go earráid chaighdeánach"
+msgstr "próifíl á seoladh go hearráid chaighdeánach"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: theip ar an dún (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "glaodh dhá uair ar shadow_funcs()!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
-msgstr ""
+msgstr "bhí scáthathrógaí ann."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "feidhm `%s': níl cead ainm feidhme a úsáid mar ainm paraiméadar"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
-msgstr "ainm feidhme `%s' sainmhínithe chéana"
+msgstr "ainm feidhme `%s' sainmhínithe cheana"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "glaodh ar an bhfeidhm `%s' nach bhfuil sainithe"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "tá sainiú ag an bhfeidhm `%s' ach ní ghlaodh é"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
-msgstr "tagann luach Boole de bharr ón dtairiseach regexp don paraiméadar #%d"
+msgstr "tagann luach Boole de bharr ón dtairiseach regexp don pharaiméadar #%d"
 
-#: awkgram.y:3105
-#, fuzzy, c-format
+#: awkgram.y:3234
+#, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
 "or used as a variable or an array"
 msgstr ""
 "glaodh feidhm `%s' le spás idir ainm agus `(',\n"
-"%s"
+"nó úsáideadh é mar athróg nó mar eagar"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "theip ar %s go \"%s\" (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "aschur caighdeánach"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "níl fhios an fáth"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: fuarthas argóint neamhuimhriúil"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argóint %g as raon"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr "fflush: ní dhúisófear: píopa `%s' oscailte do léamh, ní do scríobh"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr "fflush: ní dhúisófear: comhad `%s' oscailte do léamh, ní do scríobh"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: ní comhad, píopa nó comhphróiseas oscailte é `%s'"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: ní teaghrán é an chéad argóint"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: ní teaghrán é an dara hargóint"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: fuarthas argóint neamhuimhriúil"
 
-#: builtin.c:472
-#, fuzzy
+#: builtin.c:448
 msgid "`length(array)' is a gawk extension"
-msgstr "is feabhsúchán gawk é `delete array'"
+msgstr "is feabhsúchán gawk é `length(array)'"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: fuarthas argóint nach teaghrán é"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: fuarthas argóint neamhuimhriúil"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: fuarthas argóint diúltach %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr ""
+"má úsáidtear `count$' i bhformáid ar bith, caithfidh é a úsáid i ngach "
+"formáid é"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "Níl `$' ceadaithe i bhformáidí awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "caithfidh áireamh na harg. le `$' bheith > 0"
 
-#: builtin.c:786
-#, fuzzy, c-format
+#: builtin.c:807
+#, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
-msgstr "áireamh na harg. %d níos mó ná na hargóintí faighte"
+msgstr "áireamh na harg. %ld níos mó ná na hargóintí faighte"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "níl `$' ceadaithe i bhformáid théis punc"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "níor thugadh `$' do leithead nó beachtas an réimse ionaid"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "níl ciall ag `l' i bhformáidí awk; neamhairdithe"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "ní cheadaítear `l' i bhformáidí awk POSIX"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "níl ciall ag `L' i bhformáidí awk; neamhairdithe"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "ní cheadaítear `L' i bhformáidí awk POSIX"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "níl ciall ag  `h' i bhformáidí awk; neamhairdithe"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "ní cheadaítear `h' i bhformáidí awk POSIX"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
-msgstr ""
+msgstr "[s]printf: tá luach %g as raon don bhformáid `%%%c'"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "ní leor argóintí le haghaidh an teaghráin formáide"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ imithe thar bráid don cheann seo"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: níl litir rialúcháin ag an sonraitheoir formáide"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "fuarthas an iomarca argóintí don teaghrán formáide"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: níl aon argóint"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: fuarthas argóint neamhuimhriúil"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: glaodh le argóint diúltach %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: tá tús innéacs %g neamhbhailí, ag úsáid a 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
-msgstr "substr: teascófar tús neamhuimhriúil an innéacs %g"
+msgstr "substr: teascfar tús neamhuimhriúil an innéacs %g"
 
-#: builtin.c:1353
-#, fuzzy, c-format
+#: builtin.c:1431
+#, c-format
 msgid "substr: length %g is not >= 1"
-msgstr "substr: tá fad %g <= 0"
+msgstr "substr: níl fad %g >= 1"
 
-#: builtin.c:1355
-#, fuzzy, c-format
+#: builtin.c:1433
+#, c-format
 msgid "substr: length %g is not >= 0"
-msgstr "substr: tá fad %g <= 0"
+msgstr "substr: níl fad %g >= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
-msgstr "ubstr: teascófar an fad neamhuimhriúil %g"
+msgstr "ubstr: teascfar an fad neamhuimhriúil %g"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
-msgstr ""
+msgstr "substr: fad %g ró-mhór d'innéacsú teaghráin, ag teascadh go %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: tá an teaghrán foinse folamh"
 
-#: builtin.c:1395
-#, fuzzy, c-format
+#: builtin.c:1473
+#, c-format
 msgid "substr: start index %g is past end of string"
-msgstr "substr: tosaíonn innéacs %d théis deireadh an teaghráin"
+msgstr "substr: innéacs tosaithe %g tar éis deireadh an teaghráin"
 
-#: builtin.c:1403
-#, fuzzy, c-format
+#: builtin.c:1481
+#, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
-msgstr "substr: fad %d ag tús innéacs %d ró-fhada don chéad argóint (%d)"
+msgstr "substr: fad %g ag innéacs tosaithe %g rófhada don chéad argóint (%lu)"
 
-#: builtin.c:1478
-#, fuzzy
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
-msgstr "strftime: ní teaghrán é an chéad argóint"
+msgstr "strftime: ní teaghrán í an chéad argóint"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: fuarthas teaghrán formáide folamh"
 
-#: builtin.c:1493
-#, fuzzy
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: fuarthas dara hargóint neamhuimhriúil"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: ní teaghrán é an argóint"
 
-#: builtin.c:1601
-#, fuzzy
+#: builtin.c:1695
 msgid "system: received non-string argument"
-msgstr "system: ní teaghrán é an argóint"
+msgstr "system: fuarthas argóint nach teaghrán í"
 
-#: builtin.c:1722 eval.c:2039
-#, fuzzy, c-format
+#: builtin.c:1816 eval.c:2041
+#, c-format
 msgid "reference to uninitialized field `$%d'"
-msgstr "tagairt do athróg nach bhfuil túsaithe `%s'"
+msgstr "tagairt d'athróg nach bhfuil túsaithe `$%d'"
 
-#: builtin.c:1827
-#, fuzzy
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
-msgstr "tolower: ní teaghrán é an argóint"
+msgstr "tolower: fuarthas argóint nach teaghrán í"
 
-#: builtin.c:1857
-#, fuzzy
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
-msgstr "toupper: ní teaghrán é an argóint"
+msgstr "toupper: fuarthas argóint nach teaghrán í"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: ní huimhir é an chéad argóint"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: ní huimhir é an dara hargóint"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: fuarthas argóint neamhuimhriúil"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: fuarthas argóint neamhuimhriúil"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: fuarthas argóint neamhuimhriúil"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
-msgstr "match: ní eagar é an tríú argóint"
+msgstr "match: ní eagar é an tríú hargóint"
 
-#: builtin.c:2555
-#, fuzzy
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
-msgstr "gensub: 3ú argóint as 0 úsáidte mar 1"
+msgstr "gensub: 3ú hargóint 0 úsáidte mar 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: ní huimhir é an chéad argóint"
 
-#: builtin.c:2717
-#, fuzzy
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
-msgstr "atan2: ní huimhir é an dara hargóint"
+msgstr "lshift: ní huimhir é an dara hargóint"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): tiocfaidh torthaí aisteacha as luachanna diúltacha"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
-msgstr "lshift(%lf, %lf): teascófar luachanna codánacha"
+msgstr "lshift(%lf, %lf): teascfar luachanna codánacha"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
-"lshift(%lf, %lf): gheobhfar torthaí aisteacha le luach iomlaoidach ró-mhór"
+"lshift(%lf, %lf): gheobhfar torthaí aisteacha le luach iomlaoideach ró-mhór"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: ní huimhir é an chéad argóint"
 
-#: builtin.c:2755
-#, fuzzy
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
-msgstr "atan2: ní huimhir é an dara hargóint"
+msgstr "rshift: ní huimhir é an dara hargóint"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
-msgstr "rshift(%lf, %lf): gheobhfar torthaí aisteacha le luachanna diútlacha"
+msgstr "rshift(%lf, %lf): gheobhfar torthaí aisteacha le luachanna diúltacha"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
-msgstr "rshift(%lf, %lf): teascófar luachanna codánacha"
+msgstr "rshift(%lf, %lf): teascfar luachanna codánacha"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
-"rshift(%lf, %lf): gheobhfar torthaí aisteacha le luach iomlaoidach ró-mhór"
+"rshift(%lf, %lf): gheobhfar torthaí aisteacha le luach iomlaoideach ró-mhór"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: ní huimhir é an chéad argóint"
 
-#: builtin.c:2793
-#, fuzzy
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
-msgstr "atan2: ní huimhir é an dara hargóint"
+msgstr "and: ní huimhir é an dara hargóint"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
-msgstr "and(%lf, %lf): gheobhfar torthaí aisteacha le luachanna diútlacha"
+msgstr "and(%lf, %lf): gheobhfar torthaí aisteacha le luachanna diúltacha"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
-msgstr "and(%lf, %lf): teascófar luachanna codánacha"
+msgstr "and(%lf, %lf): teascfar luachanna codánacha"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: ní huimhir é an chéad argóint"
 
-#: builtin.c:2829
-#, fuzzy
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
-msgstr "atan2: ní huimhir é an dara hargóint"
+msgstr "or: ní huimhir é an dara hargóint"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
-msgstr "or(%lf, %lf): gheobhfar torthaí aisteacha le luachanna diútlacha"
+msgstr "or(%lf, %lf): gheobhfar torthaí aisteacha le luachanna diúltacha"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
-msgstr "or(%lf, %lf): teascófar luachanna codánacha"
+msgstr "or(%lf, %lf): teascfar luachanna codánacha"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: ní huimhir é an chéad argóint"
 
-#: builtin.c:2865
-#, fuzzy
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
-msgstr "atan2: ní huimhir é an dara hargóint"
+msgstr "xor: ní huimhir é an dara hargóint"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
-msgstr "xor(%lf, %lf): gheobhfar torthaí aisteacha le luachanna diútlacha"
+msgstr "xor(%lf, %lf): gheobhfar torthaí aisteacha le luachanna diúltacha"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
-msgstr "xor(%lf, %lf): teascófar luachanna codánacha"
+msgstr "xor(%lf, %lf): teascfar luachanna codánacha"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: fuarthas argóint neamhuimhriúil"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
-msgstr "compl(%lf): gheobhfar torthaí aisteacha le luachanna diútlacha"
+msgstr "compl(%lf): gheobhfar torthaí aisteacha le luachanna diúltacha"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
-msgstr "compl(%lf): teascófar luachanna codánacha"
+msgstr "compl(%lf): teascfar luachanna codánacha"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: ní catagóir logánach ceart é `%s'"
@@ -788,15 +785,15 @@ msgstr " cineál anaithnid nóid %d"
 msgid "buffer overflow in genflags2str"
 msgstr "maolán thar maoil i genflags2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "iarracht eagar `%s' a úsáid i gcomhthéacs scálach"
 
 #: eval.c:733
-#, fuzzy, c-format
+#, c-format
 msgid "for loop: array `%s' changed size from %ld to %ld during loop execution"
-msgstr "lúb for: d'athraigh méid an eagair `%s' ó %d go %d i lár na lúibe"
+msgstr "lúb for: d'athraigh méid an eagair `%s' ó %ld go %ld i lár na lúibe"
 
 #: eval.c:754
 msgid "`break' outside a loop is not portable"
@@ -834,7 +831,7 @@ msgstr "ní féidir glaoigh ar `nextfile' ó riail CRÍOCH"
 msgid "statement has no effect"
 msgstr "níl aon éifeacht ag an ráiteas"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "ní féidir ainm feidhme `%s' a úsáid mar athróg nó eagar"
@@ -842,12 +839,12 @@ msgstr "ní féidir ainm feidhme `%s' a úsáid mar athróg nó eagar"
 #: eval.c:959 eval.c:965
 #, c-format
 msgid "reference to uninitialized argument `%s'"
-msgstr "tagairt do argóint nach bhfuil túsaithe `%s'"
+msgstr "tagairt d'argóint nach bhfuil túsaithe `%s'"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
-msgstr "tagairt do athróg nach bhfuil túsaithe `%s'"
+msgstr "tagairt d'athróg nach bhfuil túsaithe `%s'"
 
 #: eval.c:1120
 msgid ""
@@ -855,44 +852,44 @@ msgid ""
 "another!"
 msgstr "comhchaitéiniú: d'athraigh éifeachtaí sloinn amháin fad ceann eile!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "sannadh úsáidte i gcomhthéacs coinníollach"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "iarracht roinnt le nialas a dhéanamh"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "iarracht roinnt le nialas a dhéanamh i `%%'"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "cineál neamhcheadaithe (%s) i tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "iarracht roinnt le nialas a dhéanamh i `/='"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "iarracht roinnt le nialas a dhéanamh i `%%='"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "glaodh ar fheidhm `%s' le níos mó argóintí nó mar a bhí fógartha"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "feidhm `%s' gan sainmhíniú"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -903,702 +900,727 @@ msgstr ""
 "\t# Cruach an Glaoigh ar an bhFeidhm:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- príomh  --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "iarracht tagairt a fháil ó luach neamhuimhriúil"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "iarracht tagairt a fháil ó theaghrán neamhnitheach"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "iarracht rochtain a dhéanamh ar réimse %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
-msgstr "ní féidir sannachán a dhéanamh le toradh ó feidhm insuite"
+msgstr "ní féidir sannachán a dhéanamh le toradh ó fheidhm insuite"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "is feabhsúchán gawk é `IGNORECASE'"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "is feabhsúchán gawk é `BINMODE'"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
-msgstr "droch sonraíocht`%sFMT' `%s'"
+msgstr "drochshonraíocht`%sFMT' `%s'"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
-msgstr "ag múchadh `--lint' de bharr sannachán go `LINT'"
+msgstr "`--lint' á mhúchadh de bharr sannachán go `LINT'"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "is feabhsúchán gawk é `extension'"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: ní féidir oscailt `%s' (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: leabharlann `%s': ní féidir glaoigh ar fheidhm `%s' (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
-msgstr ""
+msgstr "extension: ainm feidhme in easnamh"
 
-#: ext.c:107
-#, fuzzy, c-format
+#: ext.c:110
+#, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
-msgstr "extension: leabharlann `%s': ní féidir glaoigh ar fheidhm `%s' (%s)\n"
+msgstr "extension: carachtar neamhcheadaithe `%c' in ainm na feidhme `%s'"
 
-#: ext.c:113
-#, fuzzy, c-format
+#: ext.c:116
+#, c-format
 msgid "extension: can't redefine function `%s'"
-msgstr "extension: ní féidir oscailt `%s' (%s)\n"
+msgstr "extension: ní féidir feidhm `%s' a shainmhíniú arís"
 
-#: ext.c:117
-#, fuzzy, c-format
+#: ext.c:120
+#, c-format
 msgid "extension: function `%s' already defined"
-msgstr "feidhm `%s' gan sainmhíniú"
+msgstr "extension: sainmhíníodh an fheidhm `%s' cheana"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
-msgstr ""
+msgstr "extension: ní féidir insuite gawk `%s' a úsáid mar ainm feidhme"
 
-#: ext.c:124
-#, fuzzy, c-format
+#: ext.c:127
+#, c-format
 msgid "extension: function name `%s' previously defined"
-msgstr "ainm feidhme `%s' sainmhínithe chéana"
+msgstr "extension: ainm feidhme `%s' sainmhínithe cheana"
 
-#: ext.c:201
-#, fuzzy, c-format
+#: ext.c:204
+#, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
-msgstr "tá sainiú ag an bhfeidhm `%s' ach ní ghlaodh é"
+msgstr "ní cheadaíonn feidhm `%s' níos mó ná %d argóint"
 
-#: ext.c:204
-#, fuzzy, c-format
+#: ext.c:207
+#, c-format
 msgid "function `%s': missing argument #%d"
-msgstr "feidhm `%s' gan sainmhíniú"
+msgstr "feidhm `%s': argóint #%d ar iarraidh"
 
-#: ext.c:214
-#, fuzzy, c-format
+#: ext.c:217
+#, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
-msgstr "iarracht scálach '%s' a úsáid mar eagar"
+msgstr "feidhm `%s': argóint #%d: iarracht scálach a úsáid mar eagar"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
-msgstr ""
+msgstr "feidhm `%s': argóint #%d: iarracht scálach a úsáid mar eagar"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Oibríocht Gan Tacaíocht"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF socraithe go luach diúltach"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "scoilt: ní eagar é an dara hargóint"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
-msgstr "scoilt: is feabhsúchán gawk é an teaghrán neamhnitheach don tríú arg"
+msgstr ""
+"scoilt: is feabhsúchán gawk é an teaghrán neamhnitheach don tríú hargóint"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "is feabhsúchán gawk é `FIELDWIDTHS'"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
-msgstr ""
+msgstr "luach FIELDWIDTHS neamhbhailí cóngarach le `%s'"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "is feabhsúchán gawk é an teaghrán neamhnitheach do `FS'"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "ní thacaíonn sean-awk le slonn ionadaíochta mar luach de `FS'"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tá an rogha `%s' débhríoch\n"
+msgstr "%s: Tá an rogha `%s' débhríoch\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ní cheadaítear argóint i ndiaidh an rogha `--%s'\n"
+msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `--%s'\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ní cheadaítear argóint i ndiaidh an rogha `%c%s'\n"
+msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `%c%s'\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ní foláir argóint don rogha `%s'\n"
+msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: rogha anaithnid `--%s'\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: rogha anaithnid `%c%s'\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: rogha neamhcheadaithe -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: rogha neamhbhailí -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ní foláir argóint don rogha -- %c\n"
+msgstr "%s: tá argóint de dhíth i ndiaidh na rogha -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Tá an rogha `-W %s' débhríoch\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ní cheadaítear argóint i ndiaidh an rogha `-W %s'\n"
+msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "ní féidir `%s' a oscailt chun é a léamh (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "dúnadh fd %d (`%s') teipthe (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "cineál crainn %s neamhbhailí san atreorú()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "níl ach luach uimhriúil ag an slonn in atreorú `%s'"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "tá luach teaghráin neamhnitheach ag an slonn in atreorú `%s'"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "seans gur toradh sloinn loighciúil é an comhadainm `%s' don atreorú `%s'"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "meascán neamhriachtanach de `>' agus `>>' do chomhad `%.*s'"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
-msgstr "ní féidir píopa `%s' a oscailt do aschur (%s)"
+msgstr "ní féidir píopa `%s' a oscailt d'aschur (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
-msgstr "ní féidir píopa `%s' a oscailt do ionchur (%s)"
+msgstr "ní féidir píopa `%s' a oscailt d'ionchur (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "ní comhadlann é an comhad `%s'"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
-msgstr "ní féidir an soicéad déthreo `%s' a oscailt do ionchur/aschur (%s)"
+msgstr "ní féidir an soicéad déthreo `%s' a oscailt d'ionchur/aschur (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
-msgstr "ní féidir an píopa déthreo `%s' a oscailt do ionchur/aschur (%s)"
+msgstr "ní féidir an píopa déthreo `%s' a oscailt d'ionchur/aschur (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "ní féidir atreorú ó `%s' (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "ní féidir atreorú go `%s' (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
-"tagtha chuig teorainn córais do chomhadlanna oscailte: ag tosnú "
+"tagtha chuig teorainn an chórais do chomhadlanna oscailte: ag tosú "
 "tuairisceoirí na gcomhadlann a ilphléacsadh"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "dúnadh `%s' teipthe (%s)."
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "tá an iomarca píopaí nó comhadlanna ionchuir oscailte"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: tá `to' nó `from' de dhíth mar dara hargóint"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
-msgstr "close: ní comhad oscailte, píopa nó comhphróiséas é `%.*s'"
+msgstr "close: ní comhad oscailte, píopa nó comhphróiseas é `%.*s'"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
-msgstr "dúnadh atreoraithe nach n-osclóadh ariamh"
+msgstr "dúnadh atreoraithe nach n-osclóadh riamh"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: níl atreorú `%s' oscailte le `|&', rinneadh neamhaird ar an dara "
 "hargóint"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "stádas teipfhulangach (%d) ar dúnadh an phíopa `%s' (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "stádas teipfhulangach (%d) ar dúnadh an chomhaid `%s' (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "ní fhuarthas dúnadh léir an tsoicéid `%s'"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
-msgstr "ní fhuarthas dúnadh léir an chomhphróiseis `%s'"
+msgstr "ní fhuarthas dúnadh léir an chomhphróisis `%s'"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "ní fhuarthas dúnadh léir an phíopa `%s'"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "ní fhuarthas dúnadh léir an chomhaid `%s'"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
-msgstr "earráid agus ag scríobh go haschur caighdeánach (%s)"
+msgstr "earráid agus aschur caighdeánach á scríobh (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
-msgstr "earráid agus ag scríobh go hearráid caighdeánach (%s)"
+msgstr "earráid agus earráid caighdeánach á scríobh (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "sruthladh píopa `%s' teipthe (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
-msgstr "sruthladh comhphróseis an phíopa go `%s' teipthe (%s)."
+msgstr "sruthladh comhphróisis an phíopa go `%s' teipthe (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "sruthladh comhaid `%s' teipthe (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "port logánta %s neamhbhailí i `/inet'"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr "eolas neamhbhailí faoin chianósta agus port (%s, %s)"
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "tá brón orm, níl an cliant /inet/raw réidh go fóill"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "`/inet/raw' ceadaithe do root amháin."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "tá brón orm, níl an freastalaí /inet/raw ré go fóill"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "ní fhuarthas fíor phrótacal sa chomhadainm speisialta `%s'"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "níl an comhadainm speisialta `%s' iomlán"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "port logánta neamhbhailí i `%s'"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "tá ainm cianóstaigh de dhíth ag `/inet'"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "tá cianphort de dhíth ag `/inet'"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "cianphort neamhbhailí i `%s'"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "cumarsáid TCP/IP gan tacaíocht"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "ní comhadlann é an comhad `%s'"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "úsáid `PROCINFO[\"%s\"]' in ionad `%s'"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "úsáid `PROCINFO[...]' in ionad `/dev/user'"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "níorbh fhéidir `%s' a oscailt, mód `%s'"
 
-#: io.c:1814
-#, fuzzy, c-format
+#: io.c:1849
+#, c-format
 msgid "close of master pty failed (%s)"
-msgstr "theip ar dúnadh phíopa (%s)"
+msgstr "theip ar dúnadh máistir-pty (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "theip ar dúnadh aschuir caighdeánach i mac teipthe (%s)"
 
-#: io.c:1819
-#, fuzzy, c-format
+#: io.c:1854
+#, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
-msgstr "ag bogadh píopa go haschur caighdeánach i mac teipthe (dup: %s)"
+msgstr ""
+"theip ar bogadh an pty sclábhánta go haschur caighdeánach sa mhac (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
-msgstr "theip ar dúnadh ionchuir caighdeánach i mac teipthe (%s)"
+msgstr "theip ar dúnadh ionchuir caighdeánach i mac (%s)"
 
-#: io.c:1824
-#, fuzzy, c-format
+#: io.c:1859
+#, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
-msgstr "ag bogadh píopa go ionchur caighdeánach i mac teipthe (dup: %s)"
+msgstr ""
+"theip ar bogadh an pty sclábhánta go hionchuir caighdeánach sa mhac (dup: %s)"
 
-#: io.c:1826 io.c:1845
-#, fuzzy, c-format
+#: io.c:1861 io.c:1880
+#, c-format
 msgid "close of slave pty failed (%s)"
-msgstr "theip ar dúnadh phíopa (%s)"
+msgstr "theip ar dúnadh an pty sclábhánta (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
-msgstr "ag bogadh píopa go haschur caighdeánach i mac teipthe (dup: %s)"
+msgstr "theip ar bhogadh píopa go haschur caighdeánach i mac (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
-msgstr "ag bogadh píopa go ionchur caighdeánach i mac teipthe (dup: %s)"
+msgstr "theip ar bhogadh píopa go hionchur caighdeánach i mac (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
-msgstr "theip ar dul ar ais go haschur caighdeánach i máthair teipthe\n"
+msgstr "theip ar dhul ar ais go haschur caighdeánach i máthair teipthe\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
-msgstr "theip ar dul ar ais go ionchur caighdeánach i máthair teipthe\n"
+msgstr "theip ar dhul ar ais go hionchur caighdeánach i máthair teipthe\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "theip ar dúnadh phíopa (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "`|&' gan tacaíocht"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "ní féidir píopa `%s' a oscailt (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "ní féidir mac a dhéanamh do `%s' (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "tá comhad sonraí `%s' folamh"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
-msgstr ""
+msgstr "níorbh fhéidir níos mó cuimhne ionchuir a leithdháileadh"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "earráid ag léamh comhad aschuir `%s': %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "is feabhsúchán gawk é an luach ilcharachtar 'RS'"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "`-m[fr]' rogha neamhábhartha i ngawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "úsáid rogha -m: `-m[fr] nnn'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: rogha `-W %s' anaithnid, rinneadh neamhshuim air\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
-msgstr "rinneadh neamhshuim ar argóint folamh go `--source'"
+msgstr "rinneadh neamhshuim ar argóint fholamh go `--source'"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "athróg thimpeallachta `POSIXLY_CORRECT' socraithe: ag lasadh `--posix'"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "sáraíonn `--posix' `--traditional'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "sáraíonn `--posix'/`--traditional' `--non-decimal-data'"
 
-#: main.c:487
-#, fuzzy, c-format
+#: main.c:501
+#, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "seans gur neamhdhaingean é ag rith %s setuid root"
 
-#: main.c:528
-#, fuzzy, c-format
+#: main.c:542
+#, c-format
 msgid "can't set binary mode on stdin (%s)"
-msgstr "ní féidir mód a shocrú ar stdin (%s)"
+msgstr "ní féidir mód dénártha a shocrú ar stdin (%s)"
 
-#: main.c:531
-#, fuzzy, c-format
+#: main.c:545
+#, c-format
 msgid "can't set binary mode on stdout (%s)"
-msgstr "ní féidir mód a shocrú ar stdout (%s)"
+msgstr "ní féidir mód dénártha a shocrú ar stdout (%s)"
 
-#: main.c:533
-#, fuzzy, c-format
+#: main.c:547
+#, c-format
 msgid "can't set binary mode on stderr (%s)"
-msgstr "ní féidir mód a shocrú ar stderr (%s)"
+msgstr "ní féidir mód dénártha a shocrú ar stderr (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "níl aon téacs sa ríomhchlár!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Úsáid: %s [roghanna cineál POSIX nó GNU] -f clárchomhad [--] comhad ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Úsáid: %s [roghanna cineál POSIX nó GNU] [--] %críomhchlár%c comhad ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "roghanna POSIX:\t\tGNU roghanna fada:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f comhad\t\t--file=progfile\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v athróg=luach\t\t--assign=athróg=luach\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] luach\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=comhad]\t--dump-variables[=comhad]\n"
 
-#: main.c:681
-#, fuzzy
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
-msgstr "\t-W profile[=comhad]\t--profile[=comhad]\n"
+msgstr "\t-W exec=comhad\t\t--exec=comhad\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=comhad]\t--profile[=comhad]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=program-text\t--source=program-text\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr "\t-W use-lc-numeric\t--use-lc-numeric\n"
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
-#, fuzzy
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
 "section `Reporting Problems and Bugs' in the printed version.\n"
 "\n"
-msgstr "sa rannán `Reporting Problems and Bugs' sa leagan faoi chló.\n"
+msgstr ""
+"\n"
+"Chun tuairiscí fabhtanna a sheoladh, féach ar `Bugs' sa `gawk.info', atá\n"
+"sa rannán `Reporting Problems and Bugs' sa leagan faoi chló.\n"
+"\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
+"is teanga é gawk a scanann agua a phróiseáileann patrúin.\n"
+"De réir réamhsocraithe léann sé ionchur caighdeánach agus scríobhann sé go "
+"haschur caighdeánach.\n"
+"\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
+"Samplaí:\n"
+"\tgawk '{ sum += $1 }; END { print sum }' comhad\n"
+"\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
-"Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
+"Copyright © 1989, 1991-%d Free Software Foundation.\n"
 "\n"
-"Is saorbhogearra an ríomhchlár seo; is féidir leat é a scaipeadh agus/nó\n"
+"Is saorbhogearra é an ríomhchlár seo; is féidir leat é a scaipeadh agus/nó\n"
 "a athrú de réir na gcoinníollacha den GNU General Public License mar atá\n"
-"foilsithe ag an Free Software Foundation; faoi leagan 2 den cheadúnas,\n"
+"foilsithe ag an Free Software Foundation; faoi leagan 3 den cheadúnas,\n"
 "nó (más mian leat) aon leagan níos déanaí.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1607,63 +1629,62 @@ msgid ""
 "\n"
 msgstr ""
 "Scaiptear an ríomhchlár seo le súil go mbeidh sé áisiúil,\n"
-"ach GAN AON BARÁNTA; go fiú gan an barántas intuigthe de\n"
-"INDÍOLTACHT nó FEILIÚNACHT DO FHEIDHM AR LEITH.  Féach ar an\n"
+"ach GAN AON BARÁNTA; go fiú gan an barántas intuigthe\n"
+"d'INDÍOLTACHT nó FEILIÚNACHT D'FHEIDHM AR LEITH.  Féach ar an\n"
 "GNU General Public License chun níos mó sonraí a fháil.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
-"Ba chomhair go mbeifeá tar éis cóip den GNU General Public License a fháil\n"
-"in éineacht leis an ríomhchlár seo; mura bhfuair, scríobh chuig an\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
-"Boston, MA 02110-1301, USA.\n"
+"Ba chóir go mbeifeá tar éis cóip den GNU General Public License\n"
+"a fháil in éineacht leis an ríomhchlár seo; mura bhfuair,\n"
+"féach ar http://www.gnu.org/licenses/.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "ní athraíonn -Ft FS go táb san awk POSIX"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
+"%s: níl an argóint `%s' go `-v' san fhoirm `var=value'\n"
+"\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
-msgstr ""
+msgstr "ní ainm athróige dleathúil é `%s'"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
-msgstr ""
+msgstr "ní ainm athróige é `%s', ag lorg comhad `%s=%s'"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "eisceacht snámhphointe"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
-msgstr "earráid marfach: earráid inmheánach"
+msgstr "earráid mharfach: earráid inmheánach"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "níl aon fd %d réamhoscailte"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "níorbh fhéidir /dev/null a réamhoscailt do fd %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "ní féidir na grúpaí a aimsiú: %s"
@@ -1685,23 +1706,28 @@ msgstr "earráid: "
 msgid "fatal: "
 msgstr "marfach: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "ní féidir teaghrán a thiontú go snámhphointe"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "cúlslais ag deireadh an teaghráin"
 
-#: node.c:604
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "ní thacaíonn sean-awk le seicheamh éalaithe `\\%c'"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "ní cheadaíonn POSIX éalaithe `\\x'"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "níl digití heicsidheachúlach sa seicheamh éalaithe `\\x'"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "seicheamh éalaithe `\\%c' úsáidte mar ghnáth `%c'"
@@ -1711,31 +1737,31 @@ msgstr "seicheamh éalaithe `\\%c' úsáidte mar ghnáth `%c'"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s': níorbh fhéidir close-on-exec a shannadh: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
-msgstr "Níorbh fhéidir `%s' a oscailt chun scríoch ann: %s"
+msgstr "Níorbh fhéidir `%s' a oscailt chun scríobh ann: %s"
 
-#: profile.c:467
-#, fuzzy, c-format
+#: profile.c:450
+#, c-format
 msgid "internal error: %s with null vname"
-msgstr "earráid inmheánach: Node_var le vname nialasacha"
+msgstr "earráid inmheánach: %s le vname nialasach"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
-msgstr ""
+msgstr "# úsáidte go hinmheánach mar `delete'"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
-msgstr ""
+msgstr "# is feidhm iarmhíreach é seo atá le luchtú go dinimiciúil"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# cuntas gawk, cruthaíodh %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1744,7 +1770,7 @@ msgstr ""
 "\t# TÚS bloc(anna)\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1753,7 +1779,7 @@ msgstr ""
 "\t# Riail(eacha)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1762,7 +1788,7 @@ msgstr ""
 "\t# CRÍOCH bloc(anna)\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1771,85 +1797,85 @@ msgstr ""
 "\n"
 "\t# Feidhmeanna, i liosta aibítreach\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "cineál gan súil %s i prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
-msgstr "Bua!"
+msgstr "D'éirigh leis"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Níl a leithéid ann"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Slonn ionadaíochta neamhbhailí"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Carachtar neamhbhailí cóimheasa"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Aicme neamhbhailí charachtair"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Cúlslais ag deireadh"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Cúltagairt neamhbhailí"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ nó [^ corr"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( nó \\( corr"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "\\{ corr"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Inneachar neamhbhailí idir \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Deireadh raoin neamhbhailí"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Cuimhne ídithe"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Is neamhbhailí an slonn ionadaíochta roimhe seo"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Deireadh le slonn ionadaíochta gan choinne"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Slonn ionadaíochta rómhór"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") nó \\) corr"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Níl aon slonn ionadaíochta roimhe seo"
 
-#~ msgid "function %s called\n"
-#~ msgstr "glaodh ar fheidhm %s\n"
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "cianphort neamhbhailí i `%s'"
 
 #~ msgid "delete: illegal use of variable `%s' as array"
 #~ msgstr "delete: úsáid neamhdhleathach na hathróige `%s' mar eagar"
@@ -1890,7 +1916,7 @@ msgstr "Níl aon slonn ionadaíochta roimhe seo"
 #~ "ní shannadh `getline' neamhatreoraithe lasmuigh den ghníomh TÚS nó CRÍOCH"
 
 #~ msgid "fptr %x not in tokentab\n"
-#~ msgstr "níl fptr %x ar fáil sa tháb ceadchomharthaí\n"
+#~ msgstr "níl fptr %x ar fáil sa táb ceadchomharthaí\n"
 
 #~ msgid "gsub third parameter is not a changeable object"
 #~ msgstr "ní oibiacht athraitheach é an tríú paraiméadar ionadaíoch gsub"
@@ -1924,5 +1950,8 @@ msgstr "Níl aon slonn ionadaíochta roimhe seo"
 #~ msgid "field %d in FIELDWIDTHS, must be > 0"
 #~ msgstr "caithfidh go bhfuil réimse %d i FIELDWIDTHS > 0"
 
+#~ msgid "function %s called\n"
+#~ msgstr "glaodh ar fheidhm %s\n"
+
 #~ msgid "internal error: file `%s', line %d\n"
 #~ msgstr "earráid inmheánach: comhad `%s', líne %d\n"
diff --git a/po/gawk.pot b/po/gawk.pot
index 3e8f5d13..9a1644ae 100644
--- a/po/gawk.pot
+++ b/po/gawk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,722 +36,734 @@ msgstr ""
 msgid "from %s"
 msgstr ""
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr ""
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr ""
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr ""
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr ""
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr ""
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr ""
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr ""
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr ""
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr ""
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr ""
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr ""
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr ""
 
-#: awkgram.y:313
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr ""
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr ""
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr ""
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr ""
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr ""
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr ""
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr ""
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr ""
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr ""
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr ""
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr ""
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
 
-#: awkgram.y:906
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr ""
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr ""
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr ""
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr ""
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr ""
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr ""
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr ""
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr ""
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr ""
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr ""
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr ""
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr ""
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr ""
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr ""
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr ""
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr ""
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr ""
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr ""
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr ""
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr ""
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr ""
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr ""
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr ""
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr ""
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr ""
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr ""
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr ""
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr ""
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr ""
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr ""
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr ""
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr ""
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr ""
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr ""
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr ""
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr ""
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr ""
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr ""
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr ""
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr ""
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
 "or used as a variable or an array"
 msgstr ""
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr ""
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr ""
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr ""
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr ""
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr ""
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr ""
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr ""
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:472
+#: builtin.c:448
 msgid "`length(array)' is a gawk extension"
 msgstr ""
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr ""
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr ""
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr ""
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr ""
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr ""
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr ""
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr ""
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr ""
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr ""
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr ""
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr ""
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr ""
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr ""
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr ""
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr ""
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr ""
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr ""
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr ""
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr ""
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr ""
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr ""
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
 msgstr ""
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr ""
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr ""
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr ""
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr ""
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr ""
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr ""
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr ""
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr ""
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr ""
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr ""
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr ""
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr ""
@@ -765,7 +777,7 @@ msgstr ""
 msgid "buffer overflow in genflags2str"
 msgstr ""
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr ""
@@ -811,7 +823,7 @@ msgstr ""
 msgid "statement has no effect"
 msgstr ""
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr ""
@@ -821,7 +833,7 @@ msgstr ""
 msgid "reference to uninitialized argument `%s'"
 msgstr ""
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr ""
@@ -832,44 +844,44 @@ msgid ""
 "another!"
 msgstr ""
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr ""
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr ""
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr ""
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr ""
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr ""
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr ""
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr ""
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr ""
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -877,652 +889,665 @@ msgid ""
 "\n"
 msgstr ""
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr ""
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr ""
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr ""
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr ""
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr ""
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr ""
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr ""
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr ""
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr ""
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr ""
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr ""
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr ""
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr ""
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr ""
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr ""
 
-#: ext.c:201
+#: ext.c:204
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr ""
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr ""
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr ""
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr ""
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr ""
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr ""
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr ""
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr ""
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr ""
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr ""
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr ""
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr ""
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr ""
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr ""
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr ""
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr ""
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr ""
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr ""
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr ""
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr ""
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr ""
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr ""
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr ""
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr ""
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr ""
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr ""
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr ""
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr ""
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr ""
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr ""
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr ""
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr ""
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1205
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr ""
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr ""
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr ""
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr ""
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr ""
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr ""
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr ""
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr ""
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr ""
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr ""
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr ""
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr ""
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr ""
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr ""
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr ""
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr ""
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr ""
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr ""
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr ""
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr ""
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr ""
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr ""
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr ""
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr ""
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr ""
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr ""
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr ""
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr ""
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr ""
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr ""
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr ""
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr ""
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr ""
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr ""
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr ""
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr ""
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr ""
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr ""
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr ""
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr ""
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr ""
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr ""
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr ""
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr ""
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr ""
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr ""
 
-#: main.c:681
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr ""
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr ""
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr ""
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr ""
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr ""
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr ""
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr ""
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr ""
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr ""
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr ""
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr ""
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr ""
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr ""
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr ""
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr ""
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1530,33 +1555,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1565,54 +1590,52 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:745
+#: main.c:781
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr ""
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr ""
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr ""
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr ""
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr ""
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr ""
@@ -1634,23 +1657,28 @@ msgstr ""
 msgid "fatal: "
 msgstr ""
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr ""
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr ""
 
-#: node.c:604
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr ""
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr ""
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr ""
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr ""
@@ -1660,131 +1688,131 @@ msgstr ""
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr ""
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr ""
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr ""
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr ""
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr ""
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr ""
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
 "\n"
 msgstr ""
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
 "\n"
 msgstr ""
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
 "\n"
 msgstr ""
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
 "\t# Functions, listed alphabetically\n"
 msgstr ""
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr ""
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr ""
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr ""
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr ""
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr ""
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr ""
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr ""
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr ""
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr ""
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr ""
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr ""
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr ""
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr ""
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr ""
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr ""
diff --git a/po/he.gmo b/po/he.gmo
index 108cfd8c..d98a50c6 100644
--- a/po/he.gmo
+++ b/po/he.gmo
diff --git a/po/he.po b/po/he.po
index 5a3e8bf6..2702ac28 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.1a\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2002-04-28 21:46+0300\n"
 "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
 "Language-Team: Hebrew <eliz@gnu.org>\n"
@@ -36,350 +36,365 @@ msgstr "êøòîë `%s' øàì÷ñá éåâù ùåîéù"
 msgid "from %s"
 msgstr "%s (from %s)"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "ìçåúî åðéàù `%s[\"%s\"]' èðîìàì äééðô"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "`%s' êøòî ïééöîë ä÷éø úæåøçîá ùåîéù"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "`%s' ïééöî ìéëî åðéà `%s' êøòî :delete"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: (ñôåàî) ÷éø\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: (ä÷éø hash úìáè) ÷éø\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: table_size = %d, array_size = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "øèîøô åðéä %s\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: %s-ì (array_ref) äéðôä\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, fuzzy, c-format
 msgid "%s blocks must have an action part"
 msgstr "äìåòô úøãâä ìåìëì áééç END ÷åìá"
 
-#: awkgram.y:211
+#: awkgram.y:218
 #, fuzzy
 msgid "each rule must have a pattern or an action part"
 msgstr "äìåòô úøãâä ìåìëì áééç END ÷åìá"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "`**' øåèøôåàá êîåú åðéà ïùé awk"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "äúøãâä úà úåðùì ïéà ,úéðáåî äéö÷ðåô äðéä `%s'"
 
-#: awkgram.y:313
+#: awkgram.y:328
 #, fuzzy
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "äøòä åðéà êà ,C úôùá äøòä åîë äàøð `/%s/' éøìåâø éåèéá"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "äøòä åðéà êà ,C úôùá äøòä åîë äàøð `/%s/' éøìåâø éåèéá"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "úéìëú íåù äéäú àì äæ éåèéáìù ïëúé"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, fuzzy, c-format
 msgid "`%s' used in %s action"
 msgstr "END åà BEGIN ìù äìåòô úøãâäá `next'-á ùåîéù"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `nextfile'"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "äéö÷ðåô ìù èñ÷èðå÷á àìù `return'-á ùåîéù"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr "`print \"\"' úåéäì íúñä ïî êéøö END åà BEGIN éììëá èåùô `print'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `delete array'"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 #, fuzzy
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `delete array'"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "íéãáåò íðéà íéáìù éáåøî íééðååéë-åã íé÷éôà"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "êøò úîùä úàøåä ìù ïéîé ãöá éøìåâø éåèéá"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "`!~' åà `~' øåèøôåàì ìàîùî éøìåâø éåèéá"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "`**' øåèøôåàá êîåú åðéà ïùé awk"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "äàååùä ìù ïéîé ãöá éøìåâø éåèéá"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "END úìåòô êåúá øãâåî åðéà äééðôä àìì `getline'"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "`**' øåèøôåàá êîåú åðéà ïùé awk"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "úéìéáèøåô äðéà íééøâåñ àìì `length'-ì äàéø÷"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "POSIX ï÷úì ãåâéðá äðéä íééøâåñ àìì `length'-ì äàéø÷"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr ""
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "êøòî ïééöîá éåâù øéáçú ìòá éåèéá"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 #, fuzzy
 msgid "unexpected newline or end of string"
 msgstr "éåôö-éúìá íå÷îá äøåù óåñ"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "äãå÷ôä úøåùî äìá÷úä ä÷éø úéðëú"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "åúàéø÷ íùì `%s' øå÷î õáå÷ úçéúôá (%s) äì÷ú"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "`%s' øå÷î õáå÷î äàéø÷á (%s) äì÷ú"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "÷éø åðéä `%s' øå÷î õáå÷"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "äøåù-óåñ åúá íééúñî åðéà øå÷îä õáå÷"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "õáå÷ä óñá `\\'-á íééúñî øåîâ-éúìá éøìåâø éåèéá"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "øåîâ-éúìá éøìåâø éåèéá"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "õáå÷ä óåñá øåîâ-éúìá éøìåâø éåèéá"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "éìéáèøåô åðéà äøåù êùîäì ïîéñë `\\ #...'-á ùåîéù"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "äøåùá ïåøçà åú åðéàù êåôä ïñëåì"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "`**=' øåèøôåà äùøî åðéà POSIX"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "`**=' øåèøôåàá êîåú åðéà ïùé awk"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "`**' øåèøôåà äùøî åðéà POSIX"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "`**' øåèøôåàá êîåú åðéà ïùé awk"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "ïùé awk-á êîúð åðéà `^=' øåèøôåà"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "ïùé awk-á êîúð åðéà `^' øåèøôåà"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "äøåîâ-éúìá úæåøçî"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "éåèéáá '%c' éåâù åú"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä äðéä `%s'"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "Bell úåãáòî úñøâá awk-ì úéôéöôñ äáçøä åðéä `%s'"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "`%s' äùøî åðéà POSIX"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "ïùé awk-á êîúð åðéà `%s'"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "!òø-òâô áùçð `goto'\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "íéèðîåâøà øôñîë %d ìá÷ì ìåëé åðéà %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `match' ìù éùéìù èðîåâøà"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "úéìëú íåù äì ïéà `%s' ìù ïåøçà èðîåâøàë äòåá÷ úæåøçî"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, fuzzy, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "éåðéù-øá è÷ééáåà åðéà `sub' ìù éùéìù èðîåâøà"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `close' ìù éðù èðîåâøà"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "èðîåâøà úîã÷áù ïåúçú-ó÷î ÷ìñì ùé :dcgettext(_\"...\")-á éåâù ùåîéù"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "èðîåâøà úîã÷áù ïåúçú-ó÷î ÷ìñì ùé :dncgettext(_\"...\")-á éåâù ùåîéù"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "`%s' äéö÷ðåôá %d 'ñî øèîøôì ääæ ,`%s' ,%d 'ñî øèîøô ìù åîù"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "éìáåìâ äðúùî ìò ìéôàî `%s' äéö÷ðåôá `%s' øèîøô"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "äáéúë íùì `%s' úçéúôá (%s) äì÷ú"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "éð÷ú úåàéâù õåøòì çìùð òåöéá ìéôåøô"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "`%s' úøéâñ úòá (%s) äì÷ú"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "!íééîòô äàø÷ð shadow_funcs()"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr ""
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "øèîøô íùë ùîùì ìåëé åðéà äéö÷ðåô íù :`%s' äéö÷ðåôá"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "úøãâåî øáë `%s' íùá äéö÷ðåô"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "úøãâåî äðéàù `%s' äéö÷ðåôì äàéø÷"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "úàø÷ð àì êà ,äøãâåä `%s' äéö÷ðåô"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "éðàéìåá êøò áéðî %d 'ñî øèîøôë òåá÷ éøìåâø éåèéá"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, fuzzy, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -388,383 +403,383 @@ msgstr ""
 ",`(' ïéáì äîù ïéá íéçååø íò `%s' äéö÷ðåôì äàéø÷\n"
 "%s"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s é\"ò \"%s\"-ì äáéúëá (%s) äì÷ú"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "úéèøãðèñ èìô úãéçé"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "äòåãé-éúìá äáéñî"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "øôñî åðéà èðîåâøà :exp"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "øúåîä íåçúá åðéà %g èðîåâøà :exp"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr "äáéúëì àì ,äàéø÷ì çåúô `%s' ÷éôà :õöåçä ï÷åøì ïúéð àì :fflush"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr "äáéúëì àì ,äàéø÷ì çåúô `%s' õáå÷ :õöåçä ï÷åøì ïúéð àì :fflush"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "ìéá÷î êéìäú åà çåúô ÷éôà ,çåúô õáå÷ åðéà `%s' :fflush"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "úæåøçî åðéà ïåùàø èðîåâøà :index"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "úæåøçî åðéà éðù èðîåâøà :index"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "øôñî åðéà èðîåâøà :int"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `delete array'"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "úæåøçî åðéà èðîåâøà :length"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "øôñî åðéà èðîåâøà :log"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "%g éìéìù èðîåâøà íò àø÷ð :log"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "ãçà óàá åà íéèîøåôä ìëá åà øúåî `count$'-á ùåîéù"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "awk ìù íéèîøåôá ùåîéùì øåñà `$'"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "0-î ìåãâ úåéäì áééç `$' ãéì èðîåâøàä äðåî"
 
-#: builtin.c:786
+#: builtin.c:807
 #, fuzzy, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "íéèðîåâøàä ìù ììåëä íøôñîî ìåãâ %d èðîåâøàä äðåî"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "èîøåôá äãå÷ðä éøçà òéôåäì ìåëé åðéà `$'"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "å÷åéã åà äãù áçåø ïééöîá èðîåâøàä äðåî øåáò `$' àöîð àì"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "çðæåä ;awk ìù èîøåôá úåòîùî øñç åðéä `l'"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "POSIX éô-ìò awk ìù èîøåôá òéôåäì ìåëé åðéà `l'"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "çðæåä ;awk ìù èîøåôá úåòîùî øñç åðéä `L'"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "POSIX éô-ìò awk ìù èîøåôá òéôåäì ìåëé åðéà `L'"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "çðæåä ;awk ìù èîøåôá úåòîùî øñç åðéä `h'"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "POSIX éô-ìò awk ìù èîøåôá òéôåäì ìåëé åðéà `h'"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "èîøåôä øåáò íéèðîåâøà ÷éôñî ïéà"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ íéèðîåâøàä éì åøîâð ïàë"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "äøîää úø÷á úåà ìéëî åðéà èîøåôä :[s]printf"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "èîøåôä øåáò íéèðîåâøà éãî øúåé"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "èðîåâøà óà ïéà :printf"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "øôñî åðéà èðîåâøà :sqrt"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "%g éìéìù èðîåâøà íò àø÷ð :sqrt"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "1-á óìçåä ,éåâù åðéä %g äìçúä ïééöî :substr"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "õöå÷é ,íìù øôñî åðéàù, %g äìçúä ïééöî ìù åëøò :substr"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "0-î ìåãâ øôñî åððéà %g êøåà :substr"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "0-î ìåãâ øôñî åððéà %g êøåà :substr"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "õöå÷é ,íìù øôñî åðéàù ,%g êøåà :substr"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "ñôà êøåàá äðéä øå÷îä úæåøçî :substr"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, fuzzy, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "úæåøçîä óåñì øáòî åðéä %d äìçúä ïééöî :substr"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, fuzzy, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
 msgstr ""
 "%d äëøåàå %d ïééöîá äúìéçúù úæåøçî-úúì ÷éôñî åðéà (%d) úæåøçî êøåà :substr"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "úæåøçî åðéà ïåùàø èðîåâøà :strftime"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "ä÷éø èîøåô úæåøçî :strftime"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "øôñî åðéà éðù èðîåâøà :strftime"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "úæåøçî åðéà èðîåâøà :mktime"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "úæåøçî åðéà èðîåâøà :system"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, fuzzy, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "`%s' ìçåúî-éúìá äðúùîì äéðôä"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "úæåøçî åðéà èðîåâøà :tolower"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "úæåøçî åðéà èðîåâøà :toupper"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "øôñî åðéà ïåùàø èðîåâøà :atan2"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "øôñî åðéà éðù èðîåâøà :atan2"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "øôñî åðéà èðîåâøà :sin"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "øôñî åðéà èðîåâøà :cos"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "øôñî åðéà èðîåâøà :srand"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "êøòî åðéà éùéìù èðîåâøà :match"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "1-á óìçåä 0 åëøòù éùéìù èðîåâøà :gensub"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "øôñî åðéà ïåùàø èðîåâøà :lshift"
 
-#: builtin.c:2717
+#: builtin.c:2768
 #, fuzzy
 msgid "lshift: received non-numeric second argument"
 msgstr "øôñî åðéà éðù èðîåâøà :strftime"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "úåéåôö-éúìá úåàöåú åáéðé íééìéìù íéëøò :lshift(%lf, %lf)"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "åööå÷é íéøåáù íéëøò :lshift(%lf, %lf)"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "úåéåôö-éúìá úåàöåú áéðé éãî ìåãâ äææä øåòéù :lshift(%lf, %lf)"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "øôñî åðéà ïåùàø èðîåâøà :rshift"
 
-#: builtin.c:2755
+#: builtin.c:2806
 #, fuzzy
 msgid "rshift: received non-numeric second argument"
 msgstr "øôñî åðéà éðù èðîåâøà :strftime"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "úåéåôö-éúìá úåàöåú åáéðé íééìéìù íéëøò :rshift(%lf, %lf)"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "åööå÷é íéøåáù íéëøò :rshift(%lf, %lf)"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "úåéåôö-éúìá úåàöåú áéðé éãî ìåãâ äææä øåòéù :rshift(%lf, %lf)"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "øôñî åðéà ïåùàø èðîåâøà :and"
 
-#: builtin.c:2793
+#: builtin.c:2844
 #, fuzzy
 msgid "and: received non-numeric second argument"
 msgstr "øôñî åðéà éðù èðîåâøà :atan2"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "úåéåôö-éúìá úåàöåú åáéðé íééìéìù íéëøò :and(%lf, %lf)"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "åööå÷é íéøåáù íéëøò :and(%lf, %lf)"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "øôñî åðéà ïåùàø èðîåâøà :or"
 
-#: builtin.c:2829
+#: builtin.c:2880
 #, fuzzy
 msgid "or: received non-numeric second argument"
 msgstr "øôñî åðéà éðù èðîåâøà :atan2"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "úåéåôö-éúìá úåàöåú åáéðé íééìéìù íéëøò :or(%lf, %lf)"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "åööå÷é íéøåáù íéëøò :or(%lf, %lf)"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "øôñî åðéà ïåùàø èðîåâøà :xor"
 
-#: builtin.c:2865
+#: builtin.c:2916
 #, fuzzy
 msgid "xor: received non-numeric second argument"
 msgstr "øôñî åðéà éðù èðîåâøà :atan2"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "úåéåôö-éúìá úåàöåú åáéðé íééìéìù íéëøò :xor(%lf, %lf)"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "åööå÷é íéøåáù íéëøò :xor(%lf, %lf)"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "øôñî åðéà èðîåâøà :compl"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "úåéåôö-éúìá úåàöåú áéðé éìéìù êøò :compl(%lf)"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "õöå÷é øåáù êøò :compl(%lf)"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "äðé÷ú íå÷éî úééøåâè÷ åðéà `%s' :dcgettext"
@@ -778,7 +793,7 @@ msgstr "%d ääåæî-éúìá âåñ ìòá node"
 msgid "buffer overflow in genflags2str"
 msgstr "genflags2str-á õöåç úùéìâ"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "øàì÷ñ ùøåãä èñ÷èðå÷á `%s' êøòîá ùåîéù ïåéñð"
@@ -824,7 +839,7 @@ msgstr "END éììë êåúî `nextfile'-ì àåø÷ì ïéà"
 msgid "statement has no effect"
 msgstr "úéìëú-úìåèð äàøåä"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "êøòî åà äðúùîë `%s' äéö÷ðåô íùá ùîúùäì ïéà"
@@ -834,7 +849,7 @@ msgstr "êøòî åà äðúùîë `%s' äéö÷ðåô íùá ùîúùäì ïéà"
 msgid "reference to uninitialized argument `%s'"
 msgstr "`%s' ìçåúî-éúìá èðîåâøàì äéðôä"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "`%s' ìçåúî-éúìá äðúùîì äéðôä"
@@ -846,44 +861,44 @@ msgid ""
 msgstr ""
 "!øçà éåèéá ìù åëøåà éåðéùì åîøâ ãçà éåèéá áåùéç ìù éàåì-úåòôåú :concatenation"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "éàðú ìù èñ÷èðå÷á äîùäá ùåîéù"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "ñôàá ä÷åìç ïåéñð"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "`%%'-á ñôàá ä÷åìç ïåéñð"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "tree_eval-á (%s) éåâù âåñ"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "`/='-á ñôàá ä÷åìç ïåéñð"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "`%%='-á ñôàá ä÷åìç ïåéñð"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "äúæøëäá øùàî íéèðîåâøà øúåé íò `%s' äéö÷ðåôì äàéø÷"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "úøãâåî äðéà `%s' äéö÷ðåô"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -894,661 +909,675 @@ msgstr ""
 "\t# :úåéö÷ðåôì úåàéø÷ä úéðñçî\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- main --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "øôñî åðéàù êøò úåòöîàá äãùì äéðôä ïåéñð"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "ä÷éø úæåøçî úåòöîàá äãùì äéðôä ïåéñð"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "%d 'ñî äãùì äùéâ ïåéñð"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "úéðáåî äéö÷ðåô ìù äàöåúá êøò áéöäì ïéà"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `IGNORECASE'"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `BINMODE'"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "äðé÷ú `%sFMT' úøãâä åðéà `%s'"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "`LINT'-ì êøò úîùä á÷ò `--lint' ìèáî"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä äðéä `extension'"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "`%s' úçéúô úòá (%s) äì÷ú äòøéà :extension\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "`%s' äéøôñî `%s' äéö÷ðåôì äàéø÷á (%s) äì÷ú äòøéà :extension\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:107
+#: ext.c:110
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "`%s' äéøôñî `%s' äéö÷ðåôì äàéø÷á (%s) äì÷ú äòøéà :extension\n"
 
-#: ext.c:113
+#: ext.c:116
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "`%s' úçéúô úòá (%s) äì÷ú äòøéà :extension\n"
 
-#: ext.c:117
+#: ext.c:120
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "úøãâåî äðéà `%s' äéö÷ðåô"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:124
+#: ext.c:127
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "úøãâåî øáë `%s' íùá äéö÷ðåô"
 
-#: ext.c:201
+#: ext.c:204
 #, fuzzy, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "úàø÷ð àì êà ,äøãâåä `%s' äéö÷ðåô"
 
-#: ext.c:204
+#: ext.c:207
 #, fuzzy, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "úøãâåî äðéà `%s' äéö÷ðåô"
 
-#: ext.c:214
+#: ext.c:217
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "êøòîë `%s' øàì÷ñá éåâù ùåîéù"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "úëîúð äðéà åæ äìåòô"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "éìéìù êøò ìáé÷ NF"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "êøòî åðéà `split' ìù éðùä èðîåâøàä"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä äðéä `split'-ì éùéìù èðåîâøàë úñôåàî úæåøçî"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä åðéä `FIELDWIDTHS'"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä äðéä `FS'-ë úñôåàî úæåøçî"
 
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "`**' øåèøôåàá êîåú åðéà ïùé awk"
+
 # The way the leading "%s:" is translated is a terrible kludge,
 # but what can I do?  FIXME.
-#: getopt.c:571 getopt.c:590
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n"
 
 # "Illegal" is against GNU coding standards, but since Posix requires
 # it (see the comment below), let's say that in Hebrew as well...
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "åúàéø÷ íùì `%s' õáå÷ úçéúôá (%s) äì÷ú"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "(%d èìô/èì÷ õåøò) `%s' úøéâñá (%s) äì÷ú"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "redirect() äéö÷ðåôá %s éåâù õò âåñ"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "ãáìá éøîåð êøò áéðî `%s' èìô/èì÷ úééðôäá éåèéá"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "ä÷éø úæåøçî áéðî `%s' èìô/èì÷ úééðôäá éåèéá"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr "éâåì éåèéá ìù äàöåú úåéäì ìåìò `%s' õáå÷ íù `%s' èìô/èì÷ úééðôäá"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "`%.*s' õáå÷ øåáò `>>'-á ïäå `>'-á ïä øúåéî ùåîéù"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "èìô êøåöì `%s' ÷éôà úçéúôá (%s) äì÷ú"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "èì÷ êøåöì `%s' ÷éôà úçéúôá (%s) äì÷ú"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "äé÷éú åðéä `%s' õáå÷"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr "èìô/èì÷ êøåöì éðååéë-åã (socket) ò÷ùë `%s' úçéúôá (%s) äì÷ú"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "èìô/èì÷ êøåöì éðååéë-åã (pipe) ÷éôàë `%s' úçéúôá (%s) äì÷ú"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "`%s'-î äééðôäá (%s) äì÷ú"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "`%s' ìà äééðôäá (%s) äì÷ú"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr "èìô/èì÷ éöåøò áåáéø úìéçú ;íéçåúô íéöá÷ øôñî ìù úëøòî úìáâîì äòâä"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "`%s' úøéâñá (%s) äì÷ú"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "úéðîæ-åá íéçåúô èì÷ éöá÷ åà (pipes) íé÷éôà éãî øúåé"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "`from' åà `to' úåéäì áééç `close' ìù éðùä èðîåâøàä"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "ìéá÷î êéìäú åà çåúô ÷éôà ,çåúô õáå÷ åðéà `%.*s' :close"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "íìåòî äçúôð àìù äééðôä úøéâñ"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr "çðæåä éðùä èðîåâøàä ,`|&' é\"ò äçúôð àì `%s' äééðôä"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "(%d äì÷ú ãå÷) `%s'-ì ÷éôà úøéâñá (%s) äì÷ú"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "(%d äì÷ú ãå÷) `%s' õáå÷ úøéâñá (%s) äì÷ú"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "ùøåôîá øâñð àì (socket) `%s' ò÷ù"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "ùøåôîá øâñð àì (co-process) `%s' ìéá÷î êéìäú"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "ùøåôîá øâñð àì (pipe) `%s' ÷éôà"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "ùøåôîá øâñð àì `%s' õáå÷"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "éð÷ú èìô õåøòì äáéúëá (%s) äì÷ú"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "éð÷ú úåàéâù õåøòì äáéúëá (%s) äì÷ú"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "`%s'-ì ÷éôà ìù õöåç ïå÷éøá (%s) äì÷ú"
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "`%s'-ì ìéá÷î êéìäú ÷éôà ìù õöåç ïå÷éøá (%s) äì÷ú"
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "`%s' ìù õáå÷ éðåúð õöåç ïå÷éøá (%s) äì÷ú"
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "`%s'-á äéåâù úéîå÷î äàéöé"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "ïëåî íøè /inet/raw çå÷ì ,íéøòèöî"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "ãáìá root ùîúùîì øúåî `inet/raw'-á ùåîéù"
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "ïëåî íøè /inet/raw úøù ,íéøòèöî"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "`%s' ãçåéî õáå÷ íùá ääåæî-éúìá åà øñç ìå÷åèåøô"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "íìù åðéà `%s' ãçåéî õáå÷"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "`%s'-á äéåâù úéîå÷î äàéöé"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "`/inet' øåáò ÷çåøî çøàî-áùçî íù øéãâäì äáåç"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "`/inet' øåáò ú÷çåøî äàéöé øéãâäì äáåç"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "`%s'-á äéåâù ú÷çåøî äàéöé"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP úøåù÷úá äëéîú ïéà"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "äé÷éú åðéä `%s' õáå÷"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "`PROCINFO[\"%s\"]'-á ùîúùäì óéãò `%s' íå÷îá"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "`/dev/user' éðô-ìò óéãò `PROCINFO[...]'-á ùåîéù"
 
 # This probably sounds nonsensical in Hebrew, but what can I do,
 # given the original message text?
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "`%s' øåáò `%s' äìåòô ïôåà úçéúôá ïåìùë"
 
-#: io.c:1814
+#: io.c:1849
 #, fuzzy, c-format
 msgid "close of master pty failed (%s)"
 msgstr "÷éôà úøéâñá (%s) äì÷ú"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "úá-úéðëúá stdout úøéâñá (%s) äì÷ú"
 
-#: io.c:1819
+#: io.c:1854
 #, fuzzy, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "úá-úéðëúá stdout-ì ÷éôà ìåôëùá (dup: %s) äì÷ú"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "úá-úéðëúá stdin úøéâñá (%s) äì÷ú"
 
-#: io.c:1824
+#: io.c:1859
 #, fuzzy, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "úá-úéðëúá stdin-ì ÷éôà ìåôëùá (dup: %s) äì÷ú"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, fuzzy, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "÷éôà úøéâñá (%s) äì÷ú"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "úá-úéðëúá stdout-ì ÷éôà ìåôëùá (dup: %s) äì÷ú"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "úá-úéðëúá stdin-ì ÷éôà ìåôëùá (dup: %s) äì÷ú"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "áà-úéðëúá stdout ÷éôà øåæçùá äì÷ú\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "áà-úéðëúá stdin ÷éôà øåæçùá äì÷ú\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "÷éôà úøéâñá (%s) äì÷ú"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "`|&'-á äëéîú ïéà"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "`%s' ÷éôà úçéúôá (%s) äì÷ú"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "`%s' úá-úéðëúì êéìäú úøéöéá (fork: %s) äì÷ú"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "÷éø åðéä `%s' íéðåúð õáå÷"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "`%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "gawk-ì úéôéöôñ äáçøä äðéä `RS' ìù êøòá íéåú øôñîá äëéîú"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "gawk øåáò éèðååìø åðéà `-m[fr]' ïééôàî"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "`-m[fr] nnn' :-m ïééôàîá ùåîéù ïôåà"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "çðæåä ,%s úéðëú øåáò øëåî åðéà `-W %s' ïééôàî\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "çðæåä `--source'-ì ÷éø èðîåâøà"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "`--posix' ìéòôî :øãâåî `POSIXLY_CORRECT' äáéáñ äðúùî"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--traditional' ìò øáåâ `--posix'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--non-decimal-data' ìò øáåâ `--posix'/`--traditional'"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "òãéî úçèáàá òåâôì äìåìò setuid root-ë %s úöøä"
 
-#: main.c:528
+#: main.c:542
 #, fuzzy, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "stdin úìåòô ïôåà úòéá÷á (%s) äì÷ú"
 
-#: main.c:531
+#: main.c:545
 #, fuzzy, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "stdout úìåòô ïôåà úòéá÷á (%s) äì÷ú"
 
-#: main.c:533
+#: main.c:547
 #, fuzzy, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "stderr úìåòô ïôåà úòéá÷á (%s) äì÷ú"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "!ììë àöîðá äéä àì úéðëú ìù èñ÷è"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "%s [GNU åà POSIX ïåðâñá íéðééôàî] -f úéðëú-íù [--] õáå÷-íù ... :ùåîéù ïôåà\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "%s [GNU åà POSIX ïåðâñá íéðééôàî] [--] %cúéðëú%c õáå÷-íù ... :ùåîéù ïôåà\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr ":POSIX éðééôàî\t\t:íéëåøà GNU éðééôàî\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f úéðëú-õáå÷\t\t--file=úéðëú-õáå÷\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F úåãù-ãéøôî\t\t--field-separator=úåãù-ãéøôî\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v äðúùî=êøò\t\t--assign=äðúùî=êøò\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] êøò\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=õáå÷-íù]\t--dump-variables[=õáå÷-íù]\n"
 
-#: main.c:681
+#: main.c:706
 #, fuzzy
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W profile[=õáå÷-íù]\t--profile[=õáå÷-íù]\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=õáå÷-íù]\t--profile[=õáå÷-íù]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=úéðëú-èñ÷è\t--source=úéðëú-èñ÷è\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1560,7 +1589,7 @@ msgstr ""
 "       .ñôãåîä êéøãîá `Reporting Problems and Bugs' ä÷ñô\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1569,7 +1598,7 @@ msgstr ""
 ".èñ÷è úåéðáú ìù ãåáéòå äé÷øñì äôù åðéä gawk\n"
 ".éð÷ú èìôì áúåëå éð÷ú èì÷ õåøò àøå÷ àåä ìãçî úøéøáë\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1579,14 +1608,14 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1594,10 +1623,10 @@ msgstr ""
 "\n"
 "óåôëá äúåðùì åà/å äöéôäì íëúåëæ ;úéùôç äðëú äðéä åæ úéðëú\n"
 " é\"ò øåàì àöåéä ,GNU General Public License ïåéùøä éàðúì\n"
-"  íàå  ,ïåéùøä ìù 2 àñøâá íà  ;Free Software Foundation\n"
+"  íàå  ,ïåéùøä ìù 3 àñøâá íà  ;Free Software Foundation\n"
 "        .øúåé úøçåàî àñøâ ìëá (íëì äøåîùä äéöôåàë)\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1610,59 +1639,58 @@ msgstr ""
 ",íéèøôì .úîéåñî úéìëú åæéàì äîàúä åà úåøéçñ ìù\n"
 "       .GNU General Public License-á åðééò àðà\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 ";GNU General Public License ìù ÷úåòá äååìî úåéäì äøåîà åæ úéðëú\n"
 "Free Software Foundation, Inc.-ì åáúë àðà ,åúåà íúìáé÷ àì íà\n"
 ".51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "awk ìù POSIX úñøâá TAB úåéäì FS-ì íøåâ åðéà -Ft"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "äôö äãå÷ð éáåùéçá äâéøç"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "úéîéðô äðëú úàéâù :äøåîç äì÷ú"
 
 # FIXME: I wonder how many people will understand what "fd 2" means.
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "ùàøî çåúô åðéà %d èìô/èì÷ õåøò"
 
 # FIXME: /dev/null might not be known to all.
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "/dev/null-ì %d èìô/èì÷ õåøò çåúôì ïúéð àì"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "%s :úëøòîá íéùîúùî úåöåá÷ ìò òãéî ïéà"
@@ -1688,23 +1716,28 @@ msgstr "error: "
 msgid "fatal: "
 msgstr "fatal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "øôñîì äøîäì úðúéð äðéà úæåøçî"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "úæåøçî óåñá êåôä ïñëåì"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "`**' øåèøôåàá êîåú åðéà ïùé awk"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "`\\x' âåñî äø÷á úåøãñ äùøî åðéà POSIX ï÷ú"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "`\\x' äø÷á úøãñá úåéìîéöãñ÷ä úåøôñá ùîúùäì ïéà"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "éìåìéî åúë ìôåè `\\%c' äø÷á úøãñá `%c' åú"
@@ -1714,31 +1747,31 @@ msgstr "éìåìéî åúë ìôåè `\\%c' äø÷á úøãñá `%c' åú"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s' øåáò close-on-exec ïééôàî úìòôäá (fcntl: %s) äì÷ú"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "äáéúë êøåöì `%s' úçéúô úòá (%s) äì÷ú"
 
-#: profile.c:467
+#: profile.c:450
 #, fuzzy, c-format
 msgid "internal error: %s with null vname"
 msgstr "ñôåàî åìù vname-äù Node_var :úéîéðô äðëú úàéâù"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr ""
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr ""
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# %s êéøàúî gawk ìù ìéôåøô\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1747,7 +1780,7 @@ msgstr ""
 "\t# BEGIN ÷åìá\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1756,7 +1789,7 @@ msgstr ""
 "\t# (íé)ììë\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1765,7 +1798,7 @@ msgstr ""
 "\t# END ÷åìá\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1774,83 +1807,86 @@ msgstr ""
 "\n"
 "\t# úéá-óìà øãñá ,úåéö÷ðåô\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "prec_level-á %s éåâù âåñ"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "äçìöä"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "äîéàúî úæåøçî äàöîð àì"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "éåâù éøìåâø éåèéá"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "øãâåî-éúìá øåãéñ åú"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "íéåú úöåá÷ ìù øãâåî-éúìá íù"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "`\\' éøåçà ïñëåìá íééúñî éøìåâø éåèéá"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "íãå÷ éåèéá-úúì äéåâù äééðôä"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "âåæ-ïá åì ïéàù [^ åà ["
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "âåæ-ïá åì ïéàù \\( åà ("
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "âåæ-ïá åì ïéàù \\{"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\} êåúá éåâù äðáî"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "íéåú íåçú ìù äéåâù äøãâä"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "ïåøëæä øîâð"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "íéé÷ åðéà åà éåâù íãå÷ éøìåâø éåèéá"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "éãî íã÷åî íééúñî éøìåâø éåèéá"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "éãî áëøåî åà ìåãâ éøìåâø éåèéá"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "âåæ-ïá åì ïéàù \\) åà )"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "íãå÷ éøìåâø éåèéá ïéà"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "`%s'-á äéåâù ú÷çåøî äàéöé"
+
 #~ msgid "function %s called\n"
 #~ msgstr "`%s' äéö÷ðåôì äàéø÷\n"
 
diff --git a/po/it.gmo b/po/it.gmo
index 679d5cfc..478e021c 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index fd50f474..3bd40e6f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,14 +1,14 @@
 # Italian messages for GNU Awk
-# Copyright (C) 2002-2005 Free Software Foundation, Inc.
-# Antonio Colombo <azc10@yahoo.com>.
+# Copyright (C) 2002-2007 Free Software Foundation, Inc.
+# Antonio Colombo <azc100@gmail.com>.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 3.1.35\n"
+"Project-Id-Version: gawk 3.1.5h\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
-"PO-Revision-Date: 2005-06-22 14:00+0100\n"
-"Last-Translator: Antonio Colombo <azc10@yahoo.com>\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
+"PO-Revision-Date: 2007-09-30 23:20+0100\n"
+"Last-Translator: Antonio Colombo <azc100@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -34,352 +34,364 @@ msgstr "tentativo di usare scalare '%s' come vettore"
 msgid "from %s"
 msgstr "da %s"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "referenza a elemento non inizializzato `%s[\"%s\"]'"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "l'indice del vettore '%s' è una stringa nulla"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: indice `%s' non presente nel vettore `%s'"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: vuoto (nullo)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: vuoto (zero)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: dimensione_tabella = %d, dimensione_vettore = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: è parametro\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: referenza_vettoriale a %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "blocchi %s richiedono una 'azione'"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "ogni regola deve avere una parte 'espressione' o una parte 'azione'"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "il vecchio awk non supporta più di una regola `BEGIN' o `END'"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' è una funzione interna, non si può ridefinire"
 
-#: awkgram.y:313
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "espressione regolare costante `//' sembra un commento C, ma non lo è"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "espressione regolare costante `/%s/' sembra un commento C, ma non lo è"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "istruzione che può non aver alcun effetto"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "`%s' usato in 'azione' %s"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "`nextfile' è un'estensione gawk"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "`return' usato fuori da una funzione"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr "`print' da solo in BEGIN o END dovrebbe forse essere `print \"\"'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "`delete array' è un'estensione gawk"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(array)' è un'estensione tawk non-portabile"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "valori di 'case' doppi all'interno di uno 'switch': %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr "Valori per difetto doppi all'interno di uno 'switch'"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "'pipelines' multistadio bidirezionali non funzionano"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "espressione regolare usata per assegnare un valore"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "espressione regolare prima di operatore `~' o `!~'"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "il vecchio awk non supporta la parola-chiave `in' se non dopo `for'"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "espressione regolare a destra in un confronto"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "`getline' non re-diretta indefinita dentro 'azione' END"
 
-#: awkgram.y:906
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr "il vecchio awk non supporta vettori multidimensionali"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "chiamata a `length' senza parentesi non portabile"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "chiamata a `length' senza parentesi sconsigliata da POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr "uso di non-vettore come vettore"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "espressione indice invalida"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "carattere 'a capo' o fine stringa inaspettati"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "programma nullo sulla linea comandi"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "non riesco ad aprire file sorgente `%s' in lettura (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "non riesco a leggere file sorgente `%s' (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "file sorgente `%s' vuoto"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "file sorgente non termina con carattere 'a capo'"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "espressione regolare non completata termina con `\\' a fine file"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: modificatore di espressione regolare tawk `/.../%c' non valido in "
 "gawk"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "modificatore di espressione regolare tawk `/.../%c' non valido in gawk"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "espressione regolare non completata"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "espressione regolare non completata a fine file"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "uso di `\\ #...' continuazione linea non portabile"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "'\\' non è l'ultimo carattere della linea"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX non permette l'operatore `**='"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "il vecchio awk non supporta l'operatore `**='"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX non permette l'operatore `**'"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "il vecchio awk non supporta l'operatore `**'"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "l'operatore `^=' non è supportato nel vecchio awk"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "l'operatore `^' non è supportato nel vecchio awk"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "stringa non terminata"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "carattere '%c' invalido in un'espressione"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' è un'estensione gawk"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "`%s' è un'estensione Bell Labs"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX non permette `%s'"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' non è supportato nel vecchio awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' considerato pericoloso!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d invalido come numero di argomenti per %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: il terzo argomento è un'estensione gawk"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: una stringa come ultimo argomento di 'substitute' non ha effetto"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "il terzo parametro di '%s'  non è un oggetto modificabile"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: il secondo argomento è un'estensione gawk"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "uso scorretto di dcgettext(_\"...\"): togliere il carattere '_' iniziale"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "uso scorretto di dcngettext(_\"...\"): togliere il carattere '_' iniziale"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funzione `%s': parametro #%d, `%s', duplica parametro #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funzione `%s': parametro `%s' nasconde variabile globale"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "non riesco ad aprire `%s' in scrittura (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "mando profilo a 'standard error'"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: 'close' fallita (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() chiamata due volte!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "c'erano variabili nascoste."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funzione `%s': non posso usare nome della funzione come nome parametro"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "funzione di nome `%s' definita in precedenza"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funzione `%s' chiamata ma mai definita"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "funzione `%s' definita ma mai chiamata"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "espressione regolare di valore costante per parametro #%d genera valore "
 "booleano"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -388,199 +400,199 @@ msgstr ""
 "funzione `%s' chiamata con spazio tra il nome e `(',\n"
 "o usata come variabile o vettore"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s a \"%s\" fallita (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "standard output"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "ragione indeterminata"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: argomento non numerico"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argomento %g non accettabile"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: non posso scaricare: 'pipe' `%s' aperta in lettura, non in scrittura"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: non posso scaricare: file `%s' aperto in lettura, non in scrittura"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' non è un file aperto, una 'pipe' o un co-processo"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: il primo argomento non è una stringa"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: il secondo argomento non è una stringa"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: argomento non numerico"
 
-#: builtin.c:472
+#: builtin.c:448
 msgid "`length(array)' is a gawk extension"
 msgstr "`length(array)' è un'estensione gawk"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: l'argomento non è una stringa"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: argomento non numerico"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: argomento negativo %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "'count$' va usato per tutti i formati o per nessuno"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "`$' non permesso nei 'format' awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "il numero di argomento con `$' deve essere > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "numero di argomenti (%ld) maggiore del numero totale di argomenti specificati"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "`$' non permesso dopo un punto nel 'format'"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr ""
 "nessun `$' specificato per larghezza o precisione di un campo posizionale"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`l' non ha senso nei 'format' awk; ignorata"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "`l' non permessa nei 'format' awk POSIX"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`L' non ha senso nei 'format' awk; ignorata"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "`L' non permessa nei 'format' awk POSIX"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`h' non ha senso nei 'format' awk; ignorata"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "`h' non permessa nei 'format' awk POSIX"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: valore %g non accettabile per il 'format' `%%%c'"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "mancano argomenti per completare il 'format'"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ uscito per questo"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: il designatore di 'format' non ha una lettera di controllo"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "troppi argomenti specificati per il 'format'"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: manca argomento"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: argomento non numerico"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: chiamata con argomento negativo %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: indice di partenza %g invalido, uso 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: indice di partenza non intero %g: sarà troncato"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: lunghezza %g non >= 1"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: lunghezza %g non >= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: lunghezza non intera %g: sarà truncata"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: lunghezza %g troppo elevata per indice stringa, tronco a %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: stringa di partenza lunga zero"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: indice di partenza %g oltre la fine della stringa"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -588,182 +600,182 @@ msgstr ""
 "substr: lunghezza %g all'indice di partenza %g supera la lunghezza del primo "
 "argomento (%lu)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftime: il primo argomento non è una stringa"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: 'format' è una stringa nulla"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: il secondo argomento non è numerico"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: l'argomento non è una stringa"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: l'argomento non è una stringa"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referenza a variabile non inizializzata `$%d'"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: l'argomento non è una stringa"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: l'argomento non è una stringa"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: il primo argomento non è numerico"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: il secondo argomento non è numerico"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: l'argomento non è numerico"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: l'argomento non è numerico"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: l'argomento non è numerico"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: il terzo argomento non è un vettore"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: il terzo argomento è 0, trattato come 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: il primo argomento non è numerico"
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: il secondo argomento non è numerico"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): valori negativi daranno risultati strani"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): valori con decimali verranno troncati"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "lshift(%lf, %lf): valori troppo alti daranno risultati strani"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: il primo argomento non è numerico"
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: il secondo argomento non è numerico"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): valori negativi daranno risultati strani"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): valori con decimali verranno troncati"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "rshift(%lf, %lf): valori troppo alti daranno risultati strani"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: il primo argomento non è numerico"
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
 msgstr "and: il secondo argomento non è numerico"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): valori negativi daranno risultati strani"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): valori con decimali verranno troncati"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: il primo argomento non è numerico"
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
 msgstr "or: il secondo argomento non è numerico"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): valori negativi daranno risultati strani"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): valori con decimali verranno troncati"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: il primo argomento non è numerico"
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
 msgstr "xor: il secondo argomento non è numerico"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): valori negativi daranno risultati strani"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): valori con decimali verranno troncati"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: l'argomento non è numerico"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): valore negativo darà risultati strani"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): valore con decimali verrà troncato"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' non è una categoria 'locale' valida"
@@ -777,7 +789,7 @@ msgstr "tipo nodo sconosciuto %d"
 msgid "buffer overflow in genflags2str"
 msgstr "superament limiti buffer in 'genflags2str'"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "tentativo di usare vettore `%s' in un contesto scalare"
@@ -825,7 +837,7 @@ msgstr "`nextfile' non può essere chiamato da una regola END"
 msgid "statement has no effect"
 msgstr "istruzione che non fa nulla"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "non posso usare nome di funzione `%s' come variabile o vettore"
@@ -835,7 +847,7 @@ msgstr "non posso usare nome di funzione `%s' come variabile o vettore"
 msgid "reference to uninitialized argument `%s'"
 msgstr "referenza ad argomento non inizializzato `%s'"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referenza a variabile non inizializzata `%s'"
@@ -848,44 +860,44 @@ msgstr ""
 "concatenatione: effetti secondari in una espressione hanno modificato la "
 "lunghezza di un'altra espressione!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "assegnamento usato nel contesto di un test condizionale"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "tentativo di dividere per zero"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "divisione per zero tentata in `%%'"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "tipo non ammesso (%s) in 'tree_eval'"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "divisione per zero tentata in `/='"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "divisione per zero tentata in `%%='"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "funzione `%s' chiamata con più argomenti di quelli previsti"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "funzione `%s' non definita"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -896,663 +908,676 @@ msgstr ""
 "\t# 'Stack' (Pila) Chiamate Funzione:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- principale --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "tentativo di referenziare campo da valore non numerico"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "tentativo to referenziare da stringa nulla"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "tentativo di accedere al campo %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "assegnamento non permesso al risultato di una funzione interna"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' è un'estensione gawk"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' è un'estensione gawk"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "specificazione invalida `%sFMT' `%s'"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "disabilito `--lint' a causa di assegnamento a `LINT'"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "`extension' è un'estensione gawk"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "estensione: non riesco ad aprire `%s' (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
 "estensione: biblioteca `%s': non riesco a chiamare funzione `%s' (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr "estensione: manca nome di funzione"
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "estensione: carattere non ammesso `%c' nel nome di funzione `%s'"
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "estensione: non riesco a ridefinire funzione `%s'"
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "estensione: funzione `%s' già definita"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "estensione: nome funzione interna gawk `%s' non ammesso come nome funzione"
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "estensione: funzione di nome `%s' definita in precedenza"
 
-#: ext.c:201
+#: ext.c:204
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funzione `%s' definita per avere al massimo %d argumenti/o"
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funzione `%s': manca argomento #%d"
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "funzione `%s': argomento #%d: tentativo di usare scalare come vettore"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "funzione `%s': argomento #%d: tentativo di usare vettore come scalare"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Operazione Non Supportata"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF impostato a un valore negativo"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: il secondo argomento non è un vettore"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: la stringa nulla come terzo arg. è un'estensione gawk"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' è un'estensione gawk"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "valore di FIELDWIDTHS invalido, vicino a `%s'"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "la stringa nulla usata come `FS' è un'estensione gawk"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "il vecchio awk non supporta espressioni come valori di `FS'"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opzione `%s' ambigua\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opzione `--%s' non prevede un argomento\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opzione `%c%s' non prevede un argomento\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opzione `%s' richiede un argomento\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opzione sconosciuta `--%s'\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opzione sconosciuta `%c%s'\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opzione non permessa -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opzione non valida -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: l'opzione richiede un argomento -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opzione `-W %s' ambigua\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opzione `-W %s' non prevede un argomento\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "non riesco ad aprire file `%s' in lettura (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "chiusura di fd %d (`%s') fallita (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "tipo di albero invalido %s in redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "espressione nella re-direzione `%s' ha solo un valore numerico"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "espressione nella re-direzione `%s' ha per valore la stringa nulla"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "nome file `%s' per la re-direzione `%s' può essere il risultato di una "
 "espressione logica"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mistura non necessaria di `>' e `>>' per il file `%.*s'"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "non posso aprire 'pipe' `%s' in scrittura (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "non posso aprire 'pipe' `%s' in lettura (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "file `%s' è una 'directory'"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr ""
 "non posso aprire 'socket' bidirezionale `%s' per lettura/scrittura (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "non posso aprire 'pipe' bidirezionale `%s' per lettura/scrittura (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "non posso re-dirigere da `%s' (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "non posso re-dirigere a `%s' (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "numero massimo consentito di file aperti raggiunto: comincio a riutilizzare "
 "i descrittori di file"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "chiusura di `%s' fallita (%s)."
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "troppe 'pipe' o file di input aperti"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: il secondo argomento deve essere `a' o `da'"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: `%.*s' non è un file aperto, una 'pipe' o un co-processo"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "chiusura di una re-direzione mai aperta"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr "close: re-direzione `%s' non aperta con `|&', ignoro secondo argomento"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "errore ritornato (%d) dalla chiusura della 'pipe' `%s' (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "errore ritornato (%d) dalla chiusura del file `%s' (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "nessuna chiusura esplicita richiesta per 'socket' `%s'"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "nessuna chiusura esplicita richiesta per co-processo `%s'"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "nessuna chiusura esplicita richiesta per 'pipe' `%s'"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "nessuna chiusura esplicita richiesta per file `%s'"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "errore scrivendo 'standard output' (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "errore scrivendo 'standard error' (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "scaricamento di 'pipe' `%s' fallita (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "scaricamento da co-processo di 'pipe' a `%s' fallita (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "scaricamento di file `%s' fallita (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "porta locale %s invalida in `/inet'"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr "host remoto e informazione di porta (%s, %s) invalidi"
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "spiacente, 'client' /inet/raw non ancora pronto"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "solo root può usare `/inet/raw'."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "spiacente, 'server' /inet/raw non ancora pronto"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "nessuno protocollo (conosciuto) specificato nel filename speciale `%s'"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "nome file speciale `%s' incompleto"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "porta locale invalida in `%s'"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "va fornito nome di 'host' remoto a `/inet'"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "va fornita porta remota a `/inet'"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "porta remota invalida in `%s'"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "comunicazioni TCP/IP non supportate"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "file `%s' è una 'directory'"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "usa `PROCINFO[\"%s\"]' invece che `%s'"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "usa `PROCINFO[...]' invece che `/dev/user'"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "non riesco ad aprire `%s', modo `%s'"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "fallita chiusura di 'pty' principale (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "fallita chiusura di 'stdout' nel processo-figlio (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "fallito trasferimento di 'pty' secondaria a 'stdout' nel processo-figlio "
 "(dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "fallita chiusura di 'stdin' nel processo-figlio (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "fallito trasferimento di 'pty' secondaria a 'stdin' nel processo-figlio "
 "(dup: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "fallita chiusura di 'pty' secondaria (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "fallito passaggio di 'pipe' a 'stdout' nel processo-figlio (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "fallito passaggio di pipe a 'stdin' nel processo-figlio (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "fallito ripristino di 'stdout' nel processo-padre\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "fallito ripristino di 'stdin' nel processo-padre\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "fallita chiusura di 'pipe' (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "`|&' non supportato"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "non riesco ad aprire 'pipe' `%s' (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "non riesco a creare processo-figlio per `%s' (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "file dati `%s' vuoto"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "non riesco ad allocare ulteriore memoria per l'input"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "errore leggendo file di input `%s': %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "valore multicarattere per `RS' è un'estensione gawk"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "`-m[fr]' opzione irrilevante per gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "-m uso opzione: `-m[fr] nnn'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: opzione `-W %s' non riconosciuta, ignorata\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "argomento di `--source' mancante, comando ignorato"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "variable d'ambiente `POSIXLY_CORRECT' impostata: attivo `--posix'"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--posix' annulla `--traditional'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix'/`--traditional' annulla `--non-decimal-data'"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "eseguire %s con 'setuid' root può essere un rischio per la sicurezza"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "non posso impostare modalità binaria su 'stdin'(%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "non posso impostare modalità binaria su 'stdout'(%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "non posso impostare modalità binaria su 'stderr'(%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "manca del tutto il testo del programma!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Uso: %s [opzioni in stile POSIX o GNU] -f fileprog [--] file ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Usage: %s [opzioni in stile POSIX o GNU] [--] %cprogramma%c file ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "Opzioni POSIX:\t\topzioni lunghe GNU:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fileprog\t\t--file=fileprog\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=valore\t\t--assign=var=valore\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] valore\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 
-#: main.c:681
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W exec[=file]\t--exec[=file]\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=file]\t--profile[=file]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=testo-programma\t--source=testo-programma\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr "\t-W use-lc-numeric\t--use-lc-numeric\n"
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1564,7 +1589,7 @@ msgstr ""
 "sezione `Reporting Problems and Bugs' nella versione a stampa.\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1574,7 +1599,7 @@ msgstr ""
 "Senza parametri, legge da 'standard input' e scrive su 'standard output'.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1584,14 +1609,14 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1599,11 +1624,11 @@ msgstr ""
 "\n"
 "Questo software è libero; lo puoi distribuire e/o modificare\n"
 "alle condizioni stabilite nella 'GNU General Public License' pubblicata\n"
-"dalla Free Software Foundation; fai riferimento alla versione 2 della\n"
+"dalla Free Software Foundation; fai riferimento alla versione 3 della\n"
 "Licenza, o (a tua scelta) a una qualsiasi versione successiva.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1617,23 +1642,20 @@ msgstr ""
 "Vedi la 'GNU General Public License' per ulteriori dettagli.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
-"Dovresti aver ricevuto una copia della 'GNU General Public License'\n"
-"assieme a questo programma; se non è così, scrivi alla Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"Dovresti aver ricevuto una copia della GNU General Public License\n"
+"assieme a questo programma; se non è così, vedi http://www.gnu.org/"
+"licenses/.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft non imposta FS a 'tab' nell'awk POSIX"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -1642,35 +1664,35 @@ msgstr ""
 "%s: `%s' argomento di `-v' non in forma `var=valore'\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' non è un nome di variabile ammesso"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' non è un nome di variabile, cerco il file `%s=%s'"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "eccezione floating point"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "errore fatale: errore interno"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "manca 'fd' predefinita %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "non riesco a predefinire /dev/null per 'fd' %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "non riesco a trovare gruppi: %s"
@@ -1692,57 +1714,62 @@ msgstr "errore: "
 msgid "fatal: "
 msgstr "fatale: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "non riesco a convertire stringa a valore in virgola mobile"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "'\\' a fine stringa"
 
-#: node.c:604
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "il vecchio awk non supporta la sequenza di escape '\\%c'"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
-msgstr "POSIX non permette formato `\\x'"
+msgstr "POSIX non permette escape `\\x'"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
-msgstr "niente cifre esadecimanli nel formato `\\x'"
+msgstr "niente cifre esadecimanli nella sequenza di escape `\\x'"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
-msgstr " sequenza in formato `\\%c' considerata come semplice `%c'"
+msgstr "sequenza di escape `\\%c' considerata come semplice `%c'"
 
 #: posix/gawkmisc.c:172
 #, c-format
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s': non riesco a impostare 'close-on-exec': (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "non riesco ad aprire `%s' in scrittura: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr "errore interno: %s con 'vname' nullo"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# gestito internamente come 'delete' (cancellazione)"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr "# questa è una funzione di estensione caricata dinamicamente"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# profilo gawk, creato %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1751,7 +1778,7 @@ msgstr ""
 "\t# blocco(hi) BEGIN\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1760,7 +1787,7 @@ msgstr ""
 "\t# Regola(e)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1769,7 +1796,7 @@ msgstr ""
 "\t# blocco(hi) END\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1778,79 +1805,79 @@ msgstr ""
 "\n"
 "\t# Funzioni, listate in ordine alfabetico\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "tipo non previsto %s in 'prec_level'"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Successo"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Espressione regolare invalida"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Carattere di ordinamento non valido"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Nome di 'classe di caratteri' invalido"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "'\\' finale"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Riferimento indietro invalido"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ or [^ non chiusa"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( or \\( non chiusa"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "\\{ non chiusa"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Contenuto di \\{\\} invalido"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Fine di intervallo invalido"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Memoria esaurita"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Espressione regolare precedente invalida"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Fine di expressione regolare inaspettata"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Espressione regolare troppo complessa"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") or \\) non aperta"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Nessuna espressione regolare precedente"
diff --git a/po/ja.gmo b/po/ja.gmo
index 4dffbdef..5797e318 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 194e44f9..bdf5a261 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.4l\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2005-06-27 02:37+1000\n"
 "Last-Translator: Makoto Hosoya <mhosoya@ozemail.com.au>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -35,352 +35,367 @@ msgstr "¥¹¥«¥é¡¼ `%s' ¤òÇÛÎó¤È¤·¤Æ»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 msgid "from %s"
 msgstr "%s ¤«¤é"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "½é´ü²½¤µ¤ì¤Æ¤¤¤Ê¤¤Í×ÁÇ `%s[\"%s\"]' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "ÇÛÎó¤Îź»ú `%s' ¤¬¶õÎó¤Ç¤¹¡£"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: ÇÛÎó `%2$s' ¤Ë»Øɸ `%1$s' ¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: ¶õ (null)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: ¶õ (zero)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: ¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (table_size) = %d, ÇÛÎó¥µ¥¤¥º (array_size) = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: ¤Ï¥Ñ¥é¥á¡¼¥¿¤Ç¤¹¡£\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: %s ¤Ø¤ÎÇÛÎó»²¾È (array_ref)\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s ¥Ö¥í¥Ã¥¯¤Ë¤Ï¥¢¥¯¥·¥ç¥óÉô¤¬É¬¿Ü¤Ç¤¹¡£"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "³Æ¥ë¡¼¥ë¤Ë¤Ï¥Ñ¥¿¡¼¥ó¤Þ¤¿¤Ï¥¢¥¯¥·¥ç¥óÉô¤¬É¬¿Ü¤Ç¤¹¡£"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "±é»»»Ò `**' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' ¤ÏÁȹþ¤ß´Ø¿ô¤Ç¤¹¡£ºÆÄêµÁ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: awkgram.y:313
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "Àµµ¬É½¸½Äê¿ô `//' ¤Ï C++¥³¥á¥ó¥È¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢°ã¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "Àµµ¬É½¸½Äê¿ô `/%s/' ¤Ï C¥³¥á¥ó¥È¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢°ã¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "Ì¿Îáʸ¤Ë¤Ï¸ú²Ì¤¬Ìµ¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "`%s' ¤¬ %s ¤Î¥¢¥¯¥·¥ç¥ó¤Ç»È¤ï¤ì¤Þ¤·¤¿¡£"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "`nextfile' ¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "`return' ¤¬´Ø¿ôÄêµÁʸ¤Î³°¤Ç»È¤ï¤ì¤Þ¤·¤¿¡£"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "BEGIN ¤Þ¤¿¤Ï END ¥ë¡¼¥ëÆâ¤Î°ú¿ô¤Î̵¤¤ `print' ¤Ï `print \"\"' ¤À¤È»×¤ï¤ì¤Þ"
 "¤¹¡£"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "`delete array' ¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(array)' ¤Ï tawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£Â¾¤Î awk ¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "switch ʸ¤ÎÃæ¤Ë½ÅÊ£¤·¤¿ case Ãͤ¬»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤¹: %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr "switch ʸ¤ÎÃæ¤Ë `default' ¤¬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "¿Ãʳ¬¤ÇÁÐÊý¸þ¥Ñ¥¤¥×¤òÍøÍѤ·¤¿¼°¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "Àµµ¬É½¸½¤¬ÂåÆþ¼°¤Î±¦Êդ˻ÈÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "`~' ¤ä `!~' ±é»»»Ò¤Îº¸ÊÕ¤ËÀµµ¬É½¸½¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "±é»»»Ò `**' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "Èæ³Ó¼°¤Î±¦ÊÕ¤ËÀµµ¬É½¸½¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤Æ¤¤¤Ê¤¤ `getline' ¤Ï END ¥¢¥¯¥·¥ç¥ó¤Ç¤Ï̤ÄêµÁ¤Ç¤¹¡£"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "±é»»»Ò `**' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "³ç¸Ì̵¤·¤Î `length' ¤Ï¾¤Î awk ¤Ç»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "POSIX ¤Ï³ç¸Ì̵¤·¤Ç¤Î `length' ¤Î»ÈÍѤò¿ä¾©¤·¤Þ¤»¤ó¡£"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr "ÇÛÎó¤Ç¤Ê¤¤¤â¤Î¤òÇÛÎó¤È¤·¤Æ»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "ź»ú¼°¤¬ÉÔÀµ¤Ç¤¹¡£"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "ͽÁÛ³°¤Î²þ¹Ô¤Þ¤¿¤Ïʸ»úÎó¤Î½ªÃ¼¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "¥³¥Þ¥ó¥É¹Ô¤Î¥×¥í¥°¥é¥àɽµ­¤¬¶õ¤Ç¤¹¡£"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "¥½¡¼¥¹¥Õ¥¡¥¤¥ë `%s' ¤òÆɤ߹þ¤à¤¿¤á¤Ë³«¤±¤Þ¤»¤ó (%s)¡£"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "¥½¡¼¥¹¥Õ¥¡¥¤¥ë `%s' ¤òÆɤ߹þ¤á¤Þ¤»¤ó (%s)¡£"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "¥½¡¼¥¹¥Õ¥¡¥¤¥ë `%s' ¤Ï¶õ¤Ç¤¹¡£"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤¬²þ¹Ô¤Ç½ª¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤Àµµ¬É½¸½¤¬¥Õ¥¡¥¤¥ëºÇ¸å¤Î `\\' ¤Ç½ª¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "%s: %d: tawk ¤ÎÀµµ¬É½¸½½¤¾þ»Ò `/.../%c' ¤Ï gawk ¤Ç»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "tawk ¤ÎÀµµ¬É½¸½½¤¾þ»Ò `/.../%c' ¤Ï gawk ¤Ç»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "Àµµ¬É½¸½¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÃæ¤ÇÀµµ¬É½¸½¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "`\\ #...' ·Á¼°¤Î¹Ô·Ñ³¤Ï¾¤Î awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤¬¹ÔºÇ¸å¤Îʸ»ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX ¤Ï±é»»»Ò `**=' ¤òµö²Ä¤·¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "±é»»»Ò `**=' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX ¤Ç¤Ï±é»»»Ò `**' ¤òµö²Ä¤·¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "±é»»»Ò `**' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "±é»»»Ò `^=' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "±é»»»Ò `^' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "ʸ»úÎ󤬽ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "ɽ¸½¤Î char '%c' ¤ÏÉÔÀµ¤Ç¤¹¡£"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' ¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "`%s' ¤Ï¥Ù¥ë¸¦µæ½ê¤Ë¤è¤ë³ÈÄ¥¤Ç¤¹¡£"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX ¤Ï `%s' ¤òµö²Ä¤·¤Þ¤»¤ó¡£"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' ¤Ï¸Å¤¤ awk ¤Ç»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' ¤ÏÍ­³²¤Ç¤¹!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d ¤Ï %s ¤Ë»È¤¨¤ë°ú¿ô¤Î¿ô¤È¤·¤Æ¤ÏÉÔÀµ¤Ç¤¹¡£"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: Âè»°°ú¿ô¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: ʸ»úÎó¥ê¥Æ¥é¥ë¤òÃÖ¤­´¹¤¨ºÇ¸å¤Î°ú¿ô¤Ë»ÈÍѤ¹¤ë¤È¸ú²Ì¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s Âè»°¥Ñ¥é¥á¡¼¥¿¤Ï²ÄÊÑ¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: ÂèÆó°ú¿ô¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "dcgettext(_\"...\")¤Î»È¤¤Êý¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹: ºÇ½é¤Î¥¢¥ó¥À¡¼¥¹¥³¥¢¤òºï½ü¤·¤Æ¤¯"
 "¤À¤µ¤¤¡£"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "dcngettext(_\"...\")¤Î»È¤¤Êý¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹: ºÇ½é¤Î¥¢¥ó¥À¡¼¥¹¥³¥¢¤òºï½ü¤·¤Æ"
 "¤¯¤À¤µ¤¤¡£"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "´Ø¿ô `%s': ¥Ñ¥é¥á¡¼¥¿ #%d, `%s' ¤¬¥Ñ¥é¥á¡¼¥¿ #%d ¤È½ÅÊ£¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "´Ø¿ô `%s': ¥Ñ¥é¥á¡¼¥¿ `%s' ¤¬Âç°èÊÑ¿ô¤òʤ¤¤±£¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "`%s' ¤ò½ñ¹þ¤ßÍѤ˳«¤±¤Þ¤»¤ó¤Ç¤·¤¿ (%s)¡£"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤òɸ½à¥¨¥é¡¼¤ËÁ÷¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: ÊĤ¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() ¤òÆó²ó¸Æ¤Ó½Ð¤·¤Æ¤¤¤Þ¤¹!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "ʤ¤¤±£¤µ¤ì¤¿ÊÑ¿ô¤¬¤¢¤ê¤Þ¤·¤¿¡£"
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "´Ø¿ô `%s': ´Ø¿ô̾¤Ï¥Ñ¥é¥á¡¼¥¿Ì¾¤Ë»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "´Ø¿ô̾ `%s' ¤ÏÄêµÁºÑ¤ß¤Ç¤¹¡£"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "̤ÄêµÁ¤Î´Ø¿ô `%s' ¤ò¸Æ¤Ó½Ð¤·¤Þ¤·¤¿¡£"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "ÄêµÁ¤µ¤ì¤¿´Ø¿ô `%s' ¤Ï°ìÅÙ¤â¸Æ¤Ó½Ð¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "¥Ñ¥é¥á¡¼¥¿ #%d ¤ÎÀµµ¬É½¸½Äê¿ô¤Ï¥Ö¡¼¥ëÃͤò½ÐÎϤ·¤Þ¤¹¡£"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -389,381 +404,381 @@ msgstr ""
 "´Ø¿ô̾¤È `(' ¤Î´Ö¤Ë¥¹¥Ú¡¼¥¹¤òÆþ¤ì¤Æ´Ø¿ô `%s' ¤ò¸Æ¤Ó½Ð¤·¤Æ¤¤¤Þ¤¹¡£\n"
 "¤Þ¤¿¤Ï¡¢ÊÑ¿ô¤«ÇÛÎó¤È¤·¤Æ»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s ¤«¤é \"%s\" ¤Ø½ÐÎϤǤ­¤Þ¤»¤ó (%s)¡£"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "ɸ½à½ÐÎÏ"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "¸¶°øÉÔÌÀ"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: °ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: °ú¿ô %g ¤¬µöÍÆÈϰϤòĶ¤¨¤Æ¤¤¤Þ¤¹¡£"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr "fflush: ¥Õ¥é¥Ã¥·¥åÉÔ²Ä: ¥Ñ¥¤¥× `%s' ¤ÏÆɤ߹þ¤ßÀìÍѤǤ¹¡£"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr "fflush: ¥Õ¥é¥Ã¥·¥åÉÔ²Ä: ¥Õ¥¡¥¤¥ë `%s' ¤ÏÆɤ߹þ¤ßÀìÍѤǤ¹¡£"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr ""
 "fflush: `%s' ¤Ï¥Õ¥¡¥¤¥ë¤«¡¢¥Ñ¥¤¥×¤«¡¢ÊÂ¹Ô¥×¥í¥»¥¹¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: Âè°ì°ú¿ô¤¬Ê¸»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: ÂèÆó°ú¿ô¤¬Ê¸»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: °ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "`delete array' ¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: °ú¿ô¤¬Ê¸»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: °ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: °ú¿ô %g ¤¬Éé¤ÎÃͤǤ¹¡£"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr ""
 "`count$¡Ç¤ÏÁ´¤Æ¤Î½ñ¼°»ØÄê¤ËŬÍѤ¹¤ë¡¢¤Þ¤¿¤ÏÁ´¤Æ¤ËŬÍѤ·¤Ê¤¤¤Î¤É¤Á¤é¤«¤Ç¤·¤«»È"
 "¤¨¤Þ¤»¤ó¡£"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "`$' ¤Ï awk ¤Ç¤Ï»È¤¨¤Þ¤»¤ó¡£"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "½ç½ø»ØÄê¤Î `$' ¤Ë»È¤¨¤ë¿ô»ú¤ÏÀµ¤ÎÃͤǤ¹¡£"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "½ç½ø»ØÄê %ld ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤ë°ú¿ô¤Î¿ô¤òĶ¤¨¤Æ¤¤¤Þ¤¹¡£"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "`$' ¤Ï½ñ¼°»ØÄê¤Î¥Ô¥ê¥ª¥É `.' ¤Î¸å¤Ë»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "¥Õ¥£¡¼¥ë¥ÉÉý¡¢¤Þ¤¿¤ÏÀºÅ٤λØÄê»Ò¤Ë `$' ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "awk ¤Î½ñ¼°»ØÄê¤Ç¤Ï `l' ¤Ï̵°ÕÌ£¤Ç¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "POSIX ½àµò¤Î awk ¤Ç¤Ï `l' ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "awk ¤Î½ñ¼°»ØÄê¤Ç¤Ï `L' ¤Ï̵°ÕÌ£¤Ç¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "POSIX ½àµò¤Î awk ¤Ç¤Ï `L' ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "awk ¤Î½ñ¼°»ØÄê¤Ç¤Ï `h' ¤Ï̵°ÕÌ£¤Ç¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "POSIX ½àµò¤Î awk ¤Ç¤Ï `h' ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: %g ¤ÎÃͤ¬½ñ¼° `%%%c' ¤ÎµöÍÆÈϰϤòĶ¤¨¤Æ¤¤¤Þ¤¹¡£"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "½ñ¼°»ØÄꤹ¤ë¤¿¤á¤Î°ú¿ô¤¬Â­¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ ¤³¤³¤«¤é­¤ê¤Þ¤»¤ó"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: ½ñ¼°»ØÄê»Ò¤ËÀ©¸æʸ»ú¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "½ñ¼°»ØÄêʸ»úÎó¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹¡£"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: °ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: °ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: °ú¿ô¤ËÉé¤ÎÃÍ %g ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: µ¯ÅÀ»Øɸ %g ¤¬ÉÔÀµ¤Ç¤¹¡£1 ¤ò»È¤¤¤Þ¤¹¡£"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: µ¯ÅÀ»Øɸ %g ¤Î¾®¿ôÅÀ°Ê²¼¤ÏÀÚ¤ê¼Î¤Æ¤Þ¤¹¡£"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: ʸ»ú¿ô %g ¤¬ 1 °Ê¾å¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: ʸ»ú¿ô %g ¤¬ 0 °Ê¾å¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: ʸ»ú¿ô %g ¤Î¾®¿ôÅÀ°Ê²¼¤ÏÀÚ¤ê¼Î¤Æ¤Þ¤¹¡£"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: ʸ»ú¿ô %g ¤ÏºÇÂçÃͤòĶ¤¨¤Æ¤¤¤Þ¤¹¡£%g ¤ò»È¤¤¤Þ¤¹¡£"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: ʸ»úÎó¤ÎŤµ¤¬¥¼¥í¤Ç¤¹¡£"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: µ¯ÅÀ»Øɸ %g ¤¬Ê¸»úÎó¤ÎŤµ¤òĶ¤¨¤Æ¤¤¤Þ¤¹¡£"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
 msgstr ""
 "substr: µ¯ÅÀ»Øɸ %2$g ¤«¤é¤Îʸ»ú¿ô %1$g ¤Ïʸ»úÎó¤ÎŤµ %3$lu ¤òĶ¤¨¤Æ¤¤¤Þ¤¹¡£"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftime: Âè°ì°ú¿ô¤¬Ê¸»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: ½ñ¼°»ØÄêʸ»úÎ󤬶õ¤Ç¤¹¡£"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: ÂèÆó°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: °ú¿ô¤¬Ê¸»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: °ú¿ô¤¬Ê¸»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "½é´ü²½¤µ¤ì¤Æ¤¤¤Ê¤¤¥Õ¥£¡¼¥ë¥É `$%d' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: °ú¿ô¤¬Ê¸»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: °ú¿ô¤¬Ê¸»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: Âè°ì°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: ÂèÆó°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: °ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: °ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: °ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: Âè»°°ú¿ô¤¬ÇÛÎó̾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: Âè»°°ú¿ô¤¬ 0 ¤Ç¤¹¡£1 ¤òÂå¤ï¤ê¤Ë»ÈÍѤ·¤Þ¤¹¡£"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: Âè°ì°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: ÂèÆó°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): Éé¤Î¿ôÃͤò»ÈÍѤ¹¤ë¤È°Û¾ï¤Ê·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): ¾®¿ôÅÀ°Ê²¼¤ÏÀÚ¤ê¼Î¤Æ¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "lshift(%lf, %lf): ¥·¥Õ¥ÈÃͤ¬Â礭²á¤®¤ë¤È°Û¾ï¤Ê·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: Âè°ì°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: ÂèÆó°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): Éé¤Î¿ôÃͤò»ÈÍѤ¹¤ë¤È°Û¾ï¤Ê·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): ¾®¿ôÅÀ°Ê²¼¤ÏÀÚ¤ê¼Î¤Æ¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "rshift(%lf, %lf): ¥·¥Õ¥ÈÃͤ¬Â礭²á¤®¤ë¤È°Û¾ï¤Ê·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: Âè°ì°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
 msgstr "and: ÂèÆó°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): Éé¤Î¿ôÃͤò»ÈÍѤ¹¤ë¤È°Û¾ï¤Ê·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): ¾®¿ôÅÀ°Ê²¼¤ÏÀÚ¤ê¼Î¤Æ¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: Âè°ì°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
 msgstr "or: ÂèÆó°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): Éé¤Î¿ôÃͤò»ÈÍѤ¹¤ë¤È°Û¾ï¤Ê·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): ¾®¿ôÅÀ°Ê²¼¤ÏÀÚ¤ê¼Î¤Æ¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: Âè°ì°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
 msgstr "xor: ÂèÆó°ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): Éé¤Î¿ôÃͤò»ÈÍѤ¹¤ë¤È°Û¾ï¤Ê·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): ¾®¿ôÅÀ°Ê²¼¤ÏÀÚ¤ê¼Î¤Æ¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: °ú¿ô¤¬¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): Éé¤Î¿ôÃͤò»ÈÍѤ¹¤ë¤È°Û¾ï¤Ê·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): ¾®¿ôÅÀ°Ê²¼¤ÏÀÚ¤ê¼Î¤Æ¤Ë¤Ê¤ê¤Þ¤¹¡£"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' ¤ÏÉÔÀµ¤Ê¥í¥«¡¼¥ë¡¦¥«¥Æ¥´¥ê¡¼¤Ç¤¹¡£"
@@ -777,7 +792,7 @@ msgstr "¥Î¡¼¥É %d ¤Î¼ïÎबÉÔÌÀ¤Ç¤¹¡£"
 msgid "buffer overflow in genflags2str"
 msgstr "genflags2str ¤¬¥Ð¥Ã¥Õ¥¡ÍÆÎ̤òĶ²á¤·¤Þ¤·¤¿¡£"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "¥¹¥«¥é¡¼´Ä¶­¤ËÇÛÎó `%s' ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
@@ -824,7 +839,7 @@ msgstr "END ¥ë¡¼¥ë¤«¤é¤Ï `nextfile' ¤ò¸Æ¤Ó½Ð¤»¤Þ¤»¤ó¡£"
 msgid "statement has no effect"
 msgstr "Ì¿Îáʸ¤Ë¸ú²Ì¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "´Ø¿ô̾ `%s' ¤ÏÊÑ¿ô¤äÇÛÎó¤Ë¤Ï»È¤¨¤Þ¤»¤ó¡£"
@@ -834,7 +849,7 @@ msgstr "´Ø¿ô̾ `%s' ¤ÏÊÑ¿ô¤äÇÛÎó¤Ë¤Ï»È¤¨¤Þ¤»¤ó¡£"
 msgid "reference to uninitialized argument `%s'"
 msgstr "½é´ü²½¤µ¤ì¤Æ¤¤¤Ê¤¤°ú¿ô `%s' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "½é´ü²½¤µ¤ì¤Æ¤¤¤Ê¤¤ÊÑ¿ô `%s' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¡£"
@@ -847,44 +862,44 @@ msgstr ""
 "concatenation¡Êʸ»úÎóÏ¢·ë¡Ë: °ìÊý¤Î¼°¤ÎÉûºîÍѤǡ¢¤â¤¦°ìÊý¤ÎŤµ¤¬ÊѤï¤ê¤Þ¤·"
 "¤¿!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "¾ò·ïʸÃæ¤Ç¤ÎÂåÆþ"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "¥¼¥í¤Ç¤Î½ü»»¤ò¹Ô¤¤¤Þ¤·¤¿¡£"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "`%%' ¤Ç¥¼¥í¤Ç¤Î½ü»»¤ò¹Ô¤¤¤Þ¤·¤¿¡£"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "tree_eval ¤ÎÃæ¤ËÉÔÀµ¤Ê¥¿¥¤¥× (%s) ¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "`/=' ¤Ç¥¼¥í¤Ç¤Î½ü»»¤ò¹Ô¤¤¤Þ¤·¤¿¡£"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "`%%=' ¤Ç¥¼¥í¤Ç¤Î½ü»»¤ò¹Ô¤¤¤Þ¤·¤¿¡£"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "Àë¸À¤µ¤ì¤Æ¤¤¤ë¿ô¤è¤ê¿¤¤°ú¿ô¤ò»È¤Ã¤Æ´Ø¿ô `%s' ¤ò¸Æ¤Ó½Ð¤·¤Þ¤·¤¿¡£"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "´Ø¿ô `%s' ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -895,669 +910,683 @@ msgstr ""
 "\t# ¸Æ½Ð´Ø¿ô¥¹¥¿¥Ã¥¯:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- ¥á¥¤¥ó --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "¿ôÃͰʳ°¤ÎÃͤò»È¤Ã¤Æ¥Õ¥¤¡¼¥ë¥É¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "¶õÎó¤ò»È¤Ã¤Æ»²¾È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "¥Õ¥£¡¼¥ë¥É %d ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "Áȹþ´Ø¿ô¤ÎÌá¤êÃͤËÂåÆþ¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' ¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' ¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "`%sFMT' ¤Î»ØÄê `%s' ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "`LINT' ¤Ø¤ÎÂåÆþ¤Ë½¾¤¤ `--lint' ¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "`extension' ¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: `%s' ¤ò³«¤±¤Þ¤»¤ó (%s)¡£\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: ¥é¥¤¥Ö¥é¥ê `%s': ´Ø¿ô `%s' ¤ò¸Æ¤Ó½Ð¤»¤Þ¤»¤ó (%s)¡£\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr "extension: ´Ø¿ô̾¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: ´Ø¿ô̾ `%2$s' ¤ÎÃæ¤ËÉÔÀµ¤Êʸ»ú `%1$c' ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: ´Ø¿ô `%s' ¤òºÆÄêµÁ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: ´Ø¿ô `%s' ¤Ï´û¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "extension: ÁȤ߹þ¤ß´Ø¿ô `%s' ¤Ï´Ø¿ô̾¤Ë»È¤¨¤Þ¤»¤ó¡£"
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: ´Ø¿ô̾ `%s' ¤Ï´û¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: ext.c:201
+#: ext.c:204
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "´Ø¿ô `%s' ¤Ë»È¤¨¤ë°ú¿ô¤Î¿ô¤Ï `%d' °Ê²¼¤ÈÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "´Ø¿ô `%s': °ú¿ô #%d ¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "´Ø¿ô `%s': °ú¿ô #%d: ¥¹¥«¥é¡¼¤òÇÛÎó¤È¤·¤Æ»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "´Ø¿ô `%s': °ú¿ô #%d: ÇÛÎó¤ò¥¹¥«¥é¡¼¤È¤·¤Æ»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "¤³¤ÎÁàºî¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF ¤¬Éé¤ÎÃͤǤ¹¡£"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: ÂèÆó°ú¿ô¤¬ÇÛÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: Âè»°°ú¿ô¤Ë¶õÎó¤ò»ÈÍѤ¹¤ë¤Î¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' ¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "`%s' ÉÕ¶á¤Î FIELDWIDTHS Ãͤ¬ÉÔÀµ¤Ç¤¹¡£"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "`FS' ¤Ë¶õÎó¤ò»ÈÍѤ¹¤ë¤Î¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "±é»»»Ò `**' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹¡£\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ë°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ë°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹¡£\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `--%s'\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `%c%s'\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: °ú¿ô¤¬É¬Íפʥª¥×¥·¥ç¥ó -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹¡£\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ë°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "¥Õ¥¡¥¤¥ë `%s' ¤òÆɤ߹þ¤à¤¿¤á¤Ë³«¤±¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "fd %d (`%s') ¤òÊĤ¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "redirect() ¤ÎÃæ¤ÇÉÔÀµ¤Ê¥Ä¥ê¡¼¥¿¥¤¥× %s ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "`%s' ¥ê¥À¥¤¥ì¥¯¥È¤ÎÌ¿Îá¼°¤Ë¿ôÃͤ·¤«µ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "`%s' ¥ê¥À¥¤¥ì¥¯¥È¤ÎÌ¿Îá¼°¤¬¶õÎó¤Ç¤¹¡£"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "`%2$s' ¥ê¥À¥¤¥ì¥¯¥È¤ËÏÀÍý±é»»¤Î·ë²Ì¤È»×¤ï¤ì¤ë¥Õ¥¡¥¤¥ë̾ `%1$s' ¤¬»È¤ï¤ì¤Æ¤¤¤Þ"
 "¤¹¡£"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "¥Õ¥¡¥¤¥ë `%.*s' ¤ÇɬÍװʾå¤Ë `>' ¤È `>>' ¤òÁȹ礻¤Æ¤¤¤Þ¤¹¡£"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "½ÐÎÏÍѤ˥ѥ¤¥× `%s' ¤ò³«¤±¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "ÆþÎÏÍѤ˥ѥ¤¥× `%s' ¤ò³«¤±¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "¥Õ¥¡¥¤¥ë `%s' ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr "Æþ½ÐÎÏÍѤÎÁÐÊý¸þ¥½¥±¥Ã¥È `%s' ¤¬³«¤±¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "Æþ½ÐÎÏÍѤÎÁÐÊý¸þ¥Ñ¥¤¥× `%s' ¤¬³«¤±¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "`%s' ¤«¤é¥ê¥À¥¤¥ì¥¯¥È¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "`%s' ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "³«¤¤¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¿ô¤¬¥·¥¹¥Æ¥àÀ©¸Â¤Ë㤷¤Þ¤·¤¿¡£¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤ò¿½Å²½¤·¤Þ"
 "¤¹¡£"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "`%s' ¤¬ÊĤ¸¤é¤ì¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "³«¤¤¤Æ¤¤¤ë¥Ñ¥¤¥×¤Þ¤¿¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¿ô¤¬Â¿²á¤®¤Þ¤¹¡£"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: ÂèÆó°ú¿ô¤Ë»ÈÍѤǤ­¤ë¤Î¤Ï `to' ¤Þ¤¿¤Ï `from' ¤Ç¤¹¡£"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 "close:  `%.*s' ¤Ï¥Õ¥¡¥¤¥ë¡¢¥Ñ¥¤¥×¡¢ÊÂ¹Ô¥×¥í¥»¥¹¤Î¤¤¤º¤ì¤Ç¤â¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "³«¤¤¤Æ¤Ê¤¤¥ê¥À¥¤¥ì¥¯¥È¤òÊĤ¸¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: ¥ê¥À¥¤¥ì¥¯¥È `%s' ¤Ï `|&' ¤ò»È¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ÂèÆó°ú¿ô¤Ï̵»ë¤·¤Þ¤¹¡£"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "¥Ñ¥¤¥× `%2$s' ¤òÊĤ¸¤¿¤È¤­¤Î¾õÂÖ¥³¡¼¥É¤¬¼ºÇÔ (%1$d) ¤Ç¤·¤¿ (%3$s)¡£"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "¥Õ¥¡¥¤¥ë `%2$s' ¤òÊĤ¸¤¿¤È¤­¤Î¾õÂÖ¥³¡¼¥É¤¬¼ºÇÔ (%1$d) ¤Ç¤·¤¿ (%3$s)¡£"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "¥½¥±¥Ã¥È `%s' ¤òÌÀ¼¨¤·¤ÆÊĤ¸¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "ÊÂ¹Ô¥×¥í¥»¥¹ `%s' ¤òÌÀ¼¨¤·¤ÆÊĤ¸¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "¥Ñ¥¤¥× `%s' ¤òÌÀ¼¨¤·¤ÆÊĤ¸¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "¥Õ¥¡¥¤¥ë `%s' ¤òÌÀ¼¨¤·¤ÆÊĤ¸¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "ɸ½à½ÐÎϤؤνñ¹þ¤ß¥¨¥é¡¼ (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "ɸ½à¥¨¥é¡¼¤Ø¤Î½ñ¹þ¤ß¥¨¥é¡¼ (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "¥Ñ¥¤¥× `%s' ¤ò¥Õ¥é¥Ã¥·¥å¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "`%s' ¤ØÀܳ¤¹¤ë¥Ñ¥¤¥×¤òÊÂ¹Ô¥×¥í¥»¥¹¤«¤é¥Õ¥é¥Ã¥·¥å¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "¥Õ¥¡¥¤¥ë `%s' ¤ò¥Õ¥é¥Ã¥·¥å¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "`%s' ¤Î¥í¡¼¥«¥ë¥Ý¡¼¥È¤¬Ìµ¸ú¤Ç¤¹¡£"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "»ÄÇ°¤Ê¤¬¤é¡¢/inet/raw ¥¯¥é¥¤¥¢¥ó¥È¤Î½àÈ÷¤¬¤Ç¤­¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "`/inet/raw' ¤Ï root ¥æ¡¼¥¶¡¼¤Î¤ß»ÈÍѤǤ­¤Þ¤¹¡£"
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "»ÄÇ°¤Ê¤¬¤é¡¢/inet/raw ¥µ¡¼¥Ð¡¼¤Î½àÈ÷¤¬¤Ç¤­¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr ""
 "¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë̾ `%s' ¤Ë¡Êǧ¼±¤Ç¤­¤ë¡Ë¥×¥í¥È¥³¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë̾ `%s' ¤ÏÉÔ´°Á´¤Ç¤¹¡£"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "`%s' ¤Î¥í¡¼¥«¥ë¥Ý¡¼¥È¤¬Ìµ¸ú¤Ç¤¹¡£"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "`/inet' ¤Ë¤Ï¥ê¥â¡¼¥È¥Û¥¹¥È̾¤¬É¬ÍפǤ¹¡£"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "`/inet' ¤Ë¤Ï¥ê¥â¡¼¥È¥Ý¡¼¥ÈÈֹ椬ɬÍפǤ¹¡£"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "`%s' ¤Î¥ê¥â¡¼¥È¥Ý¡¼¥È¤¬Ìµ¸ú¤Ç¤¹¡£"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP Àܳ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "¥Õ¥¡¥¤¥ë `%s' ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "`%2$s' ¤ÎÂå¤ï¤ê¤Ë `PROCINFO[\"%1$s\"]' ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "`/dev/user' ¤ÎÂå¤ï¤ê¤Ë `PROCINFO[...]' ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "`%s' (¥â¡¼¥É `%s') ¤ò³«¤±¤Þ¤»¤ó¡£"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "¥Þ¥¹¥¿¡¼ pty ¤òÊĤ¸¤é¤ì¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "»Ò¥×¥í¥»¥¹¤¬É¸½à½ÐÎϤòÊĤ¸¤é¤ì¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "»Ò¥×¥í¥»¥¹¤¬¥¹¥ì¡¼¥Ö pty ¤òɸ½à½ÐÎϤ˰ÜÆ°¤Ç¤­¤Þ¤»¤ó (dup: %s)¡£"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "»Ò¥×¥í¥»¥¹¤¬É¸½àÆþÎϤòÊĤ¸¤é¤ì¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "»Ò¥×¥í¥»¥¹¤¬¥¹¥ì¡¼¥Ö pty ¤òɸ½àÆþÎϤ˰ÜÆ°¤Ç¤­¤Þ¤»¤ó (dup: %s)¡£"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "¥¹¥ì¡¼¥Ö pty ¤òÊĤ¸¤é¤ì¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "»Ò¥×¥í¥»¥¹¤¬¥Ñ¥¤¥×¤òɸ½à½ÐÎϤ˰ÜÆ°¤Ç¤­¤Þ¤»¤ó (dup: %s)¡£"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "»Ò¥×¥í¥»¥¹¤¬¥Ñ¥¤¥×¤òɸ½àÆþÎϤ˰ÜÆ°¤Ç¤­¤Þ¤»¤ó (dup: %s)¡£"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "¿Æ¥×¥í¥»¥¹¤¬É¸½à½ÐÎϤòÉüµì¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "¿Æ¥×¥í¥»¥¹¤¬É¸½àÆþÎϤòÉüµì¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "¥Ñ¥¤¥×¤òÊĤ¸¤é¤ì¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "`|&' ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "¥Ñ¥¤¥× `%s' ¤¬³«¤±¤Þ¤»¤ó (%s)¡£"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "`%s' ÍÑ¤Î»Ò¥×¥í¥»¥¹¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó (fork: %s)¡£"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë `%s' ¤Ï¶õ¤Ç¤¹¡£"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "ÆþÎÏÍÑ¥á¥â¥ê¡¼¤ò¤³¤ì°Ê¾å³ÎÊݤǤ­¤Þ¤»¤ó¡£"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿: %s¡£"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "Ê£¿ô¤Îʸ»ú¤ò `RS' ¤Ë»ÈÍѤ¹¤ë¤Î¤Ï gawk ÆÃÍ­¤Î³ÈÄ¥¤Ç¤¹¡£"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "gawk ¤Ç¤Ï¥ª¥×¥·¥ç¥ó `-m[fr]' ¤Ë¸ú²Ì¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "-m ¥ª¥×¥·¥ç¥ó¤Î»ÈÍÑË¡: `-m[fr] ¿ôÃÍ'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ïǧ¼±¤Ç¤­¤Þ¤»¤ó¡£Ìµ»ë¤·¤Þ¤¹¡£\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "¶õ°ú¿ô¤Î `--source' ¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "´Ä¶­ÊÑ¿ô `POSIXLY_CORRECT' ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó `--posix' ¤òÍ­¸ú¤Ë"
 "¤·¤Þ¤¹¡£"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "¥ª¥×¥·¥ç¥ó `--posix' ¤Ï `--traditional' ¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 "¥ª¥×¥·¥ç¥ó `--posix'/`--traditional' ¤Ï `--non-decimal-data' ¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 "setuid root ¤Ç %s ¤ò¼Â¹Ô¤¹¤ë¤È¡¢¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÌäÂ꤬ȯÀ¸¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ"
 "¤¹¡£"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "ɸ½àÆþÎϤò¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "ɸ½à½ÐÎϤò¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "ɸ½à¥¨¥é¡¼¤ò¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó (%s)¡£"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "¥×¥í¥°¥é¥àʸ¤¬Á´¤¯¤¢¤ê¤Þ¤»¤ó!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "»È¤¤Êý: %s [POSIX ¤Þ¤¿¤Ï GNU ·Á¼°¥ª¥×¥·¥ç¥ó] -f ¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë [--] ÆþÎÏ"
 "¥Õ¥¡¥¤¥ë ¡Ä\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "»È¤¤Êý: %s [POSIX ¤Þ¤¿¤Ï GNU ·Á¼°¥ª¥×¥·¥ç¥ó] [--] %c¥×¥í¥°¥é¥à%c ÆþÎÏ¥Õ¥¡¥¤"
 "¥ë ¡Ä\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "POSIX ¥ª¥×¥·¥ç¥ó:\t\tGNU Ĺ·Á¼°¥ª¥×¥·¥ç¥ó\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f ¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë\t\t--file=¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr ""
 "\t-F ¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿\t\t\t--field-separator=¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v ÊÑ¿ô=ÂåÆþÃÍ\t\t--assign=ÊÑ¿ô=ÂåÆþÃÍ\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] ¿ôÃÍ\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=¥Õ¥¡¥¤¥ë]\t--dump-variables[=¥Õ¥¡¥¤¥ë]\n"
 
-#: main.c:681
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W exec=¥Õ¥¡¥¤¥ë\t\t--exec=¥Õ¥¡¥¤¥ë\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=¥Õ¥¡¥¤¥ë]\t--profile[=¥Õ¥¡¥¤¥ë]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=¥×¥í¥°¥é¥àʸ\t--source=¥×¥í¥°¥é¥àʸ\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1570,7 +1599,7 @@ msgstr ""
 "¤Ï¡¢`Reporting Problems and Bugs' ¤Ç¤¹¡£\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1580,7 +1609,7 @@ msgstr ""
 "¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤Ç¤Ï¡¢É¸½àÆþÎϤòÆɤ߹þ¤ß¡¢É¸½à½ÐÎϤ˽ñ¤­½Ð¤·¤Þ¤¹¡£\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1590,14 +1619,14 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' ÆþÎÏ¥Õ¥¡¥¤¥ë\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1608,7 +1637,7 @@ msgstr ""
 "¤Ë½¾¤¤ºÆÇÛÉÛ¡¢µÚ¤Ó/¤Þ¤¿¤Ï¡¢Êѹ¹¤ò²Ã¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1622,12 +1651,11 @@ msgstr ""
 "¾Ü¤·¤¯¤Ï¡¢GNU General Public License ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "ËÜ¥×¥í¥°¥é¥à¤Ë¤Ï¡¢GNU General Public License ¤¬ÅºÉÕ¤µ¤ì¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¡£\n"
 "¤â¤·¡¢ËÜ¥×¥í¥°¥é¥à¤È°ì½ï¤Ë GNU General Public License ¤òÆþ¼ê¤·¤Ê¤«¤Ã¤¿\n"
@@ -1636,11 +1664,11 @@ msgstr ""
 "\t59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n"
 "¤Ø½ñÌ̤ǤªÃΤ餻¤¯¤À¤µ¤¤¡£\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "POSIX »ÅÍͤΠawk ¤Ç¤Ï -Ft ¤Ç FS ¤ò¥¿¥Ö¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -1649,35 +1677,35 @@ msgstr ""
 "%s: ¥ª¥×¥·¥ç¥ó `-v' ¤Î°ú¿ô `%s' ¤¬ `ÊÑ¿ô=ÂåÆþÃÍ' ¤Î·Á¼°¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' ¤ÏÉÔÀµ¤ÊÊÑ¿ô̾¤Ç¤¹¡£"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' ¤ÏÊÑ¿ô̾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£`%s=%s' ¤Î¥Õ¥¡¥¤¥ë¤òõ¤·¤Þ¤¹¡£"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "ÉâÆ°¾®¿ôÅÀÎã³°"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "Ã×̿Ū¥¨¥é¡¼: ÆâÉô¥¨¥é¡¼"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "fd %d ¤¬»öÁ°¤Ë³«¤¤¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "»öÁ°¤Ë fd %d ÍÑ¤Ë /dev/null ¤ò³«¤±¤Þ¤»¤ó¡£"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "¥°¥ë¡¼¥×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
@@ -1699,23 +1727,28 @@ msgstr "¥¨¥é¡¼: "
 msgid "fatal: "
 msgstr "Ã×̿Ū: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "ʸ»úÎ󤫤éÉâÆ°¾®¿ô¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "ʸ»úÎó¤Î½ª¤ê¤Ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "±é»»»Ò `**' ¤Ï¸Å¤¤ awk ¤Ç»È¤¨¤Þ¤»¤ó¡£"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX ¤Ï `\\x' ¥¨¥¹¥±¡¼¥×¤òµö²Ä¤·¤Þ¤»¤ó¡£"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "`\\x' ¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤Ë 16 ¿Ê¿ô¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹ `\\%c' ¤Ï `%c' ¤ÈƱÅù¤Ë°·¤ï¤ì¤Þ¤¹¡£"
@@ -1725,31 +1758,31 @@ msgstr "¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹ `\\%c' ¤Ï `%c' ¤ÈƱÅù¤Ë°·¤ï¤ì¤Þ¤¹¡£"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s': close-on-exec ¤òÀßÄê¤Ç¤­¤Þ¤»¤ó: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "`%s' ¤ò½ñ¹þ¤ßÍѤ˳«¤±¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr "ÆâÉô¥¨¥é¡¼: %s ¤Î vname ¤¬Ìµ¸ú¤Ç¤¹¡£"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# ÆâÉô¤Ç¤Ï `delete' ¤È¤·¤Æ°·¤ï¤ì¤Þ¤·¤¿¡£"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr "# ¤³¤ì¤ÏưŪ¤Ë¥í¡¼¥É¤µ¤ì¤¿³ÈÄ¥µ¡Ç½¤Ç¤¹¡£"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawk ¥×¥í¥Õ¥¡¥¤¥ë¡¢ºîÀ®Æü»þ %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1758,7 +1791,7 @@ msgstr ""
 "\t# BEGIN ¥Ö¥í¥Ã¥¯\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1767,7 +1800,7 @@ msgstr ""
 "\t# ¥ë¡¼¥ë\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1776,7 +1809,7 @@ msgstr ""
 "\t# END ¥Ö¥í¥Ã¥¯\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1785,79 +1818,82 @@ msgstr ""
 "\n"
 "\t# ´Ø¿ô°ìÍ÷¡Ê¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¡Ë\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "prec_level Ãæ¤Î %s ¤ÏͽÁÛ³°¤Î¥¿¥¤¥×¤Ç¤¹¡£"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "À®¸ù"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "³ºÅö̵¤·"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "̵¸ú¤ÊÀµµ¬É½¸½"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "̵¸ú¤Ê¾È¹çʸ»ú"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "̵¸ú¤Êʸ»ú¥¯¥é¥¹Ì¾"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "ºÇ¸å¤Ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹¡£"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "¸åÊý¤Ø¤Î»²¾È¤¬Ìµ¸ú¤Ç¤¹¡£"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ ¤Þ¤¿¤Ï [^ ¤¬Âбþ¤·¤Þ¤»¤ó¡£"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( ¤Þ¤¿¤Ï \\( ¤¬Âбþ¤·¤Þ¤»¤ó¡£"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "\\{ ¤¬Âбþ¤·¤Þ¤»¤ó¡£"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\} ¤ÎÆâÍƤ¬Ìµ¸ú¤Ç¤¹¡£"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "ÈÏ°Ï»ØÄê¤Î½ªÃ¼¤¬Ìµ¸ú¤Ç¤¹¡£"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "¥á¥â¥ê¡¼¤¬Â­¤ê¤Þ¤»¤ó¡£"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Àè¹Ô¤ÎÀµµ¬É½¸½¤¬Ìµ¸ú¤Ç¤¹¡£"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Àµµ¬É½¸½¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Àµµ¬É½¸½¤¬Ä¹²á¤®¤Þ¤¹¡£"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") ¤Þ¤¿¤Ï \\) ¤¬Âбþ¤·¤Þ¤»¤ó¡£"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "¤³¤ì¤è¤êÁ°¤Ë»ÈÍѤ·¤¿Àµµ¬É½¸½¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
+
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "`%s' ¤Î¥ê¥â¡¼¥È¥Ý¡¼¥È¤¬Ìµ¸ú¤Ç¤¹¡£"
diff --git a/po/nl.gmo b/po/nl.gmo
index 815bb860..38a1219b 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index f5cf7f39..5e0e3698 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,19 +1,19 @@
-# Translation of gawk-3.1.4l to Dutch.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Benno Schulenberg <benno@nietvergeten.nl>, 2005.
+# Translation of gawk-3.1.5h to Dutch.
+# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
 #
+# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 3.1.4l\n"
+"Project-Id-Version: gawk 3.1.5h\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
-"PO-Revision-Date: 2005-06-24 22:39+0200\n"
-"Last-Translator: Benno Schulenberg <benno@nietvergeten.nl>\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
+"PO-Revision-Date: 2007-10-02 12:43+0200\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.1\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: array.c:112
 #, c-format
@@ -35,347 +35,359 @@ msgstr "scalair '%s' wordt gebruikt als array"
 msgid "from %s"
 msgstr "van %s"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "verwijzing naar ongeïnitialiseerd element '%s[\"%s\"]'"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "index van array '%s' is lege string"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: index '%s' niet in array '%s' "
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: leeg (nil)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: leeg (nul)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: tabelgrootte = %d, arraygrootte = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: is een parameter\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: array-verwijzing naar %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s-blokken horen een actiedeel te hebben"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "elke regel hoort een patroon of een actiedeel te hebben"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "oude 'awk' staat meerdere 'BEGIN'- en 'END'-regels niet toe"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "'%s' is een ingebouwde functie en is niet te herdefiniëren"
 
-#: awkgram.y:313
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
-msgstr "regexp-constante '/s/' lijkt C-commentaar, maar is het niet"
+msgstr "regexp-constante '//' lijkt op C-commentaar, maar is het niet"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
-msgstr "regexp-constante '/%s/' lijkt C-commentaar, maar is het niet"
+msgstr "regexp-constante '/%s/' lijkt op C-commentaar, maar is het niet"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "opdracht heeft mogelijk geen effect"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "'%s' wordt gebruikt in %s-actie"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "'nextfile' is een gawk-uitbreiding"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "'return' wordt gebruikt buiten functiecontext"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "kale 'print' in BEGIN- of END-regel moet vermoedelijk 'print \"\"' zijn"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "'delete array' is een gawk-uitbreiding"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "'delete(array)' is een niet-overdraagbare tawk-uitbreiding"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
-msgstr "dubbele case-waarde in switch-opdracht: %s"
+msgstr "dubbele 'case'-waarde in 'switch'-opdracht: %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
-msgstr "dubbele 'default' in switch-opdracht"
+msgstr "dubbele 'default' in 'switch'-opdracht"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
-msgstr "meerfase-tweerichtings-pipelines werken niet"
+msgstr "meerfase-tweerichtings-pijplijnen werken niet"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "reguliere expressie rechts van toewijzing"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
-msgstr "reguliere expressie links van '~' of '!~' operator"
+msgstr "reguliere expressie links van operator '~' of '!~'"
+
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "oude 'awk' kent het sleutelwoord 'in' niet, behalve na 'for'"
 
-#: awkgram.y:812
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "reguliere expressie rechts van vergelijking"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "onherverwezen 'getline' is ongedefinieerd binnen END-actie"
 
-#: awkgram.y:906
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr "oude 'awk' kent geen meerdimensionale arrays"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "aanroep van 'length' zonder haakjes is niet overdraagbaar"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "aanroep van 'length' zonder haakjes wordt door POSIX afgeraden"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr "non-array wordt gebruikt als array"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "ongeldige index-expressie"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "onverwacht regeleinde of einde van string"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "lege programmatekst op commandoregel"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "kan bronbestand '%s' niet openen om te lezen (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "kan bronbestand '%s' niet lezen (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "bronbestand '%s' is leeg"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
-msgstr "bronbestand eindigt niet met een regeleinde"
+msgstr "bronbestand eindigt niet met een regeleindeteken (LF)"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "onafgesloten reguliere expressie eindigt met '\\' aan bestandseinde"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
-msgstr "%s: %d: regex-optie '/.../%c' van tawk werkt niet in gawk"
+msgstr "%s: %d: regexp-optie '/.../%c' van tawk werkt niet in gawk"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
-msgstr "regex-optie '/.../%c' van tawk werkt niet in gawk"
+msgstr "regexp-optie '/.../%c' van tawk werkt niet in gawk"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "onafgesloten reguliere expressie"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "onafgesloten reguliere expressie aan bestandseinde"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "gebruik van regelvoortzetting '\\ #...' is niet overdraagbaar"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "backslash is niet het laatste teken op de regel"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX staat operator '**=' niet toe"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
-msgstr "oude awk ondersteunt operator '**=' niet"
+msgstr "oude 'awk' kent de operator '**=' niet"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX staat operator '**' niet toe"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
-msgstr "oude awk ondersteunt operator '**' niet"
+msgstr "oude 'awk' kent de operator '**' niet"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
-msgstr "oude awk ondersteunt operator '^=' niet"
+msgstr "oude 'awk' kent de operator '^=' niet"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
-msgstr "oude awk ondersteunt operator '^' niet"
+msgstr "oude 'awk' kent de operator '^' niet"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "onafgesloten string"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "ongeldig teken '%c' in expressie"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "'%s' is een gawk-uitbreiding"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "'%s' is een uitbreiding door Bell Labs"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX staat '%s' niet toe"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
-msgstr "oude awk ondersteunt '%s' niet"
+msgstr "oude 'awk' kent '%s' niet"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "'goto' wordt als schadelijk beschouwd!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d is een ongeldig aantal argumenten voor %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: derde argument is een gawk-uitbreiding"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: een stringwaarde als laatste vervangingsargument heeft geen effect"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s: derde parameter is geen veranderbaar object"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: tweede argument is een gawk-uitbreiding"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dcgettext(_\"...\") is onjuist: verwijder het liggende streepje"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dcngettext(_\"...\") is onjuist: verwijder het liggende streepje"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "functie '%s': parameter #%d, '%s', dupliceert parameter #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "functie '%s': parameter '%s' schaduwt een globale variabele"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "kan '%s' niet openen om te schrijven (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "profiel gaat naar standaardfoutuitvoer"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: sluiten is mislukt (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() twee keer aangeroepen!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "er waren geschaduwde variabelen."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "functie '%s': kan functienaam niet als parameternaam gebruiken"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "functienaam '%s' is al eerder gedefinieerd"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "functie '%s' aangeroepen maar nergens gedefinieerd"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "functie '%s' gedefinieerd maar nergens aangeroepen"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "regexp-constante als parameter #%d levert booleanwaarde op"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -384,201 +396,200 @@ msgstr ""
 "functie '%s' aangeroepen met spatie tussen naam en '(',\n"
 "of gebruikt als variabele of array"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s naar \"%s\" is mislukt (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "standaarduitvoer"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "reden onbekend"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: argument is geen getal"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argument %g ligt buiten toegestane bereik"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
-"fflush: kan pipe niet leegmaken: '%s' is geopend om te lezen, niet om te "
+"fflush: kan pijp niet leegmaken: '%s' is geopend om te lezen, niet om te "
 "schrijven"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: kan bestand niet leegmaken: '%s' is geopend om te lezen, niet om te "
 "schrijven"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
-msgstr "fflush: '%s' is geen geopend bestand, pipe, of co-proces"
+msgstr "fflush: '%s' is geen open bestand, pijp, of co-proces"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: eerste argument is geen string"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: tweede argument is geen string"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: argument is geen getal"
 
-#: builtin.c:472
-#, fuzzy
+#: builtin.c:448
 msgid "`length(array)' is a gawk extension"
-msgstr "'delete array' is een gawk-uitbreiding"
+msgstr "'length(array)' is een gawk-uitbreiding"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: argument is geen string"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: argument is geen getal"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: argument %g is negatief"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "'count$' hoort in alle opmaken gebruikt te worden, of in geen"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "'$' is niet toegestaan in awk-opmaak"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "het aantal argumenten met '$' moet > 0 zijn"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "argumentental %ld is groter dan het gegeven aantal argumenten"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "'$' is niet toegestaan na een punt in de opmaak"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "geen '$' opgegeven bij positionele veldbreedte of -precisie"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "'l' is betekenisloos in awk-opmaak; genegeerd"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "'l' is niet toegestaan in POSIX awk-opmaak"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "'L' is betekenisloos in awk-opmaak; genegeerd"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "'L' is niet toegestaan in POSIX awk-opmaak"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "'h' is betekenisloos in awk-opmaak; genegeerd"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "'h' is niet toegestaan in POSIX awk-opmaak"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: waarde %g ligt buiten toegestaan bereik voor opmaak '%%%c'"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "niet genoeg argumenten voor opmaakstring"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "niet genoeg ^ voor deze"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: opmaakaanduiding mist een stuurletter"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "te veel argumenten voor opmaakstring"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: geen argumenten"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: argument is geen getal"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: argument %g is negatief"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
-msgstr "substr: startindex %g is ongeldig, 1 wordt gebruikt"
+msgstr "substr: startindex %g is ongeldig; 1 wordt gebruikt"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
-msgstr "substr: startindex %g is geen integer, wordt afgekapt"
+msgstr "substr: startindex %g is geen integer; wordt afgekapt"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: lengte %g is niet >= 1"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: lengte %g is niet >= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
-msgstr "substr: lengte %g is geen integer, wordt afgekapt"
+msgstr "substr: lengte %g is geen integer; wordt afgekapt"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
-"substr: lengte %g is te groot voor stringindexering, wordt verkort tot %g"
+"substr: lengte %g is te groot voor stringindexering; wordt verkort tot %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: bronstring heeft lengte nul"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: startindex %g ligt voorbij het einde van de string"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -586,182 +597,182 @@ msgstr ""
 "substr: lengte %g bij startindex %g is groter dan de lengte van het eerste "
 "argument (%lu)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftime: eerste argument is geen string"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: opmaakstring is leeg"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: tweede argument is geen getal"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: argument is geen string"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: argument is geen string"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "verwijzing naar ongeïnitialiseerd veld '$%d'"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: argument is geen string"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: argument is geen string"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: eerste argument is geen getal"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: tweede argument is geen getal"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: argument is geen getal"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: argument is geen getal"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: argument is geen getal"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: derde argument is geen array"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
-msgstr "gensub: derde argument is 0, wordt beschouwd als 1"
+msgstr "gensub: derde argument is 0; wordt beschouwd als 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: eerste argument is geen getal"
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: tweede argument is geen getal"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): negatieve waarden geven rare resultaten"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): cijfers na de komma worden afgekapt"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "lshift(%lf, %lf): te grote opschuifwaarden geven rare resultaten"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: eerste argument is geen getal"
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: tweede argument is geen getal"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): negatieve waarden geven rare resultaten"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): cijfers na de komma worden afgekapt"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "rshift(%lf, %lf): te grote opschuifwaarden geven rare resultaten"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: eerste argument is geen getal"
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
 msgstr "and: tweede argument is geen getal"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): negatieve waarden geven rare resultaten"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): cijfers na de komma worden afgekapt"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: eerste argument is geen getal"
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
 msgstr "or: tweede argument is geen getal"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): negatieve waarden geven rare resultaten"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): cijfers na de komma worden afgekapt"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: eerste argument is geen getal"
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
 msgstr "xor: tweede argument is geen getal"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): negatieve waarden geven rare resultaten"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): cijfers na de komma worden afgekapt"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: argument is geen getal"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): negatieve waarden geven rare resultaten"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): cijfers na de komma worden afgekapt"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: '%s' is geen geldige lokale categorie"
@@ -773,9 +784,9 @@ msgstr "onbekend nodetype %d"
 
 #: eval.c:353
 msgid "buffer overflow in genflags2str"
-msgstr "bufferoverloop in genflags2str"
+msgstr "bufferoverloop in genflags2str()"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "array '%s' wordt gebruikt in een scalaire context"
@@ -823,7 +834,7 @@ msgstr "'nextfile' kan niet aangeroepen worden in een END-regel"
 msgid "statement has no effect"
 msgstr "opdracht heeft geen effect"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "kan functienaam '%s' niet als variabele of array gebruiken"
@@ -833,7 +844,7 @@ msgstr "kan functienaam '%s' niet als variabele of array gebruiken"
 msgid "reference to uninitialized argument `%s'"
 msgstr "verwijzing naar ongeïnitialiseerd argument '%s'"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "verwijzing naar ongeïnitialiseerde variabele '%s'"
@@ -846,44 +857,44 @@ msgstr ""
 "concatenation: neveneffecten in de ene expressie hebben de lengte van een "
 "andere veranderd!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "toewijzing wordt gebruikt in een conditionele context"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "deling door nul"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "deling door nul in '%%'"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
-msgstr "ongeldig type (%s) in tree_eval"
+msgstr "ongeldig type (%s) in tree_eval()"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "deling door nul in '/='"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "deling door nul in '%%='"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "functie '%s' aangeroepen met meer argumenten dan gedeclareerd"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "functie '%s' is niet gedefinieerd"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -894,665 +905,680 @@ msgstr ""
 "\t# Functieaanroepen-stack:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- hoofd --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "veldverwijzingspoging via een waarde die geen getal is"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "verwijzingspoging via een lege string"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "toegangspoging tot veld %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr ""
 "toewijzing aan het resultaat van een ingebouwde functie is niet toegestaan"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "'IGNORECASE' is een gawk-uitbreiding"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "'BINMODE' is een gawk-uitbreiding"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "onjuiste opgave van '%sFMT': '%s'"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "'--lint' wordt uitgeschakeld wegens toewijzing aan 'LINT'"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "'extension' is een gawk-uitbreiding"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: kan '%s' niet openen (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: bibliotheek '%s': kan functie '%s' niet aanroepen (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr "extension: ontbrekende functienaam"
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: ongeldig teken '%c' in functienaam '%s'"
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: kan functie '%s' niet herdefiniëren"
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: functie '%s' is al gedefinieerd"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "extension: kan in gawk ingebouwde '%s' niet als functienaam gebruiken"
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: functienaam '%s' is al eerder gedefinieerd"
 
-#: ext.c:201
+#: ext.c:204
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr ""
 "functie '%s' is gedefinieerd om niet meer dan %d argument(en) te accepteren"
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "functie '%s': ontbrekend argument #%d"
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "functie '%s': argument #%d: een scalair wordt gebruikt als array"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "functie '%s': argument #%d: een array wordt gebruikt als scalair"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Actie wordt niet ondersteund"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF is op een negatieve waarde gezet"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: tweede argument is geen array"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: lege string als derde argument is een gawk-uitbreiding"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "'FIELDWIDTHS' is een gawk-uitbreiding"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "ongeldige waarde voor FIELDWIDTHS, nabij '%s'"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "een lege string als 'FS' is een gawk-uitbreiding"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "oude 'awk' staat geen reguliere expressies toe als waarde van 'FS'"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: optie '--%s' staat geen argument toe\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie '%s' vereist een argument\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie '--%s'\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: onbekende optie '%c%s'\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie '-W %s' staat geen argument toe\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "kan bestand '%s' niet openen om te lezen (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
-msgstr "sluiten van fd %d ('%s') is mislukt (%s)"
+msgstr "sluiten van bestandsdescriptor %d ('%s') is mislukt (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "ongeldig boomtype %s in redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "expressie in omleiding '%s' heeft alleen een getal als waarde"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "expressie voor omleiding '%s' heeft een lege string als waarde"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "bestandsnaam '%s' voor omleiding '%s' kan het resultaat zijn van een "
 "logische expressie"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "onnodige mix van '>' en '>>' voor bestand '%.*s'"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
-msgstr "kan pipe '%s' niet openen voor uitvoer (%s)"
+msgstr "kan pijp '%s' niet openen voor uitvoer (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
-msgstr "kan pipe '%s' niet openen voor invoer (%s)"
+msgstr "kan pijp '%s' niet openen voor invoer (%s)"
+
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "'%s' is een map"
 
-#: io.c:665
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
-msgstr "kan tweerichtings-socket '%s' niet openen voor invoer/uitvoer (%s)"
+msgstr "kan tweerichtings-socket '%s' niet openen voor in- en uitvoer (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
-msgstr "kan tweerichtings-pipe '%s' niet openen voor invoer/uitvoer (%s)"
+msgstr "kan tweerichtings-pijp '%s' niet openen voor in- en uitvoer (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "kan niet omleiden van '%s' (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "kan niet omleiden naar '%s' (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "systeemgrens voor aantal open bestanden is bereikt: begonnen met multiplexen"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
-msgstr "sluiten van '%s' is mislukt (%s)."
+msgstr "sluiten van '%s' is mislukt (%s)"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
-msgstr "te veel pipes of invoerbestanden geopend"
+msgstr "te veel pijpen of invoerbestanden geopend"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: tweede argument moet 'to' of 'from' zijn"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
-msgstr "close: '%.*s' is geen open bestand, pipe, of co-proces"
+msgstr "close: '%.*s' is geen open bestand, pijp, of co-proces"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "sluiten van een nooit-geopende omleiding"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
-"close: omleiding '%s' is niet geopend met '|&'; tweede argument genegeerd"
+"close: omleiding '%s' is niet geopend met '|&'; tweede argument wordt "
+"genegeerd"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
-msgstr "afsluitwaarde %d bij mislukte sluiting van pipe '%s' (%s)"
+msgstr "afsluitwaarde %d bij mislukte sluiting van pijp '%s' (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "afsluitwaarde %d bij mislukte sluiting van bestand '%s' (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "geen expliciete sluiting van socket '%s' aangegeven"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "geen expliciete sluiting van co-proces '%s' aangegeven"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
-msgstr "geen expliciete sluiting van pipe '%s' aangegeven"
+msgstr "geen expliciete sluiting van pijp '%s' aangegeven"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "geen expliciete sluiting van bestand '%s' aangegeven"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "fout tijdens schrijven van standaarduitvoer (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "fout tijdens schrijven van standaardfoutuitvoer (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
-msgstr "leegmaken van pipe '%s' is mislukt (%s)."
+msgstr "leegmaken van pijp '%s' is mislukt (%s)"
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
-msgstr "leegmaken door co-proces van pipe naar '%s' is mislukt (%s)."
+msgstr "leegmaken door co-proces van pijp naar '%s' is mislukt (%s)"
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
-msgstr "leegmaken van bestand '%s' is mislukt (%s)."
+msgstr "leegmaken van bestand '%s' is mislukt (%s)"
 
-#: io.c:1205
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "lokale poort %s is ongeldig in '/inet'"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr "host- en poortinformatie (%s, %s) zijn ongeldig"
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
-msgstr "cliënt van /inet/raw is nog niet klaar, sorry"
+msgstr "cliënt van '/inet/raw' is nog niet klaar, sorry"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
-msgstr "alleen root mag '/inet/raw' gebruiken."
+msgstr "Alleen root mag '/inet/raw' gebruiken."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
-msgstr "server van /inet/raw is nog niet klaar, sorry"
+msgstr "server van '/inet/raw' is nog niet klaar, sorry"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "geen (bekend) protocol aangegeven in speciale bestandsnaam '%s'"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "speciale bestandsnaam '%s' is onvolledig"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "ongeldige lokale poort in '%s'"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "'/inet' heeft een gindse hostnaam nodig"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "'/inet' heeft een gindse poort nodig"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "ongeldige gindse poort in '%s'"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-communicatie wordt niet ondersteund"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "bestand '%s' is een map"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "gebruik 'PROCINFO[\"%s\"]' in plaats van '%s'"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "gebruik 'PROCINFO[...]' in plaats van '/dev/user'"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
-msgstr "kan '%s' niet openen, modus '%s'"
+msgstr "kan '%s' niet openen -- modus '%s'"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
-msgstr "kan meester-pty van kindproces niet sluiten (%s)"
+msgstr "kan meester-pty van dochterproces niet sluiten (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
-msgstr "kan standaarduitvoer van kindproces niet sluiten (%s)"
+msgstr "kan standaarduitvoer van dochterproces niet sluiten (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
-"kan slaaf-pty niet overzetten naar standaarduitvoer van kindproces (dup: %s)"
+"kan slaaf-pty niet overzetten naar standaarduitvoer van dochterproces (dup: %"
+"s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
-msgstr "kan standaardinvoer van kindproces niet sluiten (%s)"
+msgstr "kan standaardinvoer van dochterproces niet sluiten (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
-"kan slaaf-pty niet overzetten naar standaardinvoer van kindproces (dup: %s)"
+"kan slaaf-pty niet overzetten naar standaardinvoer van dochterproces (dup: %"
+"s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "kan slaaf-pty niet sluiten (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
-"kan pipe niet overzetten naar standaarduitvoer van kindproces (dup: %s)"
+"kan pijp niet overzetten naar standaarduitvoer van dochterproces (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
-msgstr "kan pipe niet overzetten naar standaardinvoer van kindproces (dup: %s)"
+msgstr ""
+"kan pijp niet overzetten naar standaardinvoer van dochterproces (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "kan standaarduitvoer van ouderproces niet herstellen\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "kan standaardinvoer van ouderproces niet herstellen\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
-msgstr "kan pipe niet sluiten (%s)"
+msgstr "kan pijp niet sluiten (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "'|&' wordt niet ondersteund"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
-msgstr "kan pipe '%s' niet openen (%s)"
+msgstr "kan pijp '%s' niet openen (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
-msgstr "kan voor '%s' geen kindproces maken (fork: %s)"
+msgstr "kan voor '%s' geen dochterproces starten (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "databestand '%s' is leeg"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "kan geen extra invoergeheugen meer toewijzen"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "fout tijdens lezen van invoerbestand '%s': %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "een 'RS' van meerdere tekens is een gawk-uitbreiding"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "optie '-m[fr]' is irrelevant in gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "gebruikswijze van optie -m: '-m[fr] nnn'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: optie '-W %s' is onbekend; genegeerd\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "argument van '--source' is leeg; genegeerd"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "omgevingsvariabele 'POSIXLY_CORRECT' is gezet: '--posix' ingeschakeld"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "'--posix' overstijgt '--traditional'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "'--posix'/'--traditional' overstijgen '--non-decimal-data'"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
-msgstr "het uitvoeren van %s als setuid root kan een veiligheidsrisico zijn"
+msgstr "het uitvoeren van %s als 'setuid root' kan een veiligheidsrisico zijn"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "kan standaardinvoer niet in binaire modus plaatsen (%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "kan standaarduitvoer niet in binaire modus plaatsen (%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "kan standaardfoutuitvoer niet in binaire modus plaatsen (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "helemaal geen programmatekst!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
-msgstr ""
-"Gebruik: %s [opties in POSIX- of GNU-stijl] -f programmabestand [--] "
-"bestand ...\n"
+msgstr "Gebruik:  %s [opties] -f programmabestand [--]  bestand...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
-"Gebruik: %s [opties in POSIX- of GNU-stijl] [--] %cprogramma%c bestand ...\n"
+"     of:  %s [opties] [--] %cprogrammatekst%c  bestand...\n"
 "\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
-msgstr "\tPOSIX-opties:\t\t\tlange GNU-opties:\n"
+msgstr "\tPOSIX-opties:\t\t\tequivalente GNU-opties:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f programmabestand\t\t--file=programmabestand\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F veldscheidingsteken\t\t--field-separator=veldscheidingsteken\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=waarde\t\t\t--assign=var=waarde\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] waarde\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=bestand]\t--dump-variables[=bestand]\n"
 
-#: main.c:681
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W exec=bestand\t\t\t--exec=bestand\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=bestand]\t\t--profile[=bestand]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=programmatekst\t--source=programmatekst\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr "\t-W use-lc-numeric\t\t--use-lc-numeric\n"
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1560,22 +1586,22 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Voor het rapporteren van gebreken, zie de node 'Bugs' in 'gawk.info',\n"
-"ofwel de sectie 'Reporting Problems and Bugs' in de gedrukte versie.\n"
+"Voor het rapporteren van programmagebreken, zie 'info gawk bugs'\n"
+"of de sectie 'Reporting Problems and Bugs' in de gedrukte versie.\n"
 "Meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
-"gawk is een patroonherkennings- en bewerkingsprogramma.\n"
-"Bij verstek leest het standaardinvoer en schrijft naar standaarduitvoer.\n"
+"'gawk' is een patroonherkennings- en bewerkingsprogramma.\n"
+"Standaard leest het van standaardinvoer en schrijft naar standaarduitvoer.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1585,25 +1611,25 @@ msgstr ""
 "\tgawk '{ som += $1 }; END { print som }' bestand\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
-"Dit is vrije programmatuur; u mag het verspreiden en/of wijzigen\n"
-"onder de voorwaarden van de GNU General Public License zoals uitgegeven\n"
-"door de Free Software Foundation; naar keuze ofwel onder versie 2\n"
-"of onder een nieuwere versie van die licentie.\n"
+"Dit programma is vrije software; u mag het verder verspreiden en/of\n"
+"wijzigen onder de voorwaarden van de GNU General Public License zoals\n"
+"uitgegeven door de Free Software Foundation, naar keuze ofwel onder\n"
+"versie 3 of onder een nieuwere versie van die licentie.\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1611,29 +1637,26 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 msgstr ""
-"Dit programma wordt uitgegeven in de hoop dat het bruikbaar is,\n"
+"Dit programma wordt uitgegeven in de hoop dat het nuttig is,\n"
 "maar ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie\n"
 "van VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL.\n"
-"Zie de GNU General Public License voor nadere details.\n"
+"Zie de GNU General Public License voor meer details.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Bij dit programma hoort u een kopie van de GNU General Public License\n"
-"ontvangen te hebben; is dat niet het geval, schrijf dan naar\n"
-"Free Software Foundation, Inc.,  51 Franklin Street, fifth floor\n"
-"Boston, MA 02110-1301,  USA.\n"
+"ontvangen te hebben; is dit niet het geval, dan kunt u deze licentie\n"
+"ook vinden op http://www.gnu.org/licenses/.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
-msgstr "-Ft maakt van FS geen tab in POSIX awk"
+msgstr "-Ft maakt van FS geen tab in POSIX-awk"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -1642,35 +1665,35 @@ msgstr ""
 "%s: argument '%s' van '-v' is niet van de vorm 'var=waarde'\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "'%s' is geen geldige variabelenaam"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "'%s' is geen variabelenaam, zoekend naar bestand '%s=%s'"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "drijvende-komma-berekeningsfout"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
-msgstr "fatale fout: interne fout"
+msgstr "fatale fout: **interne fout**"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
-msgstr "geen reeds-geopende fd %d"
+msgstr "geen reeds-geopende bestandsdescriptor %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
-msgstr "kan /dev/null niet openen voor fd %d"
+msgstr "kan /dev/null niet openen voor bestandsdescriptor %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "kan groepen niet vinden: %s"
@@ -1692,23 +1715,28 @@ msgstr "fout: "
 msgid "fatal: "
 msgstr "fataal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
-msgstr "kan string niet naar drijvende-komma-getal converteren"
+msgstr "kan string niet converteren naar drijvende-komma-getal"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "backslash aan het einde van de string"
 
-#: node.c:604
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "oude 'awk' kent de stuurcodereeks '\\%c' niet"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
-msgstr "POSIX staat geen '\\x' stuurcodes toe"
+msgstr "POSIX staat stuurcode '\\x' niet toe"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "geen hex cijfers in stuurcodereeks '\\x'"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "stuurcodereeks '\\%c' behandeld als normale '%c'"
@@ -1718,31 +1746,31 @@ msgstr "stuurcodereeks '\\%c' behandeld als normale '%c'"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s '%s': kan close-on-exec niet activeren: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "kan '%s' niet openen om te schrijven: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
-msgstr "interne fout: %s heeft een lege vname"
+msgstr "**interne fout**: %s heeft een lege vname"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# wordt intern behandeld als 'delete'"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr "# dit is een dynamisch geladen uitbreidingsfunctie"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawk-profiel, gemaakt %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1751,7 +1779,7 @@ msgstr ""
 "\t# BEGIN-blok(ken)\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1760,7 +1788,7 @@ msgstr ""
 "\t# Regel(s)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1769,7 +1797,7 @@ msgstr ""
 "\t# END-blok(ken)\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1778,79 +1806,79 @@ msgstr ""
 "\n"
 "\t# Functies, alfabetisch geordend\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "onverwacht type %s in prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Gelukt"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Geen overeenkomsten"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Ongeldige reguliere expressie"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
-msgstr "Ongeldig verbindingsteken"
+msgstr "Ongeldig samengesteld teken"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Ongeldige tekenklassenaam"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Backslash aan het eind"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Ongeldige terugverwijzing"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "Ongepaarde [ of [^"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "Ongepaarde ( of \\("
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "Ongepaarde \\{"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Ongeldige inhoud van \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
-msgstr "Ongeldig reekseinde"
+msgstr "Ongeldig bereikeinde"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
-msgstr "Onvoldoende geheugen"
+msgstr "Onvoldoende geheugen beschikbaar"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Ongeldige voorafgaande reguliere expressie"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Voortijdig einde van reguliere expressie"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Reguliere expressie is te groot"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "Ongepaarde ) of \\)"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Geen eerdere reguliere expressie"
diff --git a/po/pl.gmo b/po/pl.gmo
index 7b094018..8dd4fe6d 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index fd473d03..933d33c9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,14 +1,14 @@
 # Polish translations for GNU AWK package.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# Wojciech Polak <polak@gnu.org>, 2003, 2004, 2005.
+# Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+# Wojciech Polak <polak@gnu.org>, 2003, 2004, 2005, 2007.
 # additional help by Sergey Poznyakoff <gray@gnu.org>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 3.1.4l\n"
+"Project-Id-Version: gawk 3.1.5f\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
-"PO-Revision-Date: 2005-06-26 23:55+0200\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
+"PO-Revision-Date: 2007-08-17 20:05+0200\n"
 "Last-Translator: Wojciech Polak <polak@gnu.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -37,357 +37,370 @@ msgstr "próba u¿ycia skalaru `%s' jako tablicy"
 msgid "from %s"
 msgstr "od %s"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "odwo³anie do niezainicjowanego elementu `%s[\"%s\"]'"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "indeks tablicy `%s' jest zerowym ³añcuchem"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: indeks `%s' nie jest w tablicy `%s'"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: pusty (null)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: pusty (zero)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: table_size = %d, array_size = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: jest parametrem\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: array_ref do %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s bloków musi posiadaæ czê¶æ dotycz±c± akcji"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "ka¿da regu³a musi posiadaæ wzorzec lub czê¶æ dotycz±c± akcji"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "stary awk nie wspiera wielokrotnych regu³ `BEGIN' lub `END'"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr ""
 "`%s' jest funkcj± wbudowan±, wiêc nie mo¿e zostaæ ponownie zdefiniowana"
 
-#: awkgram.y:313
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "sta³e wyra¿enie regularne `//' wygl±da jak komentarz C++, ale nim nie jest"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "sta³e wyra¿enie regularne `/%s/' wygl±da jak komentarz C, ale nim nie jest"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "instrukcja mo¿e nie mieæ ¿adnego efektu"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "`%s' u¿yty w akcji %s"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "`nextfile' jest rozszerzeniem gawk"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "`return' u¿yty poza kontekstem funkcji"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "zwyk³y `print' w regu³ach BEGIN lub END powinien prawdopodobnie byæ jako "
 "`print \"\"'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "`delete tablica' jest rozszerzeniem gawk"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(tablica)' jest nieprzeno¶nym rozszerzeniem tawk"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "powielone warto¶ci case w ciele switch: %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr "wykryto powielony `default' w ciele switch"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "wieloetapowe dwukierunkowe linie potokowe nie dzia³aj±"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "wyra¿anie regularne po prawej stronie przypisania"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "wyra¿enie regularne po lewej stronie operatora `~' lub `!~'"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr ""
+"stary awk nie wspiera s³owa kluczowego `in', z wyj±tkiem po s³owie `for'"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "wyra¿enie regularne po prawej stronie porównania"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
 "komenda `getline' bez przekierowania nie jest zdefiniowana wewn±trz akcji END"
 
-#: awkgram.y:906
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr "stary awk nie wspiera wielowymiarowych tablic"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "wywo³anie `length' bez nawiasów jest nieprzeno¶ne"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "wywo³anie `length' bez podania nawiasów jest niezalecane przez POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr "u¿ycie nie-tablicy jako tablicy"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "nieprawid³owe wyra¿enie indeksowe"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "niespodziewany znak nowego wiersza lub koñca ³añcucha"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "pusty tekst programu w linii poleceñ"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "nie mo¿na otworzyæ pliku ¼ród³owego `%s' do czytania (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "nie mo¿na otworzyæ pliku ¼ród³owego `%s' (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "plik ¼ród³owy `%s' jest pusty"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "plik ¼ród³owy nie posiada na koñcu znaku nowego wiersza"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 "niezakoñczone prawid³owo wyra¿enie regularne koñczy siê znakiem `\\' na "
 "koñcu pliku"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: modyfikator wyra¿enia regularnego `/.../%c' tawk nie dzia³a w gawk"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "modyfikator wyra¿enia regularnego `/.../%c' tawk nie dzia³a w gawk"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "niezakoñczone wyra¿enie regularne"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "niezakoñczone wyra¿enie regularne na koñcu pliku"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "u¿ycie `\\ #...' kontynuacji linii nie jest przeno¶ne"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "backslash nie jest ostatnim znakiem w wierszu"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX nie zezwala na operator `**='"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "stary awk nie wspiera operatora `**='"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX nie zezwala na operator `**'"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "stary awk nie wspiera operatora `**'"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "operator `^=' nie jest wspierany w starym awk"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "operator `^' nie jest wspierany w starym awk"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "niezakoñczony ³añcuch"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "nieprawid³owy znak '%c' w wyra¿eniu"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' jest rozszerzeniem gawk"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "`%s' jest rozszerzeniem Bell Labs"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX nie zezwala na `%s'"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' nie jest wspierany w starym awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' uwa¿ane za szkodliwe!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d jest nieprawid³owe jako liczba argumentów dla %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: trzeci argument jest rozszerzeniem gawk"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: litera³ ³añcuchowy jako ostatni argument podstawienia nie ma ¿adnego "
 "efektu"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s trzeci parametr nie jest zmiennym obiektem"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: drugi argument jest rozszerzeniem gawk"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "nieprawid³owe u¿ycie dcgettext(_\"...\"): usuñ znak podkre¶lenia"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "nieprawid³owe u¿ycie dcngettext(_\"...\"): usuñ znak podkre¶lenia"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funkcja `%s': parametr #%d, `%s', powiela parametr #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funkcja `%s': parametr `%s' zas³ania globaln± zmienn±"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "nie mo¿na otworzyæ `%s' do zapisu (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "wysy³anie profilu na standardowe wyj¶cie diagnostyczne"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: zamkniêcie nie powiod³o siê (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() wywo³ana podwójnie!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "wyst±pi³y przykryte zmienne."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funkcja `%s': nie mo¿na u¿yæ nazwy funkcji jako nazwy parametru"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "nazwa funkcji `%s' zosta³a zdefiniowana poprzednio"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funkcja `%s' zosta³a wywo³ana, ale nigdy nie zosta³a zdefiniowana"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "funkcja `%s' zosta³a zdefiniowana, ale nigdy nie zosta³a wywo³ana"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "sta³e wyra¿enie regularne dla parametru #%d daje warto¶æ logiczn±"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -397,201 +410,200 @@ msgstr ""
 "`(',\n"
 "lub u¿yta jako zmienna lub jako tablica"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s do \"%s\" nie powiód³ siê (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "standardowe wyj¶cie"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "nieznany powód"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: otrzymano argument nie bêd±cy liczb±"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argument %g jest poza zasiêgiem"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: nie mo¿na opró¿niæ: potok `%s' otwarty do czytania, a nie do zapisu"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: nie mo¿na opró¿niæ: plik `%s' otwarty do czytania, a nie do zapisu"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' nie jest ani otwartym plikiem, ani potokiem, ani procesem"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: otrzymano pierwszy argument, który nie jest ³añcuchem"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: otrzymano drugi argument, który nie jest ³añcuchem"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: otrzymano argument, który nie jest liczb±"
 
-#: builtin.c:472
-#, fuzzy
+#: builtin.c:448
 msgid "`length(array)' is a gawk extension"
-msgstr "`delete tablica' jest rozszerzeniem gawk"
+msgstr "`length(tablica)' jest rozszerzeniem gawk"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: otrzymano argument, który nie jest ³añcuchem"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: otrzymano argument, który nie jest liczb±"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: otrzymano ujemny argument %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "nale¿y u¿yæ `count$' we wszystkich formatach lub nic"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "`$' jest niedozwolony w formatach awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "argument count z `$' musi byæ > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "argument count %ld wiêkszy ni¿ ca³kowita suma argumentów dostarczonych"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "`$' jest niedozwolony po kropce w formacie"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "brak `$' dla pozycyjnej szeroko¶ci pola lub precyzji"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`l' jest bezsensowny w formatach awk; zignorowany"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "`l' jest niedozwolony w formatach POSIX awk"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`L' jest bezsensowny w formatach awk; zignorowany"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "`L' jest niedozwolony w formatach POSIX awk"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`h' jest bezsensowny w formatach awk; zignorowany"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "`h' jest niedozwolony w formatach POSIX awk"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: warto¶æ %g jest poza zasiêgiem dla formatu `%%%c'"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr ""
 "brak wystarczaj±cej liczby argumentów, aby zaspokoiæ ³añcuch formatuj±cy"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "zabrak³o ^"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: specyfikator formatu nie posiada kontrolnej litery"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "zbyt du¿o podanych argumentów w ³añcuchu formatuj±cym"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: brak argumentów"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: otrzymano argument, który nie jest liczb±"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: wywo³ana z ujemnym argumentem %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: pocz±tkowy indeks %g jest nieprawid³owy, nast±pi u¿ycie 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr ""
 "substr: pocz±tkowy indeks %g, który nie jest liczb± ca³kowit±, zostanie "
 "obciêty"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: d³ugo¶æ %g nie jest >= 1"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: d³ugo¶æ %g nie jest >= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: d³ugo¶æ %g, która nie jest liczb± ca³kowit±, zostanie obciêta"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: d³ugo¶æ %g zbyt du¿a dla indeksu ³añcucha, obcinanie do %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: ³añcuch ¼ród³owy ma zerow± d³ugo¶æ"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: pocz±tkowy indeks %g le¿y poza koñcem ³añcucha"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -599,184 +611,184 @@ msgstr ""
 "substr: d³ugo¶æ %g zaczynaj±c od %g przekracza d³ugo¶æ pierwszego argumentu "
 "(%lu)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftime: otrzymano pierwszy argument, który nie jest ³añcuchem"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: otrzymano pusty ³añcuch formatuj±cy"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: otrzymano drugi argument, który nie jest liczb±"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: otrzymano argument, który nie jest ³añcuchem"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: otrzymano argument, który nie jest ³añcuchem"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "odwo³anie do niezainicjowanego pola `$%d'"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: otrzymano argument, który nie jest ³añcuchem"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: otrzymano argument, który nie jest ³añcuchem"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: otrzymano pierwszy argument, który nie jest liczb±"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: otrzymano drugi argument, który nie jest liczb±"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: otrzymano argument, który nie jest liczb±"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: otrzymano argument, który nie jest liczb±"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: otrzymano argument, który nie jest liczb±"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: otrzymano trzeci argument, który nie jest tablic±"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: trzeci argument 0 potraktowany jako 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: otrzymano pierwszy argument, który nie jest liczb±"
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: otrzymano drugi argument, który nie jest liczb±"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): ujemne warto¶ci spowoduj± dziwne wyniki"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): u³amkowe warto¶ci zostan± obciête"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "lshift(%lf, %lf): zbyt du¿a warto¶æ przesuniêcia spowoduje dziwne wyniki"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: otrzymano pierwszy argument, który nie jest liczb±"
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: otrzymano drugi argument, który nie jest liczb±"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): ujemne warto¶ci spowoduj± dziwne wyniki"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): u³amkowe warto¶ci zostan± obciête"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "rshift(%lf, %lf): zbyt du¿a warto¶æ przesuniêcia spowoduje dziwne wyniki"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: otrzymano pierwszy argument, który nie jest liczb±"
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
 msgstr "and: otrzymano drugi argument, który nie jest liczb±"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): ujemne warto¶ci spowoduj± dziwne wyniki"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): u³amkowe warto¶ci zostan± obciête"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: otrzymano pierwszy argument, który nie jest liczb±"
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
 msgstr "or: otrzymano drugi argument, który nie jest liczb±"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): ujemne warto¶ci spowoduj± dziwne wyniki"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): u³amkowe warto¶ci zostan± obciête"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: otrzymano pierwszy argument, który nie jest liczb±"
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
 msgstr "xor: otrzymano drugi argument, który nie jest liczb±"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): ujemne warto¶ci spowoduj± dziwne wyniki"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): u³amkowe warto¶ci zostan± obciête"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: otrzymano argument, który nie jest liczb±"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): ujemne warto¶ci spowoduj± dziwne wyniki"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): u³amkowe warto¶ci zostan± obciête"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' nie jest prawid³ow± kategori± lokalizacji"
@@ -790,7 +802,7 @@ msgstr "nieznany typ wêz³a %d"
 msgid "buffer overflow in genflags2str"
 msgstr "przepe³nienie bufora w genflags2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "próba u¿ycia tablicy `%s' w kontek¶cie skalaru"
@@ -838,7 +850,7 @@ msgstr "instrukcja `nextfile' nie mo¿e byæ wywo³ana z wnêtrza regu³y END"
 msgid "statement has no effect"
 msgstr "instrukcja nie ma ¿adnego efektu"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "nie mo¿na u¿yæ nazwy funkcji `%s' jako zmiennej lub tablicy"
@@ -848,7 +860,7 @@ msgstr "nie mo¿na u¿yæ nazwy funkcji `%s' jako zmiennej lub tablicy"
 msgid "reference to uninitialized argument `%s'"
 msgstr "odwo³anie do niezainicjowanego argumentu `%s'"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "odwo³anie do niezainicjowanej zmiennej `%s'"
@@ -861,46 +873,46 @@ msgstr ""
 "konkatenacja: skutki uboczne w jednym wyra¿eniu spowodowa³y zmianê d³ugo¶ci "
 "innego wyra¿enia!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "przypisanie u¿yte w kontek¶cie warunkowym"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "próba dzielenia przez zero"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "próba dzielenia przez zero w `%%'"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "nieprawid³owy typ (%s) w tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "próba dzielenia przez zero w `/='"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "próba dzielenia przez zero w `%%='"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr ""
 "funkcja `%s' zosta³a wywo³ana z wiêksz± ilo¶ci± argumentów ni¿ zosta³o to "
 "zadeklarowane"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "funkcja `%s' nie zosta³a zdefiniowana"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -911,677 +923,690 @@ msgstr ""
 "\t# Stos Wywo³awczy Funkcji:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- g³ówne --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "próba odwo³ania do pola poprzez nienumeryczn± warto¶æ"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "próba odwo³ania z zerowego ³añcucha"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "próba dostêpu do pola %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "przypisanie do wyniku wbudowanej funkcji nie jest dozwolone"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' jest rozszerzeniem gawk"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' jest rozszerzeniem gawk"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "z³a specyfikacja `%sFMT' `%s'"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "wy³±czenie `--lint' z powodu przypisania do `LINT'"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "`extension' jest rozszerzeniem gawk"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "rozszerzenie: nie mo¿na otworzyæ `%s' (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "rozszerzenie: biblioteka `%s': nie mo¿na wywo³aæ funkcji `%s' (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr "rozszerzenie: brakuj±ca nazwa funkcji"
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "rozszerzenie: nieprawid³owy znak `%c' w nazwie funkcji `%s'"
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "rozszerzenie: nie mo¿na zredefiniowaæ funkcji `%s'"
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "rozserzenie: funkcja `%s' zosta³a ju¿ zdefiniowana"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "rozszerzenie: nie mo¿na u¿yæ wbudowanej w gawk `%s' jako nazwy funkcji"
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "rozserzenie: nazwa funkcji `%s' zosta³a zdefiniowana wcze¶niej"
 
-#: ext.c:201
+#: ext.c:204
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funkcja `%s' zdefiniowana aby pobraæ nie wiêcej ni¿ %d argument(ów)"
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funkcja `%s': brakuje #%d argumentu"
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "funkcja `%s': argument #%d: próba u¿ycia skalaru jako tablicy"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "funkcja `%s': argument #%d: próba u¿ycia tablicy jako skalaru"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Operacja nie jest wspierana"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF ustawiony na warto¶æ ujemn±"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: drugi argument nie jest tablic±"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: zerowy ³añcuch dla trzeciego argumentu jest rozszerzeniem gawk"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' jest rozszerzeniem gawk"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "nieprawid³owa warto¶æ FIELDWIDTHS, w pobli¿u `%s'"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "zerowy ³añcuch dla `FS' jest rozszerzeniem gawk"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "stary awk nie wspiera wyra¿eñ regularnych jako warto¶ci `FS'"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opcja `%s' jest niejednoznaczna\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentów\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentów\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcja `%s' musi mieæ argument\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: nieznana opcja `--%s'\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: nieznana opcja `%c%s'\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: niew³a¶ciwa opcja -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: b³êdna opcja -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcja musi mieæ argument -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentów\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "nie mo¿na otworzyæ pliku `%s' do czytania (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "zamkniêcie fd %d (`%s') nie powiod³o siê (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "nieprawid³owy typ drzewa %s w funkcji redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "wyra¿enie w przekierowaniu `%s' ma tylko warto¶æ numeryczn±"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "wyra¿enie dla przekierowania `%s' ma zerow± warto¶æ ³añcucha"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "nazwa pliku `%s' dla przekierowania `%s' mo¿e byæ rezultatem logicznego "
 "wyra¿enia"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "niepotrzebne mieszanie `>' i `>>' dla pliku `%.*s'"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "nie mo¿na otworzyæ potoku `%s' jako wyj¶cia (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "nie mo¿na otworzyæ potoku `%s' jako wej¶cia (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "plik `%s' jest katalogiem"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr ""
 "nie mo¿na otworzyæ dwukierunkowego gniazda `%s' jako wej¶cia/wyj¶cia (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "nie mo¿na otworzyæ dwukierunkowego potoku `%s' jako wej¶cia/wyj¶cia (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "nie mo¿na przekierowaæ z `%s' (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "nie mo¿na przekierowaæ do `%s' (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "osi±gniêto systemowy limit otwartych plików: rozpoczêcie multipleksowania "
 "deskryptorów plików"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "zamkniêcie `%s' nie powiod³o siê (%s)."
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "zbyt du¿o otwartych potoków lub plików wej¶ciowych"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: drugim argumentem musi byæ `to' lub `from'"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 "close: `%.*s' nie jest ani otwartym plikiem, ani potokiem, ani procesem"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "zamkniêcie przekierowania, które nigdy nie zosta³o otwarte"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: przekierowanie `%s' nie zosta³o otwarte z `|&', drugi argument "
 "zignorowany"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "status awarii (%d) podczas zamykania potoku `%s' (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "status awarii (%d) podczas zamykania pliku `%s' (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "brak jawnego zamkniêcia gniazdka `%s'"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "brak jawnego zamkniêcia procesu pomocniczego `%s'"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "brak jawnego zamkniêcia potoku `%s'"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "brak jawnego zamkniêcia pliku `%s'"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "b³±d podczas zapisu na standardowe wyj¶cie (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "b³±d podczas zapisu na standardowe wyj¶cie diagnostyczne (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "opró¿nienie potoku `%s' nie powiod³o siê (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr ""
 "opró¿nienie potoku do `%s' przez proces pomocniczy nie powiod³o siê (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "opró¿nienie pliku `%s' nie powiod³o siê (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "nieprawid³owy lokalny port %s w `/inet'"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr "informacje o zdalnym ho¶cie i porcie s± nieprawid³owe (%s, %s)"
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "klient /inet/raw nie jest jeszcze gotowy, przykro mi"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "tylko superu¿ytkownik (root) mo¿e u¿yæ `/inet/raw'."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "serwer /inet/raw nie jest jeszcze gotowy, przykro mi"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "nie dostarczono (znanego) protoko³u w specjalnym pliku `%s'"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "specjalna nazwa pliku `%s' jest niekompletna"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "nieprawid³owy lokalny port `%s'"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "nale¿y dostarczyæ nazwê zdalnego hosta do `/inet'"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "nale¿y dostarczyæ numer zdalnego portu do `/inet'"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "nieprawid³owy zdalny port w `%s'"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "Komunikacja TCP/IP nie jest wspierana"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "plik `%s' jest katalogiem"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "u¿yj `PROCINFO[\"%s\"]' zamiast `%s'"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "u¿yj `PROCINFO[...]' zamiast `/dev/user'"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "nie mo¿na otworzyæ `%s', tryb `%s'"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "zamkniêcie nadrzêdnego pty nie powiod³o siê (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr ""
 "zamkniêcie standardowego wyj¶cia w procesie potomnym nie powiod³o siê (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "przesuniêcie podleg³ego pty na standardowe wyj¶cie w procesie potomnym nie "
 "powiod³o siê (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr ""
 "zamkniêcie standardowego wej¶cia w procesie potomnym nie powiod³o siê (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "przesuniêcie podleg³ego pty na standardowe wej¶cie w procesie potomnym nie "
 "powiod³o siê (dup: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "zamkniêcie podleg³ego pty nie powiod³o siê (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "przesuniêcie potoku na standardowe wyj¶cie w procesie potomnym nie powiod³o "
 "siê (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "przesuniêcie potoku na standardowe wej¶cie w procesie potomnym nie powiod³o "
 "siê (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr ""
 "odzyskanie standardowego wyj¶cia w procesie potomnym nie powiod³o siê\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr ""
 "odzyskanie standardowego wej¶cia w procesie potomnym nie powiod³o siê\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "zamkniêcie potoku nie powiod³o siê (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "`|&' nie jest wspierany"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "nie mo¿na otworzyæ potoku `%s' (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "nie mo¿na utworzyæ procesu potomnego dla `%s' (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "plik danych `%s' jest pusty"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "nie mo¿na zarezerwowaæ wiêcej pamiêci wej¶ciowej"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "b³±d podczas czytania z pliku `%s': %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "wieloznakowa warto¶æ `RS' jest rozszerzeniem gawk"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "nieistotna opcja `-m[fr]' w gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "u¿ycie opcji -m: `-m[fr] nnn'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: opcja `-W %s' nierozpoznana i zignorowana\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "pusty argument dla opcji `--source' zosta³ zignorowany"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "zmienna ¶rodowiskowa `POSIXLY_CORRECT' ustawiona: `--posix' zosta³ w³±czony"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "opcja `--posix' zostanie u¿yta nad `--traditional'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix'/`--traditional' u¿yte nad opcj± `--non-decimal-data'"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 "uruchamianie %s setuid root mo¿e byæ problemem pod wzglêdem bezpieczeñstwa"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "nie mo¿na ustawiæ trybu binarnego na standardowym wej¶ciu (%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "nie mo¿na ustawiæ trybu binarnego na standardowym wyj¶ciu (%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "nie mo¿na ustawiæ trybu binarnego na wyj¶ciu diagnostycznym (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "brak tekstu programu!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "U¿ycie: %s [styl opcji POSIX lub GNU] -f plik_z_programem [--] plik ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "U¿ycie: %s [styl opcji POSIX lub GNU] [--] %cprogram%c plik ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "Opcje POSIX:\t\tD³ugie opcje GNU:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f program\t\t--file=program\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v zmienna=warto¶æ\t--assign=zmienna=warto¶æ\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] warto¶æ\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=plik]\t--dump-variables[=plik]\n"
 
-#: main.c:681
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W exec=plik\t\t--exec=plik\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=plik]\t--profile[=plik]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=tekst-programu\t--source=tekst-programu\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1594,7 +1619,7 @@ msgstr ""
 "dokumentacji.\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1604,7 +1629,7 @@ msgstr ""
 "Program domy¶lnie czyta standardowe wej¶cie i zapisuje standardowe wyj¶cie.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1614,14 +1639,14 @@ msgstr ""
 "\tgawk '{ suma += $1 }; END { print suma }' plik\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1629,11 +1654,11 @@ msgstr ""
 "\n"
 "Ten program jest wolnym oprogramowaniem; mo¿esz go rozprowadzaæ dalej\n"
 "i/lub modyfikowaæ na warunkach Powszechnej Licencji Publicznej GNU,\n"
-"wydanej przez Fundacjê Wolnego Oprogramowania - wed³ug wersji 2-giej\n"
+"wydanej przez Fundacjê Wolnego Oprogramowania - wed³ug wersji 3-giej\n"
 "tej Licencji lub której¶ z pó¼niejszych wersji.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1648,23 +1673,22 @@ msgstr ""
 "Powszechn± Licencjê Publiczn± GNU.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Z pewno¶ci± wraz z niniejszym programem otrzyma³e¶ te¿ egzemplarz\n"
 "Powszechnej Licencji Publicznej GNU (GNU General Public License);\n"
 "je¶li za¶ nie - napisz do Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft nie ustawia FS na znak tabulatora w POSIX awk"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -1673,35 +1697,35 @@ msgstr ""
 "%s: argument `%s' dla `-v' nie jest zgodny ze sk³adni± `zmienna=warto¶æ'\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' nie jest dozwolon± nazw± zmiennej"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' nie jest nazw± zmiennej, szukanie pliku `%s=%s'"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "wyj±tek zmiennopozycyjny"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "fatalny b³±d: wewnêtrzny b³±d"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "brak ju¿ otwartego fd %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "nie mo¿na otworzyæ zawczasu /dev/null dla fd %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "nie mo¿na znale¼æ grup: %s"
@@ -1723,23 +1747,28 @@ msgstr "b³±d: "
 msgid "fatal: "
 msgstr "fatalny b³±d: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "nie mo¿na zamieniæ ³añcucha do liczby zmiennopozycyjnej"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "backslash na koñcu ³añcucha"
 
-#: node.c:604
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "stary awk nie wspiera sekwencji ucieczki `\\%c'"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX nie zezwala na sekwencjê ucieczki `\\x'"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "brak liczb szesnastkowych w sekwencji ucieczki `\\x'"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "sekwencja ucieczki `\\%c' potraktowana jako zwyk³e `%c'"
@@ -1749,31 +1778,31 @@ msgstr "sekwencja ucieczki `\\%c' potraktowana jako zwyk³e `%c'"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s': nie mo¿na ustawiæ close-on-exec: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "nie mo¿na otworzyæ `%s' do zapisu: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr "wewnêtrzny b³±d: %s z zerowym vname"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# potraktowany wewnêtrznie jako `delete'"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr "# to jest dynamicznie ³adowana funkcja rozszerzenie"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# profil programu gawk, utworzony %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1782,7 +1811,7 @@ msgstr ""
 "\t# blok(i) BEGIN\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1791,7 +1820,7 @@ msgstr ""
 "\t# Regu³y\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1800,7 +1829,7 @@ msgstr ""
 "\t# blok(i) END\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1809,83 +1838,86 @@ msgstr ""
 "\n"
 "\t# Funkcje, spis alfabetyczny\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "niespodziewany typ %s w prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Sukces"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Brak dopasowania"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Nieprawid³owe wyra¿enie regularne"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Nieprawid³owy znak porównania"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Nieprawid³owa nazwa klasy znaku"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Koñcowy znak backslash"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Nieprawid³owe odwo³anie wsteczne"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "Niedopasowany znak [ lub [^"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "Niedopasowany znak ( lub \\("
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "Niedopasowany znak \\{"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Nieprawid³owa zawarto¶æ \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Nieprawid³owy koniec zakresu"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Pamiêæ wyczerpana"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Nieprawid³owe poprzedzaj±ce wyra¿enie regularne"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Przedwczesny koniec wyra¿enia regularnego"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Wyra¿enie regularne jest zbyt du¿e"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "Niedopasowany znak ) lub \\)"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Brak poprzedniego wyra¿enia regularnego"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "nieprawid³owy zdalny port w `%s'"
+
 #~ msgid "function %s called\n"
 #~ msgstr "wywo³ano funkcjê %s\n"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index a9e9b1a8..171a4b69 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d259e0d9..132cfa22 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.2g\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2003-06-26 16:18+0300\n"
 "Last-Translator: Juan Carlos Castro y Castro <jcastro@vialink.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -35,350 +35,365 @@ msgstr "tentativa de usar escalar `%s' como vetor"
 msgid "from %s"
 msgstr "de %s"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "referência a elemento não inicializado `%s[\"%s\"]'"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "índice do vetor `%s' é uma string nula"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: índice `%s' não está no vetor `%s'"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: vazio (nulo)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: vazio (zero)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: table_size = %d, array_size = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: é parâmetro\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: array_ref para %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "blocos %s devem ter uma parte de ação"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "cada regra deve ter um padrão ou uma parte de ação"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "o velho awk não suporta o operador `**'"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' é uma função intrínseca, não pode ser redefinida"
 
-#: awkgram.y:313
+#: awkgram.y:328
 #, fuzzy
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "constante de expr. reg. `/%s/' parece um comentário C, mas não é"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "constante de expr. reg. `/%s/' parece um comentário C, mas não é"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "declaração pode não ter efeito"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "`%s' usado em ação %s"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "`nextfile' é uma extensão do gawk"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "`return' usado fora do contexto de função"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "`print' sozinho em regra BEGIN ou END provavelmente deveria ser `print \"\"'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "`delete array' é uma extensão do gawk"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(array)' é uma extensão não-portável do tawk"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "valores de case duplicados no corpo do switch: %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr "Detectado `default' duplicado no corpo do switch"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "pipelines bidirecionais de múltiplos estágios não funcionam"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "expressão regular à direita de atribuição"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "expressão regular à esquerda de operador `~' ou `!~'"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "o velho awk não suporta o operador `**'"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "expressão regular à direita de comparação"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "`getline' não-redirecionado não é definido dentro da ação END"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "o velho awk não suporta o operador `**'"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "chamada a `length' sem parênteses não é portável"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "chamada a `length' sem parênteses é obsoleta de acordo com POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr "uso de não-vetor como vetor"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "expressão de índice inválida"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "fim de linha ou de string inesperado"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "texto de programa vazio na linha de comando"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "impossível abrir arquivo-fonte `%s' para leitura (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "impossível ler arquivo-fonte `%s' (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "arquivo-fonte `%s' está vazio"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "arquivo-fonte não termina em fim-de-linha"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "expressão regular inacabada termina com `\\' ao fim do arquivo"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "expressão regular inacabada"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "expressão regular inacabada no fim do arquivo"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "uso da continuação de linha `\\ #...' não é portável"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "`\\' não é o último caracter da linha"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX não permite o operador `**='"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "o velho awk não suporta o operador `**='"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX não permite o operador `**'"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "o velho awk não suporta o operador `**'"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "o velho awk não suporta o operador `^='"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "o velho awk não suporta o operador `^'"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "string inacabada"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "caracter inválido '%c' em expressão"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' é uma extensão do gawk"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "`%s' é uma extensão da Bell Labs"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX não permite `%s'"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' não é suportado no velho awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' é considerado danoso!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d é inválido como número de argumentos para %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: terceiro argumento é uma extensão do gawk"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: string literal como último argumento de substituição não tem efeito"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "terceiro parâmetro %s não é um objeto modificável"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: segundo argumento é uma extensão do gawk"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "uso de dcgettext(_\"...\") é incorreto: remova o `_' precedente"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "uso de dcngettext(_\"...\") é incorreto: remova o `_' precedente"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "função `%s': parâmetro #%d, `%s', duplica parâmetro #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "função `%s': parâmetro `%s' encobre variável global"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "impossível abrir `%s' para escrita (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "enviando perfil para saída de erros"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: `close' falhou (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() chamada duas vezes!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "houve variáveis encobertas."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "função `%s': não se pode usar o nome da função como nome de parâmetro"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "nome de função `%s' definido anteriormente"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "função `%s' chamada mas nunca definida"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "função `%s' definida mas nunca chamada"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "constante com expr. regular para parâmetro nº %d retorna valor booleano"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, fuzzy, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -387,198 +402,198 @@ msgstr ""
 "função `%s' chamada com espaço entre o nome e o `(',\n"
 "%s"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s para \"%s\" falhou (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "saída padrão"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "motivo desconhecido"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: recebeu argumento não-numérico"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argumento %g está fora da faixa"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: erro ao descarregar: pipe `%s' aberto para leitura, não gravação"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: erro ao descarregar: arquivo `%s' aberto para leitura, não gravação"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' não é um arquivo aberto, pipe ou co-processo"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: recebeu primeiro argumento não-string"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: recebeu segundo argumento não-string"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: recebeu argumento não-numérico"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "`delete array' é uma extensão do gawk"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: recebeu argumento não-string"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: recebeu argumento não-numérico"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: recebeu argumento negativo %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "deve usar `count$' em todos os formatos ou nenhum"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "`$' não é permitido em formatos awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "nº de argumentos com `$' deve ser > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "nº de argumentos %ld maior que nº total de argumentos fornecidos"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "`$' não é permitido depois de ponto no formato"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "nenhum `$' fornecido para tamanho ou precisão de campo posicional"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`l' não faz sentido em formatos awk; ignorado"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "`l' não é permitido em formatos POSIX awk"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`L' não faz sentido em formatos awk; ignorado"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "`L' não é permitido em formatos POSIX awk"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`h' não faz sentido em formatos awk; ignorado"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "`h' não é permitido em formatos POSIX awk"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: valor %g fora da faixa para formato `%%%c'"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "argumentos insuficientes para a string de formato"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ acabou para este aqui"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: declaração de formato não tem letra de controle"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "excesso de argumentos para a string de formato"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: nenhum argumento"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: recebeu argumento não-numérico"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: chamada com argumento negativo %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: posição inicial %g é inválida, usando 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: posição inicial %g não-inteira será truncada"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: comprimento %g é <= 0"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: comprimento %g é <= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: comprimento %g não-inteiro será truncado"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: comprimento %g excessivo para indexação, truncando para %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: string origem tem comprimento zero"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: posição inicial %g além do fim da string"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -586,187 +601,187 @@ msgstr ""
 "substr: comprimento %g a partir da posição %g excede tamanho do 1º argumento "
 "(%lu)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftime: recebeu primeiro argumento não-string"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: recebeu string de formato vazia"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: recebeu segundo argumento não-numérico"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: recebeu argumento não-string"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: recebeu argumento não-string"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referência a campo não inicializado `$%d'"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: recebeu argumento não-string"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: recebeu argumento não-string"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: recebeu primeiro argumento não-numérico"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: recebeu segundo argumento não-numérico"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: recebeu argumento não-numérico"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: recebeu argumento não-numérico"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: recebeu argumento não-numérico"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: terceiro argumento não é um vetor"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: 3º argumento 0 tratado como 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: recebeu primeiro argumento não-numérico"
 
-#: builtin.c:2717
+#: builtin.c:2768
 #, fuzzy
 msgid "lshift: received non-numeric second argument"
 msgstr "strftime: recebeu segundo argumento não-numérico"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): valores negativos darão resultados estranhos"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): valores fracionários serão truncados"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "lshift(%lf, %lf): deslocamento excessivo dará resultados estranhos"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: recebeu primeiro argumento não-numérico"
 
-#: builtin.c:2755
+#: builtin.c:2806
 #, fuzzy
 msgid "rshift: received non-numeric second argument"
 msgstr "strftime: recebeu segundo argumento não-numérico"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): valores negativos darão resultados estranhos"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): valores fracionários serão truncados"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "rshift(%lf, %lf): deslocamento excessivo dará resultados estranhos"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: recebeu primeiro argumento não-numérico"
 
-#: builtin.c:2793
+#: builtin.c:2844
 #, fuzzy
 msgid "and: received non-numeric second argument"
 msgstr "atan2: recebeu segundo argumento não-numérico"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): valores negativos darão resultados estranhos"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): valores fracionários serão truncados"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: recebeu primeiro argumento não-numérico"
 
-#: builtin.c:2829
+#: builtin.c:2880
 #, fuzzy
 msgid "or: received non-numeric second argument"
 msgstr "atan2: recebeu segundo argumento não-numérico"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): valores negativos darão resultados estranhos"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): valores fracionários serão truncados"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: recebeu primeiro argumento não-numérico"
 
-#: builtin.c:2865
+#: builtin.c:2916
 #, fuzzy
 msgid "xor: received non-numeric second argument"
 msgstr "atan2: recebeu segundo argumento não-numérico"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): valores negativos darão resultados estranhos"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): valores fracionários serão truncados"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: recebeu primeiro argumento não-numérico"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): valores negativos darão resultados estranhos"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): valores fracionários serão truncados"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' não é uma categoria de \"locale\" válida"
@@ -780,7 +795,7 @@ msgstr "tipo de nodo desconhecido %d"
 msgid "buffer overflow in genflags2str"
 msgstr "estouro de buffer em genflags2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "tentativa de usar vetor `%s' em um contexto escalar"
@@ -827,7 +842,7 @@ msgstr "`nextfile' não pode ser chamado de uma regra END"
 msgid "statement has no effect"
 msgstr "declaração não tem efeito"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "não se pode usar o nome de função `%s' como variável ou vetor"
@@ -837,7 +852,7 @@ msgstr "não se pode usar o nome de função `%s' como variável ou vetor"
 msgid "reference to uninitialized argument `%s'"
 msgstr "referência a argumento não inicializado `%s'"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referência a variável não inicializada `%s'"
@@ -850,44 +865,44 @@ msgstr ""
 "concatenação: efeitos colaterais em um contexto mudaram o comprimento de "
 "outro!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "atribuição usada em contexto condicional"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "tentativa de divisão por zero"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "tentativa de divisão por zero em `%%'"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "tipo ilegal (%s) em tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "tentativa de divisão por zero em `/='"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "tentativa de divisão por zero em `%%='"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "função `%s' chamada com mais argumentos que os declarados"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "função `%s' não definida"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -898,660 +913,674 @@ msgstr ""
 "\t# Pilha de Chamadas de Função:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- main --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "tentativa de referência a campo a partir de valor não-numérico"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "tentativa de referência a partir de string nula"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "tentativa de acessar campo %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "atribuição não pode resultar de funções intrínsecas"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' é uma extensão do gawk"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' é uma extensão do gawk"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "especificação `%sFMT' inválida `%s'"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "desativando `--lint' devido a atribuição a `LINT'"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "`extension' é uma extensão do gawk"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: impossível abrir `%s' (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: biblioteca `%s': impossível chamar função `%s' (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:107
+#: ext.c:110
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: biblioteca `%s': impossível chamar função `%s' (%s)\n"
 
-#: ext.c:113
+#: ext.c:116
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: impossível abrir `%s' (%s)\n"
 
-#: ext.c:117
+#: ext.c:120
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "função `%s' não definida"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:124
+#: ext.c:127
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "nome de função `%s' definido anteriormente"
 
-#: ext.c:201
+#: ext.c:204
 #, fuzzy, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "função `%s' definida mas nunca chamada"
 
-#: ext.c:204
+#: ext.c:207
 #, fuzzy, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "função `%s' não definida"
 
-#: ext.c:214
+#: ext.c:217
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "tentativa de usar escalar `%s' como vetor"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Operação Não Suportada"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "valor negativo atribuído a NF"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: segundo argumento não é um vetor"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: string nula para segundo argumento é uma extensão do gawk"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' é uma extensão do gawk"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "string nula para `FS' é uma extensão do gawk"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "o velho awk não suporta o operador `**'"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opção `%s' é ambígua\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opção `--%s' não aceita argumento\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opção `%c%s' não aceita argumento\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opção `%s' requer argumento\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opção não reconhecida `--%s'\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opção não reconhecida `%c%s'\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opção ilegal -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opção inválida -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opção requer argumento -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opção `-W %s' é ambígua\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opção `-W %s' não aceita argumento\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "impossível abrir arquivo `%s' para leitura (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "fechamento do descritor %d (`%s') falhou (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "tipo de árvore %s inválido em redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "expressão no redirecionamento `%s' só tem valor numérico"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "expressão para o redirecionamento `%s' tem valor string nulo"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "nome de arquivo `%s' para redirecionamento `%s' pode ser resultado de "
 "expressão lógica"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mistura desnecessária de `>' e `>>' para arquivo `%.*s'"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "impossível abrir pipe `%s' para saída (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "impossível abrir pipe `%s' para entrada (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "arquivo `%s' é um diretório"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr "impossível abrir socket bidirecional `%s' para entrada/saída (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "impossível abrir pipe bidirecional `%s' para entrada/saída (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "impossível redirecionar de `%s' (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "impossível redirecionar para `%s' (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "alcançado limite do sistema para arquivos abertos; começando a multiplexar "
 "descritores de arquivos"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "fechamento de `%s' falhou (%s)"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "excesso de pipes ou arquivos de entrada abertos"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: segundo argumento deve ser `to' ou `from'"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: `%.*s' não é um arquivo aberto, pipe ou co-processo"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "fechamento de redirecionamento que nunca foi aberto"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: redirecionamento `%s' não foi aberto com `|&', segundo argumento "
 "ignorado"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "status de falha (%d) ao fechar pipe de `%s' (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "status de falha (%d) ao fechar arquivo de `%s' (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "fechamento explícito do socket `%s' não fornecido"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "fechamento explícito do co-processo `%s' não fornecido"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "fechamento explícito do pipe `%s' não fornecido"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "fechamento explícito do arquivo `%s' não fornecido"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "erro ao escrever na saída padrão (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "erro ao escrever na saída padrão de erros (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "descarga de pipe de `%s' falhou (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "descarga de co-processo de pipe para `%s' falhou (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "descarga de arquivo de `%s' falhou (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "porta local inválida em `%s'"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "infelizmente, o cliente de /inet/raw não está concluído"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "apenas root pode usar `/inet/raw'."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "infelizmente, o servidor de /inet/raw não está concluído"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr ""
 "nenhum protocolo (conhecido) fornecido em nome de arquivo especial `%s'"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "nome de arquivo especial `%s' está incompleto"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "porta local inválida em `%s'"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "deve ser fornecido um nome de host remoto para `/inet'"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "deve ser fornecida uma porta remota para `/inet'"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "porta remota inválida em `%s'"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "comunicação TCP/IP não é suportada"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "arquivo `%s' é um diretório"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "use `PROCINFO[\"%s\"]' em vez de `%s'"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "use `PROCINFO[...]' em vez de `/dev/user'"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "impossível abrir `%s', modo `%s'"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "falha ao fechar pty mestre (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "falha ao fechar stdout em filho (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "falha ao mover pty escrava para stdout em filho (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "falha ao fechar stdin em filho (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "falha ao mover pty escrava para stdin em filho (dup: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "falha ao fechar pty escrava (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "falha ao mover pipe para stdout em processo pai (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "falha ao mover pipe para stdin em processo pai (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "falha ao restaurar stdout em processo pai\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "falha ao restaurar stdin em processo pai\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "falha ao fechar pipe (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "`|&' não suportado"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "impossível abrir pipe `%s' (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "impossível criar processo filho para `%s' (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "arquivo de dados `%s' vazio"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "impossível alocar mais memória de entrada"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "erro ao ler arquivo de entrada `%s': %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "valor de múltiplos caracteres para `RS' é uma extensão do gawk"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "opção `-m[fr] é irrelevante no gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "uso da opção -m: `-m[fr] nnn'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: opção `-W %s' não reconhecida, ignorada\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "argumento vazio para --source ignorado"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "variável de ambiente `POSIXLY_CORRECT' ativada: ligando `--posix'"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--posix' sobrepõe `--traditional'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix'/`--traditional' sobrepõe `--non-decimal-data'"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "rodar %s com setuid root pode ser um problema de segurança"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "impossível ativar modo binário em stdin (%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "impossível ativar modo binário em stdout (%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "impossível ativar modo binário em stderr (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "nenhum texto de programa"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Uso: %s [opções estilo POSIX ou GNU] -f arqprog [--] arquivo ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Uso: %s [opções estilo POSIX ou GNU] [--]  %cprograma%c arquivo ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "Opções POSIX: \t\tOpções longas GNU:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f arqprog \t\t--file=arqprog\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=val\t\t--assign=var=val\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] val\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=arq] \t--dump-variables[=arq]\n"
 
-#: main.c:681
+#: main.c:706
 #, fuzzy
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W profile[=arq] \t--profile[=arq]\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=arq] \t--profile[=arq]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=program-text\t--source=program-text\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1563,7 +1592,7 @@ msgstr ""
 "seção `Reportando Problemas e Bugs' na versão impressa.\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1573,7 +1602,7 @@ msgstr ""
 "Por padrão, o gawk lê a entrada padrão e escreve na saída padrão.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1583,14 +1612,14 @@ msgstr ""
 "\tgawk '{ soma += $1 }; END { print soma }' arquivo\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1598,11 +1627,11 @@ msgstr ""
 "\n"
 "Este programa é Software Livre; você pode redistribuí-lo e/ou modificá-lo\n"
 "de acordo com os termos da Licença Pública Geral GNU (GNU GPL) na "
-"formapublicada pela Free Software Foundation; ou a versão 2 da licença ou "
+"formapublicada pela Free Software Foundation; ou a versão 3 da licença ou "
 "(aoseu critério) qualquer versão posterior.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1614,23 +1643,22 @@ msgstr ""
 "QUALQUER GARANTIA. Veja a Licença Pública Geral GNU (GNU GPL)\n"
 "para mais detalhes.\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Você deve ter recebido uma cópia da Licença Pública Geral GNU (GNU GPL)\n"
 "junto com este programa; caso contrário, escreva à Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
 "USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft não faz FS ser tab no awk POSIX"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -1639,35 +1667,35 @@ msgstr ""
 "%s: argumento `%s' para `-v' não está na forma `var=valor'\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' não é um nome legal de variável"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' não é um nome de variável, procurando arquivo `%s=%s'"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "exceção de ponto flutuante"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "erro fatal: erro interno"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "nenhum descritor pré-aberto %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "impossível pré-abrir /dev/null para descritor %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "impossível achar grupos: %s"
@@ -1689,23 +1717,28 @@ msgstr "erro: "
 msgid "fatal: "
 msgstr "fatal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "impossível converter string para float"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "barra invertida (\\) no fim da string"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "o velho awk não suporta o operador `**'"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX não permite escapes do tipo `\\x'"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "nenhum dígito hexa em seqüência de escape `\\x'"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "seqüência de escape `\\%c' tratada como `%c' normal"
@@ -1715,31 +1748,31 @@ msgstr "seqüência de escape `\\%c' tratada como `%c' normal"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s': impossível ativar fechar-ao-executar: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "impossível abrir `%s' para escrita: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr "erro interno: %s com vname nulo"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# tratado internamente como `delete'"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr ""
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# perfil gawk, criado %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1748,7 +1781,7 @@ msgstr ""
 "\t# bloco(s) BEGIN\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1757,7 +1790,7 @@ msgstr ""
 "\t# Regra(s)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1766,7 +1799,7 @@ msgstr ""
 "\t# bloco(s) END\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1775,83 +1808,86 @@ msgstr ""
 "\n"
 "\t# Funções, listadas alfabeticamente\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "tipo inesperado %s em prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Sucesso"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Sem combinação"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Expressão regular inválida"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Caracter de combinação inválido"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Nome de classe de caracter inválido"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "contra-barra (\\) finalizando"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Referência anterior inválida"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ ou [^ não emparelhado"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( ou \\( não emparelhado"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "\\{ não emparelhado"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Conteúdo inválido de \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Fim de faixa inválido"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Memória esgotada"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Expressão regular anterior inválida"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Fim prematuro da expressão regular"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Expressão regular grande demais"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") ou \\) desemparelhado"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Nenhuma expressão regular anterior"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "porta remota inválida em `%s'"
+
 #~ msgid "function %s called\n"
 #~ msgstr "função %s chamada\n"
 
diff --git a/po/ro.gmo b/po/ro.gmo
index e246a9fc..407615cc 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index fff2832e..9805d8ba 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.31\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2003-09-15 17:48+0300\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -34,361 +34,376 @@ msgstr "încercare de a utiliza scalarul `%s' ca array"
 msgid "from %s"
 msgstr "%s (din %s)"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "referinþã la elementul neiniþializat `%s[\"%s\"]'"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "înscrierea array-ului `%s' este ºir null"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: indexul `%s' nu este în array-ul `%s'"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: vid (null)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: vid (zero)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: table_size = %d, array_size = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, fuzzy, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: este parametru!\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: array_ref cãtre %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, fuzzy, c-format
 msgid "%s blocks must have an action part"
 msgstr "Blocurile de END trebuie sã aibã un fragment de acþiune"
 
-#: awkgram.y:211
+#: awkgram.y:218
 #, fuzzy
 msgid "each rule must have a pattern or an action part"
 msgstr "Blocurile de END trebuie sã aibã un fragment de acþiune"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "vechiul awk nu supoortã operatorul `**'"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' este funcþie internã, nu poate fi redefinitã"
 
-#: awkgram.y:313
+#: awkgram.y:328
 #, fuzzy
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "constanta regexp `/%s/' aratã ca un comentariu C, dar nu este"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "constanta regexp `/%s/' aratã ca un comentariu C, dar nu este"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "declaraþia poate sã nu aibã nici un efect"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, fuzzy, c-format
 msgid "`%s' used in %s action"
 msgstr "`next' folosit în acþiune BEGIN sau END"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "`nextfile' este extensie gawk"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "`return' folosit în afara contextului funcþiei"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "`print' simplu din regulile BEGIN sau END ar trebui sã fie probabil `print "
 "\"\"'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "`delete array' este extensie gawk"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 #, fuzzy
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete array' este extensie gawk"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "legãturile(pipelines) bidirecþionale multistage nu vor funcþiona"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "expresie regularã în dreapta atribuirii"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "expresie regularã în stânga operatorului `~' sau `!~'"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "vechiul awk nu supoortã operatorul `**'"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "expresie regularã în dreapta comparaþiei"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "`getline' nedefinitã ºi neredirectatã înãuntrul unei acþiuni END"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "vechiul awk nu supoortã operatorul `**'"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "apelarea lui `legth' fãrã paranteze nu este portabilã"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "apelarea lui `length' fãrã paranteze nu mai este folositã în POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr ""
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "expresie subscript invalidã"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 #, fuzzy
 msgid "unexpected newline or end of string"
 msgstr "linie nouã neaºteptatã"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "text program vid în linia de comandã"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "nu se poate deschide fiºierul sursã `%s' pentru citire (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "nu se poate citi fiºierul sursã `%s' (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "fiºierul sursã `%s' este vid"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "fiºierul sursã nu se terminã în linie nouã"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "regexp-ul neterminat se terminã cu `\\'` la sfârºitul fiºierului"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "regexp neterminat"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "regexp neterminat la sfârºitul fiºierului"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "folosirea continuãrii liniei `\\ #...' nu este portabilã"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "backslash nu este ultimul caracter din linie"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX nu permite operatorul `**='"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "vechiul awk nu suportã operatorul `**='"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX nu permite operatorul `**'"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "vechiul awk nu supoortã operatorul `**'"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "operatorul `^=' nu este suportat în vechiul awk"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "operator `^' nu este suportat în vechiul awk"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "ºir de caractere neterminat"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "caracter invalid `%c' în expresie"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' este extensie gawk"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "`%s' este extensie Bell Labs"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX nu permite `%s'"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' nu este suportat în vechiul awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' este considerat periculos!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d este invalid ca numãr de argumente pentru %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: al treilea argument este extensie gawk"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: ºirul de caractere literal ca ultim argument al înlocuitorului nu are "
 "nici un efect"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, fuzzy, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "al treilea parametru al sub nu este un obiect modificabil"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: al doilea argument este extensie gawk"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "folosirea lui dcgettext(_\"...\") este incorectã: eliminaþi liniuþa_jos de "
 "la început"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 #, fuzzy
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "folosirea lui dcgettext(_\"...\") este incorectã: eliminaþi liniuþa_jos de "
 "la început"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funcþia `%s': parametrul #%d, `%s', parametrul duplicat #%d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr ""
 "funcþia `%s': parametrul `%s' nu mai þine cont de(shadows) variabila globalã"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "nu s-a putut deschide `%s' pentru scriere (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "se trimite profilul la dipsozitivul de eroare standard"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: închidere eºuatã (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() apelatã de douã ori!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr ""
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funcþia `%s': nu se poate folosi numele funcþiei ca nume de parametru"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "numele funcþiei `%s' a mai fost definit înainte"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funcþia `%s' este apelatã dar niciodatã definitã"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "funcþia `%s' este definitã dar niciodatã apelatã"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "regexp constant pentru parametrul #%d solicitã(yields) valoare booleanã"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, fuzzy, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -397,204 +412,204 @@ msgstr ""
 "funcþia `%s' apelatã cu un spaþiu între nume ºi `(',\n"
 "%s"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s cãtre \"%s\" eºuatã (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "ieºire(output) standard"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "motiv necunoscut"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: s-a primit argument nenumeric"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argumentul %g este în afara domeniului"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: nu s-a putut face flush: legãtura(pipe) `%s' a fost deschisã pentru "
 "citire, nu scriere"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: nu s-a putut face flush: fiºierul `%s' a fost deschis pentru citire, "
 "nu scriere"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' nu este fiºier deschis, legãturã(pipe) sau co-proces"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: s-a primit un prim argument non-ºir de caractere"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: s-a primit un al doilea argument non-ºir de caractere"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: s-a primit argument nenumeric"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "`delete array' este extensie gawk"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "legth: s-a primit argument non-string"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: s-a primit argument nenumeric"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: s-a primit argument %g negativ"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr ""
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "`$' nu este permis în formatele awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "numãrul de arg cu `%' trebuie sã fie > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, fuzzy, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "numãrul de arg %d este mai mare decât numãrul total de argumente furnizate"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "`$' nu este permis în format dupã punct"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr ""
 "nu s-a furnizat nici un `$' pentru câmpul poziþional lungime sau precisie"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`l' nu are sens în formatele awk; ignorat"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "`l' nu este permis în formatele awk POSIX"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`L' nu are sens în formatele awk; ignorat"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "`L' nu este permis în formatele POSIX awk"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`h' nu are sens în formatele awl; ignorat"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "`h' nu este permis în formatele POSIX awk"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr ""
 "nu existã destule argumente pentru satisfacerea formatului ºirului de "
 "caractere"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ insuficient pentru aceasta"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: specificatorul de format nu are literã de control"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "prea multe argumente furnizate pentru formatul ºirului de caractere"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: nici un argument"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: s-a primit argument nenumeric"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: apelat cu argumentul negativ %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: indexul de start %g este invalid, se foloseºte -1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: indexul de start ne-întreg(integer) %g va fi trunchiat"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: lungimea %g este <= 0"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: lungimea %g este <= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr lungimea ne-întregului(integer) %g va fi trunchiatã"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: ºirul de caractere sursã are lungime zero"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, fuzzy, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: indexul de start %d este fostul sfârºit de ºir de caractere"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, fuzzy, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -602,195 +617,195 @@ msgstr ""
 "substr: lungimea %d la indexul de start %d depãºeºte lungimea primului "
 "argument (%d)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 #, fuzzy
 msgid "strftime: received non-string first argument"
 msgstr "strftime: s-a primit primul argument non ºir de caractere"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: s-a primit ºir de caractere în format vid"
 
-#: builtin.c:1493
+#: builtin.c:1573
 #, fuzzy
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: s-a primit un al doilea argument nenumeric"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: s-a primit argument non ºir de caractere"
 
-#: builtin.c:1601
+#: builtin.c:1695
 #, fuzzy
 msgid "system: received non-string argument"
 msgstr "system: s-a primit argument non ºir de caractere"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, fuzzy, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referinþã la variabila neiniþializatã `%s'"
 
-#: builtin.c:1827
+#: builtin.c:1921
 #, fuzzy
 msgid "tolower: received non-string argument"
 msgstr "tolower: s-a primit argument non-ºir de caractere"
 
-#: builtin.c:1857
+#: builtin.c:1951
 #, fuzzy
 msgid "toupper: received non-string argument"
 msgstr "toupper: s-a primit argument non-ºir de caractere"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: s-a primit un prim argument nenumeric"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: s-a primit un al doilea argument nenumeric"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: s-a primit un argument nenumeric"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: s-a primit un argument nenumeric"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: s-a primit un argument nenumeric"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: al treilea argument nu este un array"
 
-#: builtin.c:2555
+#: builtin.c:2650
 #, fuzzy
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: al 3-lea argument care este 0 va fi considerat 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: s-a primit un prim argument nenumeric"
 
-#: builtin.c:2717
+#: builtin.c:2768
 #, fuzzy
 msgid "lshift: received non-numeric second argument"
 msgstr "strftime: s-a primit un al doilea argument nenumeric"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): valorile negative vor furniza rezultate ciudate"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): valorile fracþionale vor fi trunchiate"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "lshift(%lf, %lf): valorile schimbate prea mult vor da rezultate ciudate"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: s-a primit un prim argument nenumeric"
 
-#: builtin.c:2755
+#: builtin.c:2806
 #, fuzzy
 msgid "rshift: received non-numeric second argument"
 msgstr "strftime: s-a primit un al doilea argument nenumeric"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): valorile negative vor da rezultate ciudate"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): valorile fracþionale vor fi trunchiate"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr ""
 "rshift(%lf, %lf): valorile schimbate prea mult vor da rezultate ciudate"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: s-a primit un prim argument nenumeric"
 
-#: builtin.c:2793
+#: builtin.c:2844
 #, fuzzy
 msgid "and: received non-numeric second argument"
 msgstr "atan2: s-a primit un al doilea argument nenumeric"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): valorile negative vor da rezultate ciudate"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): valorile fracþionale vor fi trunchiate"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: s-a primit un prim argument nenumeric"
 
-#: builtin.c:2829
+#: builtin.c:2880
 #, fuzzy
 msgid "or: received non-numeric second argument"
 msgstr "atan2: s-a primit un al doilea argument nenumeric"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): valorile negative for da rezultate ciudate"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): valorile fracþionale vor fi trunchiate"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: s-a primit un prim argument nenumeric"
 
-#: builtin.c:2865
+#: builtin.c:2916
 #, fuzzy
 msgid "xor: received non-numeric second argument"
 msgstr "atan2: s-a primit un al doilea argument nenumeric"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): valorile negative vor da rezultate ciudate"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): valorile fracþionale vor fi trunchiate"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: s-a primit argument nenumeric"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): valorile negative vor da rezultate ciudate"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): valorile fracþionale vor fi trunchiate"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' nu este o categorie localã validã"
@@ -804,7 +819,7 @@ msgstr "tip nod %d necunoscut"
 msgid "buffer overflow in genflags2str"
 msgstr "depãºire(overflow) de buffer în genflags2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "încercare de a utiliza array-ul `%s' într-un context scalar"
@@ -852,7 +867,7 @@ msgstr "`nextfile' nu poate fi apelat dintr-o regulã END"
 msgid "statement has no effect"
 msgstr "declaraþia nu are nici un efect"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "nu se poate folosi numele funcþiei `%s' ca variabilã sau array"
@@ -862,7 +877,7 @@ msgstr "nu se poate folosi numele funcþiei `%s' ca variabilã sau array"
 msgid "reference to uninitialized argument `%s'"
 msgstr "referinþã la argumentul neiniþializat `%s'"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referinþã la variabila neiniþializatã `%s'"
@@ -875,45 +890,45 @@ msgstr ""
 "concatenation: efectele secundare dintr-o expresie au schimbat lungimea "
 "alteia!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "atribuire folositã în context condiþional"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "s-a încercat împãrþire la zero"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "s-a încercat împãrþire la zero în `%%'"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "tip ilegal (%s) în tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "s-a încercat împãrþire la zero în `/='"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "s-a încercat împãrþire la zero în `%%='"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr ""
 "funcþia `%s' a fost apelatã cu mai multe argumente decât cele declarate"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "funcþia `%s' nu este definitã"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -924,666 +939,680 @@ msgstr ""
 "\t# Stiva de Apelare a Funcþiei:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- principal(main) --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "încercare de referinþã la câmp din valoare nenumericã"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "încercare de referinþã din ºir de caractere vid(null)"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "încercare de accesare a câmpului %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "atribuirea nu este permisã rezultatului funcþiei interne"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' este extensie gawk"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' este extensie gawk"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "`%sFMT' specificaþie `%s' invalidã"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "se dezactiveazã `--lint' din cauza atribuirii lui `LINT'"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "`extension' este o extensie gawk"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: nu s-a putut deschide `%s' (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: biblioteca `%s': nu pot apela funcþia `%s' (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:107
+#: ext.c:110
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: biblioteca `%s': nu pot apela funcþia `%s' (%s)\n"
 
-#: ext.c:113
+#: ext.c:116
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: nu s-a putut deschide `%s' (%s)\n"
 
-#: ext.c:117
+#: ext.c:120
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "funcþia `%s' nu este definitã"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:124
+#: ext.c:127
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "numele funcþiei `%s' a mai fost definit înainte"
 
-#: ext.c:201
+#: ext.c:204
 #, fuzzy, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funcþia `%s' este definitã dar niciodatã apelatã"
 
-#: ext.c:204
+#: ext.c:207
 #, fuzzy, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funcþia `%s' nu este definitã"
 
-#: ext.c:214
+#: ext.c:217
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "încercare de a utiliza scalarul `%s' ca array"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Operaþie NeSuportatã"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF setat la valoare negativã"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: al doilea argument nu este un array"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: ºirul nul pentru al treilea arg este o extensie gawk"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' este extensie gawk"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "ºirul de caractere null pentru `FS' este extensie gawk"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "vechiul awk nu supoortã operatorul `**'"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opþiunea `%s' este ambiguã\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `--%s' nu permite parametri\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `%c%s' nu permite parametri\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opþiunea `%s' necesitã un parametru\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opþiune necunoscutã `--%s'\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opþiune necunoscutã `%c%s'\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opþiune ilegalã -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opþiune invalidã -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opþiunea necesitã un parametru -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opþiunea `-W %s' este ambiguã\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `-W %s' nu permite parametri\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "nu s-a putu deschide `%s' pentru citire (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "închiderea lui fd %d (`%s') eºuatã (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "tip arbore(tree) invalid %s în redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "expresia din redirectarea `%s' are doar valoare numericã"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "expresia din redirectarea `%s' are valoar de ºir null"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "numele de fiºier `%s' pentru redirectarea `%s' poate fi rezultatul unei "
 "expresii logice"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "amestecare nenecesarã a `>' ºi `>>' pentru fiºierul `%.*s'"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "nu se poate deschide legãtura(pipe) `%s' pentru output (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "nu se poate deschide legãtura(pipe) `%s' pentru input (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "fiºierul `%s' este director"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr ""
 "nu se poate deschide socketul bidirecþional `%s' pentru input/output (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "nu se poate deschide legãtura(pipe) bidirecþionalã `%s' pentru input/output "
 "(%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "nu se poate redirecta din `%s' (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "nu se poate redirecta cãtre `%s' (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "s-a atins limita sistemului pentru fiºiere deschise: se începe muliplexarea "
 "desciptorilor de fiºier"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "închiderea `%s' eºuatã (%s)."
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "prea multe legãturi(pipe) sau fiºiere de intrare(input) deschise"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: al doilea argument trebuie sã fie `to' sau `from'"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 "close: `%.*s' nu este un fiºier deschis, o legãturã(pipe) sau un coproces"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "închiderea unei redirectãri care n-a fost deschisã niciodatã"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: redirectarea `%s' nu a fost deschisã cu `|&', al doilea argument "
 "ignorat"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "stare de avarie (%d) în legãtura(pipe) închisã în `%s' (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "stare de avarie (%d) în fiºierul închis în `%s' (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "nu s-a furnizat închiderea explicitã a socketului `%s'"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "nu s-a furnizat închiderea explicitã a coprocesului `%s' "
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "nu s-a furnizat închiderea explicitã a legãturii(pipe) `%s'"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "nu s-a furnizat închiderea explicitã a fiºierului `%s'"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "eroare în scrierea la ieºirea(output) standard (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "eroare în scrierea la dispozitivul standard de eroare (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "flush-ul legãturii(pipe) `%s' eºuat (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "flush-ul legãturii(pipe) coprocesului la `%s' eºuat (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "flush-ul de fiºier al `%s' eºuat (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "port local invalid în `%s'"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "clientul /inet/raw nu este pregãtit încã, scuze"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "doar root-ul poate folosi `/inet/raw'."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "serverul /inet/raw nu este pregãtit încã, scuze"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "nici un protocol (cunoscut) furnizat în numele de fiºier special `%s'"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "numele special de fiºier `%s' nu este complet"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "port local invalid în `%s'"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "trebuie furnizat un nume de host remote pentru `/inet'"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "trebuie furnizat un port remote pentru `/inet'"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "port remote invalid în `%s'"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "Comunicaþiile TCP/IP nu sunt suportate"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "fiºierul `%s' este director"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "folosiþi `PROCINFO[\"%s\"]' în loc de `%s'"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "folosiþi `PROCINFO[...]' în loc de `/dev/user'"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "nu s-a putut deschide `%s', modul `%s'"
 
-#: io.c:1814
+#: io.c:1849
 #, fuzzy, c-format
 msgid "close of master pty failed (%s)"
 msgstr "închiderea legãturii(pipe) a eºuat (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "închiderea stdout în copil(child) a eºuat (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, fuzzy, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "mutarea legãturii(pipe) la stdout în copil(child) a eºuat (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "închiderea stdin în copil(child) a eºuat (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, fuzzy, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "mutarea legãturii(pipe) la stdin în copil(child) a eºuat (dup: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, fuzzy, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "închiderea legãturii(pipe) a eºuat (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "mutarea legãturii(pipe) la stdout în copil(child) a eºuat (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "mutarea legãturii(pipe) la stdin în copil(child) a eºuat (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "refacerea stdout în procesul pãrinte a eºuat\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "refacerea stdin în procesul pãrinte a eºuat\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "închiderea legãturii(pipe) a eºuat (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "`|&' nesuportat"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "nu s-a putut deschide legãtura(pipe) `%s' (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "nu s-a putu crea proces copil(child) pentru `%s' (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "fiºierul de date `%s' este vid"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "eroare în citirea fiºierului de intrare(input) `%s': %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "valoarea multicaracter a `RS' este extensie gawk"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "`-m[fr]' opþiune irelevantã în gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "folosirea opþiunii -m : `-m[fr] nnn'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: opþiunea `-W %s' nu e recunoscutã, ignoratã\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "argument vid pentru `--source' ignorat"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "este setatã variabila de mediu `POSIXLY_CORRECT': se activeazã `--posix'"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--posix' suprascrie `--traditional'"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix'/`--traditional' suprascrie `--non-decimal-data'"
 
-#: main.c:487
+#: main.c:501
 #, fuzzy, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "dacã se ruleazã %s setuid root poate apãrea o problemã de securitate"
 
-#: main.c:528
+#: main.c:542
 #, fuzzy, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "nu se poate seta modul pe stdin (%s)"
 
-#: main.c:531
+#: main.c:545
 #, fuzzy, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "nu se poate seta modul pe stdout (%s)"
 
-#: main.c:533
+#: main.c:547
 #, fuzzy, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "nu se poate seta modul pe stderr (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "nu existã nici un text de program!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Folosire: %s [opþiuni stil POSIX sau GNU] -f fiºierprogram [--] fiºier ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Folosire: %s [opþiuni stil POSIX sau GNU] [--] %cprogram%c fiºier ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "opþiuni POSIX:\t\topþiuni lungi GNU:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fiºierprogram\t\t--file=fiºierprogram\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=val\t\t--assign=var=val\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] val\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=fiºier]\t--dump-variables[=fiºier]\n"
 
-#: main.c:681
+#: main.c:706
 #, fuzzy
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W profile[=fiºier]\t--profile[=fiºier]\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=fiºier]\t--profile[=fiºier]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=program-text\t--source=program-text\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 #, fuzzy
 msgid ""
 "\n"
@@ -1592,28 +1621,28 @@ msgid ""
 "\n"
 msgstr "secþiunea `Reporting Problems and Bugs' în versiunea tipãritã.\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1621,11 +1650,11 @@ msgstr ""
 "\n"
 "Acest program este software liber; poate fi redistribuit ºi/sau modificat\n"
 "sub termenii Licenþei Publice Generale GNU publicatã de \n"
-"Free Software Foundation; fie versiunea 2 a Licenþei, fie\n"
+"Free Software Foundation; fie versiunea 3 a Licenþei, fie\n"
 "(la latitudinea dumneavoastrã) orice versiune ulterioarã.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1640,58 +1669,57 @@ msgstr ""
 "\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Ar fi trebuit sã primiþi o copie a Licenþei Publice Generale GNU\n"
 "împreunã cu acest program; dacã nu, scrieþi la Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
 "USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft nu seteazã FS în tab în POSIX awk"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "excepþie virgulã mobilã"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "eroare fatalã: eroare internã"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "nici un fd predeschis %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "nu s-a putut predeschide /dev/null pentru fd %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "nu am putut gãsi grupurile: %s"
@@ -1713,23 +1741,28 @@ msgstr "eroare: "
 msgid "fatal: "
 msgstr "fatal: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "nu se poate converti ºir de caractere în float"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "backslash la sfârºitul ºirului de caractere"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "vechiul awk nu supoortã operatorul `**'"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX nu permite escape-uri `\\x'"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "nu existã digiþi hexa în secvenþa de escape `\\x'"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "secvenþa de escape `\\%c' tratatã ca `%c' simplu"
@@ -1739,31 +1772,31 @@ msgstr "secvenþa de escape `\\%c' tratatã ca `%c' simplu"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s': nu s-a putut seta close-on-exec: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "nu am putut deschide `%s' pentru scriere: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, fuzzy, c-format
 msgid "internal error: %s with null vname"
 msgstr "eroare internã: Node_var cu vname null"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr ""
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr ""
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# profil gawk, creat %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1772,7 +1805,7 @@ msgstr ""
 "\t# bloc(uri) BEGIN\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1781,7 +1814,7 @@ msgstr ""
 "\t# Regulã(i)\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1790,7 +1823,7 @@ msgstr ""
 "\t# bloc(uri) END\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1799,83 +1832,86 @@ msgstr ""
 "\n"
 "\t# Funcþii, listate alfabetic\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "tip %s neaºteptat în prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Succes"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Nici o potrivire"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Expresie regularã invalidã"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Caracter de comparare invalid"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "nume clasã caracter invalid"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Backslash final"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "referinþã anterioarã(back) invalidã"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ sau [^ fãrã reciprocã"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( sau \\( fãrã reciprocã"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "{ fãrã reciprocã"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Conþinut invalid al \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Sfârºit de domeniu invalid"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Memorie plinã"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Expresie regularã anterioarã invalidã"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Sfârºit prematur de expresie regularã"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Expresie regularã prea mare"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") or \\) fãrã reciprocã"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Nu existã expresii regulare anterioare"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "port remote invalid în `%s'"
+
 #~ msgid "function %s called\n"
 #~ msgstr "funcþia %s a fost apelatã\n"
 
diff --git a/po/rw.gmo b/po/rw.gmo
index d4374196..62cb2147 100644
--- a/po/rw.gmo
+++ b/po/rw.gmo
diff --git a/po/rw.po b/po/rw.po
index 9be6614f..274d60ce 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.4\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -44,384 +44,399 @@ msgstr "Kuri Gukoresha Nka Imbonerahamwe"
 msgid "from %s"
 msgstr "Kuva:"
 
-#: array.c:511
+#: array.c:514
 #, fuzzy, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "Indango Kuri Itatangijwe Ikigize:"
 
-#: array.c:517
+#: array.c:520
 #, fuzzy, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "Inyandiko nyesi Bya Imbonerahamwe ni NTAGIHARI Ikurikiranyanyuguti"
 
-#: array.c:621
+#: array.c:624
 #, fuzzy, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "Gusiba Umubarendanga OYA in Imbonerahamwe"
 
-#: array.c:791
+#: array.c:793
 #, fuzzy, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s:ubusa NTAGIHARI"
 
-#: array.c:796
+#: array.c:798
 #, fuzzy, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s:ubusa Zeru"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr ""
 
-#: array.c:829
+#: array.c:831
 #, fuzzy, c-format
 msgid "%s: is parameter\n"
 msgstr "%s:ni"
 
-#: array.c:834
+#: array.c:836
 #, fuzzy, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s:Kuri"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, fuzzy, c-format
 msgid "%s blocks must have an action part"
 msgstr "%sIgikorwa"
 
-#: awkgram.y:211
+#: awkgram.y:218
 #, fuzzy
 msgid "each rule must have a pattern or an action part"
 msgstr "a Ishusho Cyangwa Igikorwa"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "ki/ bishaje OYA Gushigikira Mukoresha"
+
+#: awkgram.y:282
 #, fuzzy, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s'ni a in Umumaro"
 
-#: awkgram.y:313
+#: awkgram.y:328
 #, fuzzy
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "nka a C Icyo wongeraho ni OYA"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, fuzzy, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "nka a C Icyo wongeraho ni OYA"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 #, fuzzy
 msgid "statement may have no effect"
 msgstr "Inyandiko Gicurasi Oya INGARUKA"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, fuzzy, c-format
 msgid "`%s' used in %s action"
 msgstr "`%s'in Igikorwa"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 #, fuzzy
 msgid "`nextfile' is a gawk extension"
 msgstr "`ni a Umugereka"
 
-#: awkgram.y:470
+#: awkgram.y:489
 #, fuzzy
 msgid "`return' used outside function context"
 msgstr "`Hanze Umumaro Imvugiro"
 
-#: awkgram.y:512
+#: awkgram.y:531
 #, fuzzy
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr "Byuzuye in Cyangwa Gucapa"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 #, fuzzy
 msgid "`delete array' is a gawk extension"
 msgstr "`Gusiba ni a Umugereka"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 #, fuzzy
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`Gusiba Imbonerahamwe ni a Umugereka"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, fuzzy, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "Gusubiramo Uduciro in Hindura Umubiri"
 
-#: awkgram.y:601
+#: awkgram.y:631
 #, fuzzy
 msgid "Duplicate `default' detected in switch body"
 msgstr "in Hindura Umubiri"
 
-#: awkgram.y:690
+#: awkgram.y:720
 #, fuzzy
 msgid "multistage two-way pipelines don't work"
 msgstr "Akazi"
 
-#: awkgram.y:781
+#: awkgram.y:811
 #, fuzzy
 msgid "regular expression on right of assignment"
 msgstr "Ibisanzwe imvugo ku Iburyo: Bya Igenera"
 
-#: awkgram.y:804
+#: awkgram.y:834
 #, fuzzy
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "Ibisanzwe imvugo ku Ibumoso: Bya Cyangwa Mukoresha"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "ki/ bishaje OYA Gushigikira Mukoresha"
+
+#: awkgram.y:846
 #, fuzzy
 msgid "regular expression on right of comparison"
 msgstr "Ibisanzwe imvugo ku Iburyo: Bya"
 
-#: awkgram.y:879
+#: awkgram.y:903
 #, fuzzy
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "kidasobanuye Mo Imbere Igikorwa"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "ki/ bishaje OYA Gushigikira Mukoresha"
+
+#: awkgram.y:960
 #, fuzzy
 msgid "call of `length' without parentheses is not portable"
 msgstr "Bya ni OYA"
 
-#: awkgram.y:909
+#: awkgram.y:965
 #, fuzzy
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "Bya ni Bitemewe. ku"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 #, fuzzy
 msgid "use of non-array as array"
 msgstr "Gukoresha Bya Imbonerahamwe Nka Imbonerahamwe"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 #, fuzzy
 msgid "invalid subscript expression"
 msgstr "Sibyo Inyandiko nyesi imvugo"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 #, fuzzy
 msgid "unexpected newline or end of string"
 msgstr "Cyangwa Impera Bya Ikurikiranyanyuguti"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 #, fuzzy
 msgid "empty program text on command line"
 msgstr "ubusa Porogaramu Umwandiko ku Komandi: Umurongo"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, fuzzy, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "Gufungura Inkomoko IDOSIYE kugirango"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, fuzzy, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "Gusoma"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, fuzzy, c-format
 msgid "source file `%s' is empty"
 msgstr "Inkomoko IDOSIYE ni ubusa"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 #, fuzzy
 msgid "source file does not end in newline"
 msgstr "Inkomoko IDOSIYE OYA Impera in"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 #, fuzzy
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "Na: ku Impera Bya IDOSIYE"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr ""
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 #, fuzzy
 msgid "unterminated regexp at end of file"
 msgstr "ku Impera Bya IDOSIYE"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 #, fuzzy
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "Gukoresha Bya Umurongo ni OYA"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 #, fuzzy
 msgid "backslash not last character on line"
 msgstr "OYA Iheruka Inyuguti ku Umurongo"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 #, fuzzy
 msgid "POSIX does not allow operator `**='"
 msgstr "OYA Kwemerera Mukoresha"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 #, fuzzy
 msgid "old awk does not support operator `**='"
 msgstr "ki/ bishaje OYA Gushigikira Mukoresha"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 #, fuzzy
 msgid "POSIX does not allow operator `**'"
 msgstr "OYA Kwemerera Mukoresha"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 #, fuzzy
 msgid "old awk does not support operator `**'"
 msgstr "ki/ bishaje OYA Gushigikira Mukoresha"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 #, fuzzy
 msgid "operator `^=' is not supported in old awk"
 msgstr "Mukoresha ni OYA in ki/ bishaje"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 #, fuzzy
 msgid "operator `^' is not supported in old awk"
 msgstr "Mukoresha ni OYA in ki/ bishaje"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 #, fuzzy
 msgid "unterminated string"
 msgstr "Ikurikiranyanyuguti"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, fuzzy, c-format
 msgid "invalid char '%c' in expression"
 msgstr "Sibyo INYUGUTI in imvugo"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, fuzzy, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s'ni a Umugereka"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, fuzzy, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "`%s'ni a Umugereka"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, fuzzy, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "OYA Kwemerera"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, fuzzy, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s'ni OYA in ki/ bishaje"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr ""
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, fuzzy, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%dni Sibyo Nka Umubare Bya ingingo kugirango"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 #, fuzzy
 msgid "match: third argument is a gawk extension"
 msgstr "BIHUYE ni a Umugereka"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, fuzzy, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s:Ikurikiranyanyuguti Nka Iheruka Bya GUSIMBURANYA Oya INGARUKA"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, fuzzy, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%sni OYA a Igikoresho"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 #, fuzzy
 msgid "close: second argument is a gawk extension"
 msgstr "Gufunga ISEGONDA ni a Umugereka"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 #, fuzzy
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "Gukoresha Bya ni Gukuraho... Nyobora"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 #, fuzzy
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "Gukoresha Bya ni Gukuraho... Nyobora"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, fuzzy, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "Umumaro"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, fuzzy, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "Umumaro IMPINDURAGACIRO"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, fuzzy, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "OYA Gufungura kugirango"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 #, fuzzy
 msgid "sending profile to standard error"
 msgstr "Ibijyana Kuri Bisanzwe Ikosa"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, fuzzy, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s:Gufunga Byanze"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr ""
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 #, fuzzy
 msgid "there were shadowed variables."
 msgstr "Bihawe igicucu Ibihinduka"
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, fuzzy, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "Umumaro Gukoresha Umumaro Izina: Nka Izina:"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, fuzzy, c-format
 msgid "function name `%s' previously defined"
 msgstr "Umumaro Izina:"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, fuzzy, c-format
 msgid "function `%s' called but never defined"
 msgstr "Umumaro Nta narimwe"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, fuzzy, c-format
 msgid "function `%s' defined but never called"
 msgstr "Umumaro Nta narimwe"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, fuzzy, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "kugirango Icyungo Agaciro"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, fuzzy, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -430,428 +445,428 @@ msgstr ""
 "Umumaro Na: Umwanya hagati Izina: Na Cyangwa Nka a IMPINDURAGACIRO Cyangwa "
 "Imbonerahamwe"
 
-#: builtin.c:145
+#: builtin.c:119
 #, fuzzy, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%sKuri Byanze"
 
-#: builtin.c:146
+#: builtin.c:120
 #, fuzzy
 msgid "standard output"
 msgstr "Bisanzwe Ibisohoka"
 
-#: builtin.c:147
+#: builtin.c:121
 #, fuzzy
 msgid "reason unknown"
 msgstr "Kitazwi"
 
-#: builtin.c:160
+#: builtin.c:134
 #, fuzzy
 msgid "exp: received non-numeric argument"
 msgstr "EXP BYAKIRIWE Bikurikije umubare"
 
-#: builtin.c:166
+#: builtin.c:140
 #, fuzzy, c-format
 msgid "exp: argument %g is out of range"
 msgstr "EXP ni Inyuma Bya Urutonde"
 
-#: builtin.c:224
+#: builtin.c:198
 #, fuzzy, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr "kugirango OYA"
 
-#: builtin.c:227
+#: builtin.c:201
 #, fuzzy, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr "IDOSIYE kugirango OYA"
 
-#: builtin.c:239
+#: builtin.c:213
 #, fuzzy, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "ni OYA Gufungura IDOSIYE Cyangwa"
 
-#: builtin.c:332
+#: builtin.c:306
 #, fuzzy
 msgid "index: received non-string first argument"
 msgstr "Umubarendanga BYAKIRIWE Ikurikiranyanyuguti Itangira"
 
-#: builtin.c:334
+#: builtin.c:308
 #, fuzzy
 msgid "index: received non-string second argument"
 msgstr "Umubarendanga BYAKIRIWE Ikurikiranyanyuguti ISEGONDA"
 
-#: builtin.c:449
+#: builtin.c:423
 #, fuzzy
 msgid "int: received non-numeric argument"
 msgstr "INT BYAKIRIWE Bikurikije umubare"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "`Gusiba ni a Umugereka"
 
-#: builtin.c:481
+#: builtin.c:458
 #, fuzzy
 msgid "length: received non-string argument"
 msgstr "Uburebure BYAKIRIWE Ikurikiranyanyuguti"
 
-#: builtin.c:506
+#: builtin.c:483
 #, fuzzy
 msgid "log: received non-numeric argument"
 msgstr "LOG BYAKIRIWE Bikurikije umubare"
 
-#: builtin.c:509
+#: builtin.c:486
 #, fuzzy, c-format
 msgid "log: received negative argument %g"
 msgstr "LOG BYAKIRIWE"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 #, fuzzy
 msgid "must use `count$' on all formats or none"
 msgstr "Gukoresha IBARA ku Byose Imiterere Cyangwa Ntacyo"
 
-#: builtin.c:778
+#: builtin.c:799
 #, fuzzy
 msgid "`$' is not permitted in awk formats"
 msgstr "`$'ni OYA in Imiterere"
 
-#: builtin.c:784
+#: builtin.c:805
 #, fuzzy
 msgid "arg count with `$' must be > 0"
 msgstr "IBARA Na: 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, fuzzy, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "IBARA Biruta Igiteranyo Umubare Bya ingingo"
 
-#: builtin.c:788
+#: builtin.c:809
 #, fuzzy
 msgid "`$' not permitted after period in format"
 msgstr "`$'OYA Nyuma Igihe in Imiterere"
 
-#: builtin.c:801
+#: builtin.c:822
 #, fuzzy
 msgid "no `$' supplied for positional field width or precision"
 msgstr "Oya kugirango Umwanya Ubugari Cyangwa"
 
-#: builtin.c:867
+#: builtin.c:888
 #, fuzzy
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`ni in Imiterere"
 
-#: builtin.c:871
+#: builtin.c:892
 #, fuzzy
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "`ni OYA in Imiterere"
 
-#: builtin.c:882
+#: builtin.c:903
 #, fuzzy
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`ni in Imiterere"
 
-#: builtin.c:886
+#: builtin.c:907
 #, fuzzy
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "`ni OYA in Imiterere"
 
-#: builtin.c:897
+#: builtin.c:918
 #, fuzzy
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`ni in Imiterere"
 
-#: builtin.c:901
+#: builtin.c:922
 #, fuzzy
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "`ni OYA in Imiterere"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, fuzzy, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[S Agaciro ni Inyuma Bya Urutonde kugirango Imiterere"
 
-#: builtin.c:1198
+#: builtin.c:1266
 #, fuzzy
 msgid "not enough arguments to satisfy format string"
 msgstr "OYA ingingo Kuri Imiterere Ikurikiranyanyuguti"
 
-#: builtin.c:1200
+#: builtin.c:1268
 #, fuzzy
 msgid "^ ran out for this one"
 msgstr "^Inyuma kugirango iyi"
 
-#: builtin.c:1205
+#: builtin.c:1274
 #, fuzzy
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[S Imiterere OYA Igenzura Ibaruwa..."
 
-#: builtin.c:1208
+#: builtin.c:1277
 #, fuzzy
 msgid "too many arguments supplied for format string"
 msgstr "ingingo kugirango Imiterere Ikurikiranyanyuguti"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 #, fuzzy
 msgid "printf: no arguments"
 msgstr "Oya ingingo"
 
-#: builtin.c:1301
+#: builtin.c:1379
 #, fuzzy
 msgid "sqrt: received non-numeric argument"
 msgstr "SQRT BYAKIRIWE Bikurikije umubare"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, fuzzy, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "SQRT Na:"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, fuzzy, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "Gutangira Umubarendanga ni Sibyo ikoresha 1."
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, fuzzy, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "Umubare wuzuye Gutangira Umubarendanga"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "Uburebure ni OYA 1."
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "Uburebure ni OYA 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, fuzzy, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "Umubare wuzuye Uburebure"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, fuzzy, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "Uburebure kugirango Ikurikiranyanyuguti gushyiraho umugereka Kuri"
 
-#: builtin.c:1379
+#: builtin.c:1457
 #, fuzzy
 msgid "substr: source string is zero length"
 msgstr "Inkomoko Ikurikiranyanyuguti ni Zeru Uburebure"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, fuzzy, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "Gutangira Umubarendanga ni Impera Bya Ikurikiranyanyuguti"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, fuzzy, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
 msgstr "Uburebure ku Gutangira Umubarendanga Uburebure Bya Itangira"
 
-#: builtin.c:1478
+#: builtin.c:1558
 #, fuzzy
 msgid "strftime: received non-string first argument"
 msgstr "BYAKIRIWE Ikurikiranyanyuguti Itangira"
 
-#: builtin.c:1484
+#: builtin.c:1564
 #, fuzzy
 msgid "strftime: received empty format string"
 msgstr "BYAKIRIWE ubusa Imiterere Ikurikiranyanyuguti"
 
-#: builtin.c:1493
+#: builtin.c:1573
 #, fuzzy
 msgid "strftime: received non-numeric second argument"
 msgstr "BYAKIRIWE Bikurikije umubare ISEGONDA"
 
-#: builtin.c:1556
+#: builtin.c:1650
 #, fuzzy
 msgid "mktime: received non-string argument"
 msgstr "BYAKIRIWE Ikurikiranyanyuguti"
 
-#: builtin.c:1601
+#: builtin.c:1695
 #, fuzzy
 msgid "system: received non-string argument"
 msgstr "Sisitemu BYAKIRIWE Ikurikiranyanyuguti"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, fuzzy, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "Indango Kuri Itatangijwe Umwanya"
 
-#: builtin.c:1827
+#: builtin.c:1921
 #, fuzzy
 msgid "tolower: received non-string argument"
 msgstr "BYAKIRIWE Ikurikiranyanyuguti"
 
-#: builtin.c:1857
+#: builtin.c:1951
 #, fuzzy
 msgid "toupper: received non-string argument"
 msgstr "BYAKIRIWE Ikurikiranyanyuguti"
 
-#: builtin.c:1890
+#: builtin.c:1984
 #, fuzzy
 msgid "atan2: received non-numeric first argument"
 msgstr "ATAN2 BYAKIRIWE Bikurikije umubare Itangira"
 
-#: builtin.c:1892
+#: builtin.c:1986
 #, fuzzy
 msgid "atan2: received non-numeric second argument"
 msgstr "ATAN2 BYAKIRIWE Bikurikije umubare ISEGONDA"
 
-#: builtin.c:1911
+#: builtin.c:2005
 #, fuzzy
 msgid "sin: received non-numeric argument"
 msgstr "SIN BYAKIRIWE Bikurikije umubare"
 
-#: builtin.c:1927
+#: builtin.c:2021
 #, fuzzy
 msgid "cos: received non-numeric argument"
 msgstr "COS BYAKIRIWE Bikurikije umubare"
 
-#: builtin.c:1977
+#: builtin.c:2071
 #, fuzzy
 msgid "srand: received non-numeric argument"
 msgstr "BYAKIRIWE Bikurikije umubare"
 
-#: builtin.c:2012
+#: builtin.c:2106
 #, fuzzy
 msgid "match: third argument is not an array"
 msgstr "BIHUYE ni OYA Imbonerahamwe"
 
-#: builtin.c:2555
+#: builtin.c:2650
 #, fuzzy
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "Bya 0 Nka 1."
 
-#: builtin.c:2715
+#: builtin.c:2766
 #, fuzzy
 msgid "lshift: received non-numeric first argument"
 msgstr "BYAKIRIWE Bikurikije umubare Itangira"
 
-#: builtin.c:2717
+#: builtin.c:2768
 #, fuzzy
 msgid "lshift: received non-numeric second argument"
 msgstr "BYAKIRIWE Bikurikije umubare ISEGONDA"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, fuzzy, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "Uduciro Ibisubizo ku"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, fuzzy, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "Uduciro"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, fuzzy, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "Binini Gusunika Agaciro Ibisubizo ku"
 
-#: builtin.c:2753
+#: builtin.c:2804
 #, fuzzy
 msgid "rshift: received non-numeric first argument"
 msgstr "BYAKIRIWE Bikurikije umubare Itangira"
 
-#: builtin.c:2755
+#: builtin.c:2806
 #, fuzzy
 msgid "rshift: received non-numeric second argument"
 msgstr "BYAKIRIWE Bikurikije umubare ISEGONDA"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, fuzzy, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "Uduciro Ibisubizo ku"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, fuzzy, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "Uduciro"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, fuzzy, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "Binini Gusunika Agaciro Ibisubizo ku"
 
-#: builtin.c:2791
+#: builtin.c:2842
 #, fuzzy
 msgid "and: received non-numeric first argument"
 msgstr "Na BYAKIRIWE Bikurikije umubare Itangira"
 
-#: builtin.c:2793
+#: builtin.c:2844
 #, fuzzy
 msgid "and: received non-numeric second argument"
 msgstr "Na BYAKIRIWE Bikurikije umubare ISEGONDA"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, fuzzy, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "Na Uduciro Ibisubizo ku"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, fuzzy, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "Na Uduciro"
 
-#: builtin.c:2827
+#: builtin.c:2878
 #, fuzzy
 msgid "or: received non-numeric first argument"
 msgstr "Cyangwa BYAKIRIWE Bikurikije umubare Itangira"
 
-#: builtin.c:2829
+#: builtin.c:2880
 #, fuzzy
 msgid "or: received non-numeric second argument"
 msgstr "Cyangwa BYAKIRIWE Bikurikije umubare ISEGONDA"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, fuzzy, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "Cyangwa Uduciro Ibisubizo ku"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, fuzzy, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "Cyangwa Uduciro"
 
-#: builtin.c:2863
+#: builtin.c:2914
 #, fuzzy
 msgid "xor: received non-numeric first argument"
 msgstr "BYAKIRIWE Bikurikije umubare Itangira"
 
-#: builtin.c:2865
+#: builtin.c:2916
 #, fuzzy
 msgid "xor: received non-numeric second argument"
 msgstr "BYAKIRIWE Bikurikije umubare ISEGONDA"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, fuzzy, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "Uduciro Ibisubizo ku"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, fuzzy, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "Uduciro"
 
-#: builtin.c:2897
+#: builtin.c:2948
 #, fuzzy
 msgid "compl: received non-numeric argument"
 msgstr "BYAKIRIWE Bikurikije umubare"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, fuzzy, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "Agaciro Ibisubizo ku"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, fuzzy, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "Agaciro"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, fuzzy, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "ni OYA a Byemewe Umwanya Icyiciro"
@@ -866,7 +881,7 @@ msgstr "Kitazwi"
 msgid "buffer overflow in genflags2str"
 msgstr "Byarenze urugero in"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, fuzzy, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "Kuri Gukoresha Imbonerahamwe in a Imvugiro"
@@ -921,7 +936,7 @@ msgstr "`Bivuye"
 msgid "statement has no effect"
 msgstr "Inyandiko Oya INGARUKA"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, fuzzy, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "Gukoresha Umumaro Izina: Nka IMPINDURAGACIRO Cyangwa Imbonerahamwe"
@@ -931,7 +946,7 @@ msgstr "Gukoresha Umumaro Izina: Nka IMPINDURAGACIRO Cyangwa Imbonerahamwe"
 msgid "reference to uninitialized argument `%s'"
 msgstr "Indango Kuri Itatangijwe"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, fuzzy, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "Indango Kuri Itatangijwe IMPINDURAGACIRO"
@@ -943,47 +958,47 @@ msgid ""
 "another!"
 msgstr "Ingaruka in imvugo Byahinduwe i Uburebure Bya"
 
-#: eval.c:1200
+#: eval.c:1202
 #, fuzzy
 msgid "assignment used in conditional context"
 msgstr "Igenera in Imvugiro"
 
-#: eval.c:1278
+#: eval.c:1280
 #, fuzzy
 msgid "division by zero attempted"
 msgstr "ku Zeru"
 
-#: eval.c:1293
+#: eval.c:1295
 #, fuzzy, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "ku Zeru in"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, fuzzy, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "Ubwoko in"
 
-#: eval.c:1471
+#: eval.c:1473
 #, fuzzy
 msgid "division by zero attempted in `/='"
 msgstr "ku Zeru in"
 
-#: eval.c:1493
+#: eval.c:1495
 #, fuzzy, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "ku Zeru in"
 
-#: eval.c:1758
+#: eval.c:1760
 #, fuzzy, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "Umumaro Na: Birenzeho ingingo"
 
-#: eval.c:1802
+#: eval.c:1804
 #, fuzzy, c-format
 msgid "function `%s' not defined"
 msgstr "Umumaro OYA"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -991,699 +1006,713 @@ msgid ""
 "\n"
 msgstr ""
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr ""
 
-#: eval.c:2023
+#: eval.c:2025
 #, fuzzy
 msgid "attempt to field reference from non-numeric value"
 msgstr "Kuri Umwanya Indango Bivuye Bikurikije umubare Agaciro"
 
-#: eval.c:2025
+#: eval.c:2027
 #, fuzzy
 msgid "attempt to reference from null string"
 msgstr "Kuri Indango Bivuye NTAGIHARI Ikurikiranyanyuguti"
 
-#: eval.c:2031
+#: eval.c:2033
 #, fuzzy, c-format
 msgid "attempt to access field %d"
 msgstr "Kuri Umwanya"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 #, fuzzy
 msgid "assignment is not allowed to result of builtin function"
 msgstr "Igenera ni OYA Kuri Igisubizo Bya Umumaro"
 
-#: eval.c:2123
+#: eval.c:2125
 #, fuzzy
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`ni a Umugereka"
 
-#: eval.c:2153
+#: eval.c:2155
 #, fuzzy
 msgid "`BINMODE' is a gawk extension"
 msgstr "`ni a Umugereka"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr ""
 
-#: eval.c:2353
+#: eval.c:2355
 #, fuzzy
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "Bidakora Kuri Igenera Kuri"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 #, fuzzy
 msgid "`extension' is a gawk extension"
 msgstr "`ni a Umugereka"
 
-#: ext.c:74
+#: ext.c:77
 #, fuzzy, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "Umugereka Gufungura"
 
-#: ext.c:82
+#: ext.c:85
 #, fuzzy, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "Umugereka Isomero Umumaro"
 
-#: ext.c:102
+#: ext.c:105
 #, fuzzy
 msgid "extension: missing function name"
 msgstr "Umugereka Ibuze Umumaro Izina:"
 
-#: ext.c:107
+#: ext.c:110
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "Umugereka Inyuguti in Umumaro Izina:"
 
-#: ext.c:113
+#: ext.c:116
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "Umugereka Umumaro"
 
-#: ext.c:117
+#: ext.c:120
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "Umugereka Umumaro"
 
-#: ext.c:122
+#: ext.c:125
 #, fuzzy, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "Umugereka Gukoresha in Nka Umumaro Izina:"
 
-#: ext.c:124
+#: ext.c:127
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "Umugereka Umumaro Izina:"
 
-#: ext.c:201
+#: ext.c:204
 #, fuzzy, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "Umumaro Kuri Oya Birenzeho S"
 
-#: ext.c:204
+#: ext.c:207
 #, fuzzy, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "Umumaro Ibuze"
 
-#: ext.c:214
+#: ext.c:217
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "Umumaro Kuri Gukoresha Nka Imbonerahamwe"
 
-#: ext.c:218
+#: ext.c:221
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "Umumaro Kuri Gukoresha Imbonerahamwe Nka a"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr ""
 
-#: field.c:326
+#: field.c:330
 #, fuzzy
 msgid "NF set to negative value"
 msgstr "Gushyiraho Kuri Agaciro"
 
-#: field.c:819
+#: field.c:823
 #, fuzzy
 msgid "split: second argument is not an array"
 msgstr "Gutandukanya ISEGONDA ni OYA Imbonerahamwe"
 
-#: field.c:853
+#: field.c:857
 #, fuzzy
 msgid "split: null string for third arg is a gawk extension"
 msgstr "Gutandukanya NTAGIHARI Ikurikiranyanyuguti kugirango ni a Umugereka"
 
-#: field.c:905
+#: field.c:909
 #, fuzzy
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`ni a Umugereka"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 #, fuzzy
 msgid "null string for `FS' is a gawk extension"
 msgstr "NTAGIHARI Ikurikiranyanyuguti kugirango ni a Umugereka"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "ki/ bishaje OYA Gushigikira Mukoresha"
+
+#: getopt.c:571 getopt.c:587
 #, fuzzy, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, fuzzy, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s:Ihitamo Kwemerera"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, fuzzy, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s:Ihitamo Kwemerera"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, fuzzy, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:Ihitamo"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, fuzzy, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:Ihitamo"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, fuzzy, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:Ihitamo"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, fuzzy, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, fuzzy, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:Sibyo Ihitamo"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s:Ihitamo Kwemerera"
 
-#: io.c:307
+#: io.c:345
 #, fuzzy, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "Gufungura IDOSIYE kugirango"
 
-#: io.c:398
+#: io.c:436
 #, fuzzy, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "Gufunga Bya Byanze"
 
-#: io.c:536
+#: io.c:575
 #, fuzzy, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "Sibyo Ubwoko in"
 
-#: io.c:542
+#: io.c:581
 #, fuzzy, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "imvugo in Bikurikije umubare Agaciro"
 
-#: io.c:548
+#: io.c:587
 #, fuzzy, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "imvugo kugirango NTAGIHARI Ikurikiranyanyuguti Agaciro"
 
-#: io.c:553
+#: io.c:592
 #, fuzzy, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "Izina ry'idosiye: kugirango Gicurasi Igisubizo Bya Bijyanye n'inyurabwenge "
 "imvugo"
 
-#: io.c:591
+#: io.c:630
 #, fuzzy, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "Bya Na kugirango IDOSIYE"
 
-#: io.c:643
+#: io.c:682
 #, fuzzy, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "Gufungura kugirango Ibisohoka"
 
-#: io.c:652
+#: io.c:691
 #, fuzzy, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "Gufungura kugirango Iyinjiza"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, fuzzy, c-format
+msgid "file `%s' is a directory"
+msgstr "IDOSIYE ni a bushyinguro"
+
+#: io.c:706
 #, fuzzy, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr "Gufungura kugirango Iyinjiza Ibisohoka"
 
-#: io.c:669
+#: io.c:710
 #, fuzzy, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "Gufungura kugirango Iyinjiza Ibisohoka"
 
-#: io.c:745
+#: io.c:786
 #, fuzzy, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "Bivuye"
 
-#: io.c:748
+#: io.c:789
 #, fuzzy, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "Kuri"
 
-#: io.c:787
+#: io.c:828
 #, fuzzy
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr "Sisitemu kugirango Gufungura Idosiye Kuri IDOSIYE"
 
-#: io.c:803
+#: io.c:844
 #, fuzzy, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "Gufunga Bya Byanze"
 
-#: io.c:811
+#: io.c:852
 #, fuzzy
 msgid "too many pipes or input files open"
 msgstr "Cyangwa Iyinjiza Idosiye Gufungura"
 
-#: io.c:834
+#: io.c:875
 #, fuzzy
 msgid "close: second argument must be `to' or `from'"
 msgstr "Gufunga ISEGONDA Cyangwa"
 
-#: io.c:848
+#: io.c:889
 #, fuzzy, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "Gufunga."
 
-#: io.c:852
+#: io.c:893
 #, fuzzy
 msgid "close of redirection that was never opened"
 msgstr "Gufunga Bya Nta narimwe"
 
-#: io.c:948
+#: io.c:989
 #, fuzzy, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr "Gufunga OYA Na: ISEGONDA"
 
-#: io.c:964
+#: io.c:1005
 #, fuzzy, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "Imimerere ku Gufunga Bya"
 
-#: io.c:967
+#: io.c:1008
 #, fuzzy, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "Imimerere ku IDOSIYE Gufunga Bya"
 
-#: io.c:987
+#: io.c:1028
 #, fuzzy, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "Oya Gufunga Bya"
 
-#: io.c:990
+#: io.c:1031
 #, fuzzy, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "Oya Gufunga Bya"
 
-#: io.c:993
+#: io.c:1034
 #, fuzzy, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "Oya Gufunga Bya"
 
-#: io.c:996
+#: io.c:1037
 #, fuzzy, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "Oya Gufunga Bya IDOSIYE"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, fuzzy, c-format
 msgid "error writing standard output (%s)"
 msgstr "Ikosa Bisanzwe Ibisohoka"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, fuzzy, c-format
 msgid "error writing standard error (%s)"
 msgstr "Ikosa Bisanzwe Ikosa"
 
-#: io.c:1037
+#: io.c:1078
 #, fuzzy, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "Bya Byanze"
 
-#: io.c:1040
+#: io.c:1081
 #, fuzzy, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "Bya Kuri Byanze"
 
-#: io.c:1043
+#: io.c:1084
 #, fuzzy, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "IDOSIYE Bya Byanze"
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "Umuyoboro Sibyo in"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 #, fuzzy
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "/Umukiriya OYA Cyiteguye"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 #, fuzzy
 msgid "only root may use `/inet/raw'."
 msgstr "Imizi Gicurasi Gukoresha"
 
-#: io.c:1242
+#: io.c:1287
 #, fuzzy
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "/Seriveri OYA Cyiteguye"
 
-#: io.c:1332
+#: io.c:1385
 #, fuzzy, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "Oya Porotokole in Bidasanzwe Izina ry'idosiye:"
 
-#: io.c:1350
+#: io.c:1399
 #, fuzzy, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "Bidasanzwe IDOSIYE Izina: ni"
 
-#: io.c:1362
-#, fuzzy, c-format
-msgid "local port invalid in `%s'"
-msgstr "Umuyoboro Sibyo in"
-
-#: io.c:1374
+#: io.c:1414
 #, fuzzy
 msgid "must supply a remote hostname to `/inet'"
 msgstr "a Izina ry'inturo: Kuri"
 
-#: io.c:1389
+#: io.c:1432
 #, fuzzy
 msgid "must supply a remote port to `/inet'"
 msgstr "a Umuyoboro Kuri"
 
-#: io.c:1395
-#, fuzzy, c-format
-msgid "remote port invalid in `%s'"
-msgstr "Umuyoboro Sibyo in"
-
-#: io.c:1405
+#: io.c:1439
 #, fuzzy
 msgid "TCP/IP communications are not supported"
 msgstr "OYA"
 
-#: io.c:1414 io.c:1595
-#, fuzzy, c-format
-msgid "file `%s' is a directory"
-msgstr "IDOSIYE ni a bushyinguro"
-
-#: io.c:1484
+#: io.c:1509
 #, fuzzy, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "Gukoresha Bya"
 
-#: io.c:1516
+#: io.c:1547
 #, fuzzy
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "Gukoresha Bya"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, fuzzy, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "OYA Gufungura Ubwoko"
 
-#: io.c:1814
+#: io.c:1849
 #, fuzzy, c-format
 msgid "close of master pty failed (%s)"
 msgstr "Gufunga Bya Mugenga Byanze"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, fuzzy, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "Gufunga Bya in Byanze"
 
-#: io.c:1819
+#: io.c:1854
 #, fuzzy, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "Kuri in Byanze"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, fuzzy, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "Gufunga Bya in Byanze"
 
-#: io.c:1824
+#: io.c:1859
 #, fuzzy, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "Kuri in Byanze"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, fuzzy, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "Gufunga Bya Byanze"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, fuzzy, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "Kuri in Byanze"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, fuzzy, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "Kuri in Byanze"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 #, fuzzy
 msgid "restoring stdout in parent process failed\n"
 msgstr "in"
 
-#: io.c:1945
+#: io.c:1980
 #, fuzzy
 msgid "restoring stdin in parent process failed\n"
 msgstr "in"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, fuzzy, c-format
 msgid "close of pipe failed (%s)"
 msgstr "Gufunga Bya Byanze"
 
-#: io.c:2024
+#: io.c:2059
 #, fuzzy
 msgid "`|&' not supported"
 msgstr "`|&'OYA"
 
-#: io.c:2090
+#: io.c:2125
 #, fuzzy, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "Gufungura"
 
-#: io.c:2131
+#: io.c:2166
 #, fuzzy, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "Kurema kugirango"
 
-#: io.c:2506
+#: io.c:2548
 #, fuzzy, c-format
 msgid "data file `%s' is empty"
 msgstr "Ibyatanzwe IDOSIYE ni ubusa"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 #, fuzzy
 msgid "could not allocate more input memory"
 msgstr "OYA Birenzeho Iyinjiza Ububiko"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, fuzzy, c-format
 msgid "error reading input file `%s': %s"
 msgstr "Ikosa Iyinjiza IDOSIYE"
 
-#: io.c:3109
+#: io.c:3163
 #, fuzzy
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "Agaciro Bya ni a Umugereka"
 
-#: main.c:338
+#: main.c:351
 #, fuzzy
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "`-M Ihitamo in"
 
-#: main.c:340
+#: main.c:353
 #, fuzzy
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "-M Ihitamo Ikoresha: M"
 
-#: main.c:357
+#: main.c:370
 #, fuzzy, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s:Ihitamo"
 
-#: main.c:394
+#: main.c:407
 #, fuzzy
 msgid "empty argument to `--source' ignored"
 msgstr "ubusa Kuri"
 
-#: main.c:467
+#: main.c:480
 #, fuzzy
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "IMPINDURAGACIRO Gushyiraho ku"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr ""
 
-#: main.c:483
+#: main.c:497
 #, fuzzy
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--NYACUMI"
 
-#: main.c:487
+#: main.c:501
 #, fuzzy, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "Imizi Gicurasi a Umutekano"
 
-#: main.c:528
+#: main.c:542
 #, fuzzy, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "Gushyiraho Nyabibiri Ubwoko ku"
 
-#: main.c:531
+#: main.c:545
 #, fuzzy, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "Gushyiraho Nyabibiri Ubwoko ku"
 
-#: main.c:533
+#: main.c:547
 #, fuzzy, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "Gushyiraho Nyabibiri Ubwoko ku"
 
-#: main.c:572
+#: main.c:586
 #, fuzzy
 msgid "no program text at all!"
 msgstr "Oya Porogaramu Umwandiko ku Byose"
 
-#: main.c:665
+#: main.c:690
 #, fuzzy, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Cyangwa IMISUSIRE Amahitamo F IDOSIYE"
 
-#: main.c:667
+#: main.c:692
 #, fuzzy, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Cyangwa IMISUSIRE Amahitamo IDOSIYE"
 
-#: main.c:672
+#: main.c:697
 #, fuzzy
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "Amahitamo Amahitamo"
 
-#: main.c:673
+#: main.c:698
 #, fuzzy
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "-F IDOSIYE"
 
-#: main.c:674
+#: main.c:699
 #, fuzzy
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "-Umwanya Mutandukanya"
 
-#: main.c:675
+#: main.c:700
 #, fuzzy
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "-v VAR Kugenera... VAR"
 
-#: main.c:676
+#: main.c:701
 #, fuzzy
 msgid "\t-m[fr] val\n"
 msgstr "-M"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr ""
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr ""
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr ""
 
-#: main.c:680
+#: main.c:705
 #, fuzzy
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "-Ibihinduka IDOSIYE Ibihinduka IDOSIYE"
 
-#: main.c:681
+#: main.c:706
 #, fuzzy
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "-Ibijyana IDOSIYE Ibijyana IDOSIYE"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr ""
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr ""
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr ""
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr ""
 
-#: main.c:686
+#: main.c:711
 #, fuzzy
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "-NYACUMI NYACUMI"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr ""
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr ""
 
-#: main.c:693
+#: main.c:718
 #, fuzzy
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "-Ibijyana IDOSIYE Ibijyana IDOSIYE"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr ""
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr ""
 
-#: main.c:696
+#: main.c:721
 #, fuzzy
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "-Inkomoko Porogaramu Inkomoko Porogaramu"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr ""
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr ""
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr ""
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 #, fuzzy
 msgid ""
 "\n"
@@ -1692,7 +1721,7 @@ msgid ""
 "\n"
 msgstr "Icyegeranyo in Na in i Byacapwe Verisiyo"
 
-#: main.c:707
+#: main.c:738
 #, fuzzy
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
@@ -1702,7 +1731,7 @@ msgstr ""
 "ni a Ishusho Na Inonosora Ururimi Mburabuzi Bisanzwe Iyinjiza Na Bisanzwe "
 "Ibisohoka"
 
-#: main.c:711
+#: main.c:742
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -1710,21 +1739,21 @@ msgid ""
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr "Igiteranyo Gucapa Igiteranyo Gucapa"
 
-#: main.c:731
+#: main.c:762
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
-"C Porogaramu ni Kigenga Na Cyangwa i Bya i Nka Verisiyo 2. Bya i ku Ihitamo "
+"C Porogaramu ni Kigenga Na Cyangwa i Bya i Nka Verisiyo 3. Bya i ku Ihitamo "
 "Verisiyo"
 
-#: main.c:739
+#: main.c:770
 #, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
@@ -1735,59 +1764,57 @@ msgid ""
 msgstr ""
 "Porogaramu ni in i ATARIIGIHARWE i Cyangwa A kugirango Birenzeho Birambuye"
 
-#: main.c:745
+#: main.c:781
 #, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "BYAKIRIWE a Gukoporora Bya i Na: iyi Porogaramu NIBA OYA Kwandika Kuri i"
 
-#: main.c:781
+#: main.c:816
 #, fuzzy
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-OYA Gushyiraho Kuri Isunika in"
 
-#: main.c:1018
+#: main.c:1060
 #, fuzzy, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr "%s:`%s'Kuri OYA in VAR"
 
-#: main.c:1038
+#: main.c:1080
 #, fuzzy, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s'ni OYA a By'amategeko IMPINDURAGACIRO Izina:"
 
-#: main.c:1041
+#: main.c:1083
 #, fuzzy, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s'ni OYA a IMPINDURAGACIRO Izina: kugirango IDOSIYE"
 
-#: main.c:1074
+#: main.c:1122
 #, fuzzy
 msgid "floating point exception"
 msgstr "Bihindagurika Akadomo Irengayobora(-)"
 
-#: main.c:1081
+#: main.c:1129
 #, fuzzy
 msgid "fatal error: internal error"
 msgstr "Ikosa By'imbere Ikosa"
 
-#: main.c:1132
+#: main.c:1180
 #, fuzzy, c-format
 msgid "no pre-opened fd %d"
 msgstr "Oya Byahawe imiterere mbere"
 
-#: main.c:1139
+#: main.c:1187
 #, fuzzy, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "OYA Byahawe imiterere mbere Gufungura NTAGIHARI kugirango"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, fuzzy, c-format
 msgid "could not find groups: %s"
 msgstr "OYA Gushaka Amatsinda"
@@ -1812,27 +1839,32 @@ msgstr "IKOSA"
 msgid "fatal: "
 msgstr ""
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 #, fuzzy
 msgid "can't convert string to float"
 msgstr "GUHINDURA Ikurikiranyanyuguti Kuri Kureremba"
 
-#: node.c:414
+#: node.c:406
 #, fuzzy
 msgid "backslash at end of string"
 msgstr "ku Impera Bya Ikurikiranyanyuguti"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "ki/ bishaje OYA Gushigikira Mukoresha"
+
+#: node.c:599
 #, fuzzy
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "OYA Kwemerera"
 
-#: node.c:610
+#: node.c:605
 #, fuzzy
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "Oya in"
 
-#: node.c:644
+#: node.c:639
 #, fuzzy, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "Nka Byuzuye"
@@ -1842,151 +1874,155 @@ msgstr "Nka Byuzuye"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s%s`%s':OYA Gushyiraho Gufunga ku"
 
-#: profile.c:91
+#: profile.c:92
 #, fuzzy, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "OYA Gufungura kugirango"
 
-#: profile.c:467
+#: profile.c:450
 #, fuzzy, c-format
 msgid "internal error: %s with null vname"
 msgstr "By'imbere Ikosa Na: NTAGIHARI"
 
-#: profile.c:531
+#: profile.c:514
 #, fuzzy
 msgid "# treated internally as `delete'"
 msgstr "#Nka"
 
-#: profile.c:1168
+#: profile.c:1147
 #, fuzzy, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr "#iyi ni a Umugereka Umumaro"
 
-#: profile.c:1199
+#: profile.c:1178
 #, fuzzy, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "#Ibijyana Byaremwe"
 
-#: profile.c:1202
+#: profile.c:1181
 #, fuzzy, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
 "\n"
 msgstr "#Funga S"
 
-#: profile.c:1212
+#: profile.c:1191
 #, fuzzy, c-format
 msgid ""
 "\t# Rule(s)\n"
 "\n"
 msgstr "#S"
 
-#: profile.c:1218
+#: profile.c:1197
 #, fuzzy, c-format
 msgid ""
 "\t# END block(s)\n"
 "\n"
 msgstr "#Funga S"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
 "\t# Functions, listed alphabetically\n"
 msgstr ""
 
-#: profile.c:1453
+#: profile.c:1470
 #, fuzzy, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "Ubwoko in"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Ibyatunganye"
 
-#: regcomp.c:163
+#: regcomp.c:135
 #, fuzzy
 msgid "No match"
 msgstr "BIHUYE"
 
-#: regcomp.c:166
+#: regcomp.c:138
 #, fuzzy
 msgid "Invalid regular expression"
 msgstr "Ibisanzwe imvugo"
 
-#: regcomp.c:169
+#: regcomp.c:141
 #, fuzzy
 msgid "Invalid collation character"
 msgstr "Inyuguti"
 
-#: regcomp.c:172
+#: regcomp.c:144
 #, fuzzy
 msgid "Invalid character class name"
 msgstr "Inyuguti ishuri Izina:"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr ""
 
-#: regcomp.c:178
+#: regcomp.c:150
 #, fuzzy
 msgid "Invalid back reference"
 msgstr "Inyuma Indango"
 
-#: regcomp.c:181
+#: regcomp.c:153
 #, fuzzy
 msgid "Unmatched [ or [^"
 msgstr "Cyangwa"
 
-#: regcomp.c:184
+#: regcomp.c:156
 #, fuzzy
 msgid "Unmatched ( or \\("
 msgstr "Cyangwa"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr ""
 
-#: regcomp.c:190
+#: regcomp.c:162
 #, fuzzy
 msgid "Invalid content of \\{\\}"
 msgstr "Ibikubiyemo Bya"
 
-#: regcomp.c:193
+#: regcomp.c:165
 #, fuzzy
 msgid "Invalid range end"
 msgstr "Urutonde Impera"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr ""
 
-#: regcomp.c:199
+#: regcomp.c:171
 #, fuzzy
 msgid "Invalid preceding regular expression"
 msgstr "Ibisanzwe imvugo"
 
-#: regcomp.c:202
+#: regcomp.c:174
 #, fuzzy
 msgid "Premature end of regular expression"
 msgstr "Impera Bya Ibisanzwe imvugo"
 
-#: regcomp.c:205
+#: regcomp.c:177
 #, fuzzy
 msgid "Regular expression too big"
 msgstr "imvugo"
 
-#: regcomp.c:208
+#: regcomp.c:180
 #, fuzzy
 msgid "Unmatched ) or \\)"
 msgstr "Cyangwa"
 
-#: regcomp.c:688
+#: regcomp.c:664
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "Ibanjirije Ibisanzwe imvugo"
 
 #, fuzzy
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "Umuyoboro Sibyo in"
+
+#, fuzzy
 #~ msgid "function %s called\n"
 #~ msgstr "Umumaro"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 6e7b484a..47828809 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index ff481a56..ef388362 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.1m\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
 "PO-Revision-Date: 2003-02-27 19:54+0100\n"
 "Last-Translator: Martin Sjögren <md9ms@mdstud.chalmers.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -36,353 +36,368 @@ msgstr "försök att använda skalären \"%s\" som vektor"
 msgid "from %s"
 msgstr "%s (från %s)"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "referens till ickeinitierat element \"%s[\"%s\"]\""
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "index i vektorn \"%s\" är en tom sträng"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: index \"%s\" finns inte i vektorn \"%s\""
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: tom (null)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: tom (noll)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: tabellstorlek = %d, vektorstorlek = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: är en parameter\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: vektorreferens till %s\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s-block måste ha en åtgärdsdel"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "varje regel måste ha ett mönster eller en åtgärdsdel"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+#, fuzzy
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "gamla awk stöder inte operatorn \"**\""
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "\"%s\" är en inbyggd funktion, den kan inte definieras om"
 
-#: awkgram.y:313
+#: awkgram.y:328
 #, fuzzy
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "regexp-konstanten \"/%s/\" ser ut som en C-kommentar men är inte det"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "regexp-konstanten \"/%s/\" ser ut som en C-kommentar men är inte det"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "kommandot kanske inte har någon effekt"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "\"%s\" använd i %s-åtgärden"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "\"nextfile\" är en gawk-utökning"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "\"return\" använd utanför funktion"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "ensamt \"print\" i BEGIN eller END-regel bör troligen vara 'print \"\"'"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "\"delete array\" är en gawk-utökning"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "\"delete(array)\" är en icke portabel tawk-utökning"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "flerstegs dubbelriktade rör fungerar inte"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "reguljärt uttryck i högerledet av en tilldelning"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "reguljärt uttryck på vänster sida om en \"~\"- eller \"!~\"-operator"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+#, fuzzy
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "gamla awk stöder inte operatorn \"**\""
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "reguljärt uttryck i högerledet av en jämförelse"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "icke omdirigerad \"getline\" odefinierad inuti END-åtgärd"
 
-#: awkgram.y:906
+#: awkgram.y:914
+#, fuzzy
+msgid "old awk does not support multidimensional arrays"
+msgstr "gamla awk stöder inte operatorn \"**\""
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "anrop av \"length\" utan parenteser är inte portabelt"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "anrop av \"length\" utan parenteser är föråldrat enligt POSIX"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr ""
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "ogiltig indexuttryck"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "oväntat nyradstecken eller slut på strängen"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "tom programtext på kommandoraden"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "kan inte öppna källfilen \"%s\" för läsning (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "kan inte läsa källfilen \"%s\" (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "källfilen \"%s\" är tom"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "källfilen slutar inte med en ny rad"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "oavslutat reguljärt uttryck slutar med \"\\\" i slutet av filen"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "oavslutat reguljärt uttryck"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "oavslutat reguljärt uttryck i slutet av filen"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "Användning av \"\\ #...\" för radfortsättning är inte portabelt"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "sista tecknet på raden är inte ett omvänt snedstreck"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX tillåter inte operatorn \"**=\""
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "gamla awk stöder inte operatorn \"**=\""
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX tillåter inte operatorn \"**\""
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "gamla awk stöder inte operatorn \"**\""
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "operatorn \"^=\" stöds inte i gamla awk"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "operatorn \"^\" stöds inte i gamla awk"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "oavslutad sträng"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "ogiltigt tecken \"%c\" i uttryck"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "\"%s\" är en gawk-utökning"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "\"%s\" är en Bell Labs-utökning"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX tillåter inte \"%s\""
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "\"%s\" stöds inte i gamla awk"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "\"goto\" anses skadlig!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d är ett ogiltigt antal argument för %s"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: tredje argumentet är en gawk-utökning"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: bokstavlig sträng som sista argument till ersättning har ingen effekt"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s: tredje argumentet är inte ett ändringsbart objekt"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: andra argumentet är en gawk-utökning"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "användandet av dcgettext(_\"...\") är felaktigt: ta bort det inledande "
 "understrykningstecknet"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "användandet av dcngettext(_\"...\") är felaktigt: ta bort det inledande "
 "understrykningstecknet"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funktionen \"%s\": parameter %d, \"%s\", är samma som parameter %d"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funktionen \"%s\": parametern \"%s\" överskuggar en global variabel"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "kunde inte öpnna \"%s\" för skrivning (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "skickar profilen till standard fel"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: misslyckades att stänga (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() anropad två gånger!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "det fanns överskuggade variabler."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funktionen \"%s\": kan inte använda funktionsnamn som parameternamn"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "funktionsnamnet \"%s\" är definierat sedan tidigare"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funktionen \"%s\" anropad men aldrig definierad"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "funktionen \"%s\" definierad men aldrig anropad"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "konstant reguljärt uttryck för parameter %d ger ett booleskt värde"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, fuzzy, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -391,198 +406,198 @@ msgstr ""
 "funktionen \"%s\" anropad med blanktecken mellan namnet och \"(\",\n"
 "%s"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s till \"%s\" misslyckades (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "standard ut"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "okänd anledning"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: fick ett ickenumeriskt argument"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: argumentet %g är inte inom tillåten gräns"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: kan inte spola: röret \"%s\" öppnat för läsning, inte skrivning"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: kan inte spola: filen \"%s\" öppnad för läsning, inte skrivning"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: \"%s\" är inte en öppen fil, rör eller koprocess"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: första argumentet är inte en sträng"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: andra argumentet är inte en sträng"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: fick ett ickenumeriskt argument"
 
-#: builtin.c:472
+#: builtin.c:448
 #, fuzzy
 msgid "`length(array)' is a gawk extension"
 msgstr "\"delete array\" är en gawk-utökning"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: fick ett argument som inte är en sträng"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: fick ett ickenumeriskt argument"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: fick ett negativt argumentet %g"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "måste använda \"count$\" på alla eller inga format"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "\"$\" tillåts inte i awkformat"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "argumentantalet med \"$\" måste vara > 0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "argumentantalet %ld är större än antalet givna argument"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "\"$\" tillåts inte efter en punkt i formatet"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "inget \"$\" bifogat för positionsangiven fältbredd eller precision"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "\"l\" är meningslös i awk-format, ignorerad"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "\"l\" tillåts inte i POSIX awk-format"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "\"L\" är meningslös i awk-format, ignorerad"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "\"L\" tillåts inte i POSIX awk-format"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "\"h\" är meningslös i awk-format, ignorerad"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "\"h\" tillåts inte i POSIX awk-format"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "för få argument för formatsträngen"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "^ tog slut här"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: formatspecifieraren har ingen kommandobokstav"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "för många argument för formatsträngen"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: inga argument"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: fick ickenumeriskt argument"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: anropad med negativt argument %g"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: startindex %g är ogiltigt, använder 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: startindex %g som inte är ett heltal kommer trunkeras"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: längden %g är <= 0"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, fuzzy, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: längden %g är <= 0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: längden %g som inte är ett heltal kommer trunkeras"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: längden %g är för stor för strängindexering, trunkeras till %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: källsträngen är tom"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: startindex %g är bortom strängens slut"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -590,187 +605,187 @@ msgstr ""
 "substr: längden %g vid startindex %g överskrider det första argumentets "
 "längd (%lu)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftime: fick ett första argument som inte är en sträng"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: fick en tom formatsträng"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: fick ett argument som inte är en sträng"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: fick ett argument som inte är en sträng"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, fuzzy, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referens till icke initierad variabel \"%s\""
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: fick ett argument som inte är en sträng"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: fick ett argument som inte är en sträng"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: fick ett ickenumeriskt första argument"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: fick ett ickenumeriskt argument"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: fick ett ickenumeriskt argument"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: fick ett ickenumeriskt argument"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: tredje argumentet är inte en vektor"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: Nollan i tredje argumentet behandlad som en etta"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: fick ett ickenumeriskt första argument"
 
-#: builtin.c:2717
+#: builtin.c:2768
 #, fuzzy
 msgid "lshift: received non-numeric second argument"
 msgstr "strftime: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): negativa värden kommer ge konstiga resultat"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): flyttalsvärden kommer trunkeras"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "lshift(%lf, %lf): för stora skiftvärden kommer ge konstiga resultat"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: fick ett ickenumeriskt första argument"
 
-#: builtin.c:2755
+#: builtin.c:2806
 #, fuzzy
 msgid "rshift: received non-numeric second argument"
 msgstr "strftime: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): negativa värden kommer ge konstiga resultat"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): flyttalsvärden kommer trunkeras"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "rshift(%lf, %lf): för stora skiftvärden kommer ge konstiga resultat"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: fick ett ickenumeriskt första argument"
 
-#: builtin.c:2793
+#: builtin.c:2844
 #, fuzzy
 msgid "and: received non-numeric second argument"
 msgstr "atan2: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): negativa värden kommer ge konstiga resultat"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): flyttalsvärden kommer trunkeras"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: fick ett ickenumeriskt första argument"
 
-#: builtin.c:2829
+#: builtin.c:2880
 #, fuzzy
 msgid "or: received non-numeric second argument"
 msgstr "atan2: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): negativa värden kommer ge konstiga resultat"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): flyttalsvärden kommer trunkeras"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: fick ett ickenumeriskt första argument"
 
-#: builtin.c:2865
+#: builtin.c:2916
 #, fuzzy
 msgid "xor: received non-numeric second argument"
 msgstr "atan2: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): negativa värden kommer ge konstiga resultat"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): flyttalsvärden kommer trunkeras"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: fick ett ickenumeriskt argument"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): negativa värden kommer ge konstiga resultat"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): flyttalsvärden kommer trunkeras"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: \"%s\" är inte en giltig lokalkategori"
@@ -784,7 +799,7 @@ msgstr "okänd nodtyp %d"
 msgid "buffer overflow in genflags2str"
 msgstr "buffertöverflöd i genflags2str"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "försök att använda vektorn \"%s\" i skalärsammanhang"
@@ -832,7 +847,7 @@ msgstr "\"nextfile\" kan inte anropas från en END-regel"
 msgid "statement has no effect"
 msgstr "kommandot har ingen effekt"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "kan inte använda funktionsnamnet \"%s\" som variabel eller vektor"
@@ -842,7 +857,7 @@ msgstr "kan inte använda funktionsnamnet \"%s\" som variabel eller vektor"
 msgid "reference to uninitialized argument `%s'"
 msgstr "referens till icke initierat argument \"%s\""
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referens till icke initierad variabel \"%s\""
@@ -854,44 +869,44 @@ msgid ""
 msgstr ""
 "concatenation: sidoeffekter i ett uttryck har ändrat längden av ett annat!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "tilldelning använt i jämförelsesammanhang"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "försökte dividera med noll"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "försökte dividera med noll i \"%%\""
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "otillåten typ (%s) i tree_eval"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "försökte dividera med noll i \"/=\""
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "försökte dividera med noll i \"%%=\""
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "funktionen \"%s\" anropad med fler argument än vad som deklarerats"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "funktionen \"%s\" är inte definierad"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -902,660 +917,674 @@ msgstr ""
 "\t# Funktionsanropsstack:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- main --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "försök att fältreferera från ickenumeriskt värde"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "försök att referera från tom sträng"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "försök att komma åt fält nummer %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "det är inte tillåtet att tilldela resultatet från en inbyggd funktion"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "\"IGNORECASE\" är en gawk-utökning"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "\"BINMODE\" är en gawk-utökning"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "felaktig \"%sFMT\"-specifikation \"%s\""
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "slår av \"--lint\" på grund av en tilldelning till \"LINT\""
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "\"extension\" är en gawk-utökning"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: kan inte öppna \"%s\" (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: bibliotek \"%s\": kan inte anropa funktionen \"%s\" (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:107
+#: ext.c:110
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: bibliotek \"%s\": kan inte anropa funktionen \"%s\" (%s)\n"
 
-#: ext.c:113
+#: ext.c:116
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: kan inte öppna \"%s\" (%s)\n"
 
-#: ext.c:117
+#: ext.c:120
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "funktionen \"%s\" är inte definierad"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:124
+#: ext.c:127
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "funktionsnamnet \"%s\" är definierat sedan tidigare"
 
-#: ext.c:201
+#: ext.c:204
 #, fuzzy, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funktionen \"%s\" definierad men aldrig anropad"
 
-#: ext.c:204
+#: ext.c:207
 #, fuzzy, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funktionen \"%s\" är inte definierad"
 
-#: ext.c:214
+#: ext.c:217
 #, fuzzy, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "försök att använda skalären \"%s\" som vektor"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Operationen stöds inte"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF satt till ett negativt värde"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: andra argumentet är inte en vektor"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: tom sträng som tredje argument är en gawk-utökning"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "\"FIELDWIDTHS\" är en gawk-utökning"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "tom sträng som \"FS\" är en gawk-utökning"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+#, fuzzy
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "gamla awk stöder inte operatorn \"**\""
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flaggan \"%s\" är tvetydig\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"--%s\" tillåter inte argument\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"%c%s\" tillåter inte argument\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flaggan \"%s\" kräver ett argument\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flaggan kräver ett argument -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tillåter inte något argument\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "kan inte öppna filen \"%s\" för läsning (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "stängning av fd %d (\"%s\") misslyckades (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "ogiltig trädtyp %s i redirect()"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "uttrycket i \"%s\"-omdirigering har bara numeriskt värde"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "uttrycket för \"%s\"-omdirigering har en tom sträng som värde"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "filnamnet \"%s\" för \"%s\"-omdirigering kan vara resultatet av ett logiskt "
 "uttryck"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "onödig blandning av \">\" och \">>\" för filen \"%.*s\""
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "kan inte öppna röret \"%s\" för utmatning (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "kan inte öppna röret \"%s\" för inmatning (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "filen \"%s\" är en katalog"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr "kan inte öppna tvåvägsuttaget \"%s\" för in-/utmatning (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "kan inte öppna tvåvägsröret \"%s\" för in-/utmatning (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "kan inte dirigera om från \"%s\" (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "kan inte dirigera om till \"%s\" (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "nådde systembegränsningen för öppna filer: börjar multiplexa fildeskriptorer"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "stängning av \"%s\" misslyckades (%s)"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "för många rör eller indatafiler öppna"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: andra argumentet måste vara \"to\" eller \"from\""
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: \"%.*s\" är inte en öppen fil, rör eller koprocess"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "stängning av omdirigering som aldrig öppnades"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: omdirigeringen \"%s\" öppnades inte med \"|&\", andra argumentet "
 "ignorerat"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "felstatus (%d) från rörstängning av \"%s\" (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "felstatus (%d) från filstängning av \"%s\" (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "ingen explicit stängning av uttaget \"%s\" tillhandahållen"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "ingen explicit stängning av koprocessen \"%s\" tillhandahållen"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "ingen explicit stängning av röret \"%s\" tillhandahållen"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "ingen explicit stängning av filen \"%s\" tillhandahållen"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "fel vid skrivning till standard ut (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "fel vid skrivning till standard fel (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "rörspolning av \"%s\" misslyckades (%s)"
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "koprocesspolning av röret till \"%s\" misslyckades (%s)"
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "filspolning av \"%s\" misslyckades (%s)"
 
-#: io.c:1205
+#: io.c:1198
+#, fuzzy, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "lokal port ogiltig i \"%s\""
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr ""
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "/inet/raw-klient är tyvärr inte klar än"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "bara root kan använda \"/inet/raw\"."
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "/inet/raw-server inte redo än, ledsen"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr ""
 "inget (känt) protokoll tillhandahållet i det speciella filnamnet \"%s\""
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "speciellt filnamn \"%s\" är ofullständigt"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "lokal port ogiltig i \"%s\""
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "måste tillhandahålla ett fjärrdatornamn till \"/inet\""
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "måste tillhandahålla en fjärrport till \"/inet\""
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "fjärrporten ogiltig i \"%s\""
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-kommunikation stöds inte"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "filen \"%s\" är en katalog"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "använd \"PROCINFO[\"%s\"]\" istället för \"%s\""
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "använd \"PROCINFO[...]\" istället för \"dev/user\""
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "kunde inte öppna \"%s\", läge \"%s\""
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "stängning av huvudpty misslyckades (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "stängning av standard ut i barnet misslyckades (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "flyttandet av slavpty till standard ut i barnet misslyckades (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "stängning av standard in i barnet misslyckades (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "flyttandet av slavpty till standard in i barnet misslyckades (dup: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "stängning av slavpty misslyckades (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "flyttande av rör till standard ut i barnet misslyckades (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "flyttande av rör till standard in i barnet misslyckades (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "återställande av standard ut i förälderprocessen misslyckades\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "återställande av standard in i förälderprocessen misslyckades\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "stängning av röret misslyckades (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "\"|&\" stöds inte"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "kan inte öppna röret \"%s\" (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "kan inte skapa barnprocess för \"%s\" (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "datafilen \"%s\" är tom"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "kunde inte allokera mer indataminne"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "fel vid läsning av indatafilen \"%s\": %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "flerteckensvärdet av \"RS\" är en gawk-utökning"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "\"-m[fr]\"-flaggan är irrelevant i gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "-m-flaggans användning: \"-m[fr] nnn\""
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: flaggan \"-W %s\" okänd, ignorerad\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "tomt argument till \"--source\" ignorerat"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "miljövariabeln \"POSIXLY_CORRECT\" satt: slår på \"--posix\""
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "\"--posix\" åsidosätter \"--traditional\""
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "\"--posix\"/\"--traditional\" åsidosätter \"--non-decimal-data\""
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "att köra %s setuid root kan vara ett säkerhetsproblem"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "kan inte sätta binärläge på standard in (%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "kan inte sätta binärläge på standard ut (%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "kan inte sätta binärläge på standard fel (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "ingen programtext alls!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Användning: %s [POSIX- eller GNU-stilsflaggor] -f progfil [--] fil ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Användning: %s [POSIX- eller GNU-stilsflaggor] %cprogram%c fil ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "POSIX-flaggor:\t\tGNU långa flaggor:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f progfil\t\t--file=progfil\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=värde\t\t--assign=var=värde\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "\t-m[fr] värde\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "\t-W compat\t\t--compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "\t-W copyleft\t\t--copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "\t-W copyright\t\t--copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "\t-W dump-variables[=fil]\t--dump-variables[=fil]\n"
 
-#: main.c:681
+#: main.c:706
 #, fuzzy
 msgid "\t-W exec=file\t\t--exec=file\n"
 msgstr "\t-W profile[=fil]\t--profile[=fil]\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "\t-W gen-po\t\t--gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "\t-W help\t\t\t--help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "\t-W lint-old\t\t--lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "\t-W parsedebug\t\t--parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "\t-W profile[=fil]\t--profile[=fil]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "\t-W re-interval\t\t--re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "\t-W source=programtext\t--source=programtext\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "\t-W traditional\t\t--traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "\t-W usage\t\t--usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "\t-W version\t\t--version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1569,7 +1598,7 @@ msgstr ""
 "Rapportera synpunkter på översättningen till <sv@li.org>.\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1579,7 +1608,7 @@ msgstr ""
 "Normalt läser det från standard in och skriver till standard ut.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1589,14 +1618,14 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' fil\n"
 "\tgawk -F: '{print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
@@ -1604,11 +1633,11 @@ msgstr ""
 "\n"
 "Detta program är fri programvara. Du kan distribuera det och/eller\n"
 "modifiera det under villkoren i GNU General Public License, publicerad\n"
-"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
+"av Free Software Foundation, antingen version 3 eller (om du så vill)\n"
 "någon senare version.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1622,57 +1651,56 @@ msgstr ""
 "General Public License för ytterligare information.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Du bör ha fått en kopia av GNU General Public License tillsammans\n"
 "med detta program. Om inte, skriv till Free Software Foundation,\n"
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft sätter inte FS till tab i POSIX-awk"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr "%s: Argumentet \"%s\" till \"-v\" är inte på formatet \"var=värde\"\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "\"%s\" är inte ett giltigt variabelnamn"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "\"%s\" är inte ett variabelnamn, letar efter filen \"%s=%s\""
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "flyttalsundantag"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "ödesdigert fel: internt fel"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "ingen föröppnad fd %d"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "kunde inte föröppna /dev/null för fd %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "kunde inte hitta grupper: %s"
@@ -1694,23 +1722,28 @@ msgstr "fel: "
 msgid "fatal: "
 msgstr "ödesdigert: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "kan inte konvertera en sträng till flyttal"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "omvänt snedstreck i slutet av strängen"
 
-#: node.c:604
+#: node.c:548
+#, fuzzy, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "gamla awk stöder inte operatorn \"**\""
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX tillåter inte \"\\x\"-kontrollsekvenser"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "inga hexadecimala siffror i \"\\x\"-kontrollsekvenser"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "kontrollsekvensen \"\\%c\" behandlad som bara \"%c\""
@@ -1720,31 +1753,31 @@ msgstr "kontrollsekvensen \"\\%c\" behandlad som bara \"%c\""
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s \"%s\": kunde inte sätta stäng-vid-exec (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "kunde inte öppna \"%s\" för skrivning: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, fuzzy, c-format
 msgid "internal error: %s with null vname"
 msgstr "internt fel: Node_var med null vname"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# behandlad internt som \"delete\""
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr ""
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawkprofil, skapad %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1753,7 +1786,7 @@ msgstr ""
 "\t# BEGIN-block\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1762,7 +1795,7 @@ msgstr ""
 "\t# Regel/regler\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1771,7 +1804,7 @@ msgstr ""
 "\t# END-block\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1780,83 +1813,86 @@ msgstr ""
 "\n"
 "\t# Funktioner, listade alfabetiskt\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "oväntad typ %s i prec_level"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Lyckades"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "Misslyckades"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Ogiltigt reguljärt uttryck"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Ogiltigt kollationeringstecken"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Ogiltigt teckenklassnamn"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Eftersläpande omvänt snedstreck"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Ogiltig bakåtrerefens"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "Obalanserad [ eller [^"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "Obalanserad ( eller \\("
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "Obalanserad \\{"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Ogiltigt innehåll i \\{\\}"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Ogiltigt omfångsslut"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Minnet slut"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Ogiltigt föregående reguljärt uttryck"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "För tidigt slut på reguljärt uttryck"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Reguljärt uttryck för stort"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "Obalanserad ) eller \\)"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Inget föregående reguljärt uttryck"
 
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "fjärrporten ogiltig i \"%s\""
+
 #~ msgid "function %s called\n"
 #~ msgstr "funktionen %s anropad\n"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index f835f4f7..6b55f96b 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index b682b638..d0b8c027 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,19 +1,19 @@
 # Turkish translations for GNU awk messages
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Nilgün Belma Bugüner <nilgun@superonline.com>, 2001, ..., 2004.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 #
+# Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2001, ..., 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 3.1.3l\n"
+"Project-Id-Version: gawk 3.1.5f\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
-"PO-Revision-Date: 2004-07-19 10:15+0300\n"
-"Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
+"PO-Revision-Date: 2007-05-19 19:32+0300\n"
+"Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: array.c:112
 #, c-format
@@ -35,347 +35,358 @@ msgstr "sayısal `%s' dizi olarak kullanılmaya çalışılıyor"
 msgid "from %s"
 msgstr "%s'den"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
 msgstr "ilklendirilmemiş öğeye ( %s[\"%s\"] ) başvuru yapılıyor"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "dizinin indisi `%s' bir null dizge"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
 msgstr "delete: `%s' indeksi `%s' dizisinde deÄŸil"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: boÅŸ (null)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: boş (sıfır)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: tablo_uzunluÄŸu = %d, dizi_indisi = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: parametredir\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
 msgstr "%s: %s için dizi başvurusu\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s blokları bir eylem bölümü içermeli"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
 msgstr "her kural bir eylem bölümü veya bir kalıp içermeli"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "eski awk çok sayıda `BEGIN' veya `END' kuralını desteklemiyor"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' bir yerleÅŸik iÅŸlevdir, yeniden atanamaz"
 
-#: awkgram.y:313
-#, fuzzy
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
-msgstr "düzenli ifade sabiti `/%s/' bir C açıklaması gibi görünüyor ama değil"
+msgstr "düzenli ifade sabiti `//' bir C++ açıklaması gibi görünüyor ama değil"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "düzenli ifade sabiti `/%s/' bir C açıklaması gibi görünüyor ama değil"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
 msgstr "deyim bir etkiye sahip olmayabilir"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
 msgstr "`%s' %s eyleminde kullanılmış"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
 msgstr "`nextfile' bir gawk uzantısıdır"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
 msgstr "`return' işlev bağlamının dışında kullanılmış"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr "BEGIN veya END kuralındaki `print' aslında `print \"\"' olmalıydı"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
 msgstr "`delete array' bir gawk uzantısıdır"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete array' uyarlanabilir olmayan bir gawk uzantısıdır"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "switch içinde yinelenmiş case değerleri var: %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
 msgstr "switch içinde yinelenmiş `default' saptandı"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
 msgstr "çok katlı iki yönlü veriyolları çalışmaz"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
 msgstr "düzenli ifade atamanın sağında"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "düzenli ifade `~' ya da `!~' işlemiminin solunda"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "eski awk `for'dan sonra gelmeyen `in' anahtar sözcüğünü desteklemiyor"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
 msgstr "düzenli ifade karşılaştırmanın sağında"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "END eyleminin içinde yönlendirme yapmayan `getline' tanımsız"
 
-#: awkgram.y:906
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr "eski awk çok boyutlu dizileri desteklemiyor"
+
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
 msgstr "parantezsiz `length' çağrısı taşınabilir değil"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
 msgstr "parantezsiz `length' çağrısı POSIX'e uygun değil"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
 msgstr "dizi olmayan değişken dizi olarak kullanılmış"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "indis ifadesi geçersiz"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
 msgstr "beklenmeyen satırsonu ya da dizge sonu"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
 msgstr "komut satırında boş program metni"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "kaynak dosyası `%s' okumak için açılamıyor (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "kaynak dosyası `%s' okunamıyor (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "kaynak dosyası `%s' boş"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
 msgstr "kaynak dosyasının sonunda satırsonu eksik"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "sonlandırılmamış düzenli ifade dosya sonunda `\\' ile bitiyor"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
-msgstr ""
+msgstr "%s: %d: tawk regex değiştirici `/.../%c' gawk'ta çalışmaz"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
-msgstr ""
+msgstr "tawk regex değiştirici `/.../%c' gawk'ta çalışmaz"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
 msgstr "sonlandırılmamış düzenli ifade"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
 msgstr "dosya sonunda sonlandırılmamış düzenli ifade"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "`\\ #...' satır uzatma kullanımı taşınabilir değil"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
 msgstr "tersbölü satırdaki son karakter değil"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
 msgstr "`**=' iÅŸlemimi POSIX uyumlu deÄŸil"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
 msgstr "`**=' iÅŸlemimini eski awk desteklemiyor"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
 msgstr "`**' iÅŸlemimi POSIX uyumlu deÄŸil"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
 msgstr "`**' iÅŸlemimini eski awk desteklemiyor"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
 msgstr "`^=' iÅŸlemimini eski awk desteklemiyor"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
 msgstr "`^' iÅŸlemimini eski awk desteklemiyor"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "sonlandırılmamış dizge"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "ifade içinde '%c' karakteri geçersiz"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' bir gawk uzantısıdır"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
 msgstr "`%s' bir Bell Laboratuarları uzantısıdır"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "`%s' POSIX uyumlu deÄŸil"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' eski awk tarafından desteklemiyor"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' zararlı sayılır!\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d argüman sayısı olarak %s için geçersiz"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: üçüncü argüman bir gawk uzantısı"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: yerine kullanılan son argüman olarak dizge sabiti etkisiz"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "üçüncü %s parametresi değiştirilebilir bir nesne değil"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: ikinci argüman bir gawk uzantısı"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dcgettext(_\"...\") kullanımı yanlış: altçizgiyi kaldırın"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dcngettext(_\"...\") kullanımı yanlış: altçizgiyi kaldırın"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "`%s' işlevi: %d. parametre, `%s', %d. parametrenin tekrarı"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "`%s' işlevi: parametre, `%s'global değişkeni gölgeliyor"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "`%s' yazmak için açılamadı (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
 msgstr "profil standart hataya gönderiliyor"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: kapatma başarısız (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() iki kere çağrıldı!"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
 msgstr "gölgeli değişkenler vardı."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "işlev `%s': işlev ismi parametre ismi olarak kullanılamaz"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "işlev ismi `%s' önceden atanmış"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "`%s' işlevi çağrıldı ama hiç atanmamış"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
 msgstr "`%s' işlevi atanmış ama hiç çağrılmadı"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "%d numaralı argüman bir düzenli ifade sabiti"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -384,202 +395,201 @@ msgstr ""
 "`%s' işlevi `(' ile isim arasında boşlukla çağrılmış,\n"
 "ya da bir değişken veya bir dizi olarak kullanılmış"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
 msgstr "%s  \"%s\"ya yazılamadı (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "standart çıktı"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "sebebi bilinmiyor"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: sayısal olmayan argüman alındı"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
 msgstr "exp: %g kapsamdışı"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
 "fflush: kanala yazılamadı: veriyolu `%s' okumak için açıldı, yazmak için "
 "deÄŸil"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: kanala yazılamadı: dosya `%s' okumak için açıldı, yazmak için değil"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' bir açık dosya, veriyolu ya da bir yan işlem değil"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
 msgstr "index: ilk argüman dizge olmayan türde alındı"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
 msgstr "index: ikinci argüman dizge olmayan türde alındı"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
 msgstr "int: sayısal olmayan argüman alındı"
 
-#: builtin.c:472
-#, fuzzy
+#: builtin.c:448
 msgid "`length(array)' is a gawk extension"
-msgstr "`delete array' bir gawk uzantısıdır"
+msgstr "`length(array)' bir gawk uzantısıdır"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: dizge olmayan argüman alındı"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: sayısal olmayan argüman alındı"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: negatif argüman %g alındı"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
 msgstr "tüm biçemlerde ya `count$' kullanmalısınız ya da hiçbir şey"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
 msgstr "`$' awk biçemlerde kullanılmaz"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
 msgstr "`$' ile birlikte verilen argüman sayısı > 0 olmalıdır"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
 msgstr "argüman sayısı %ld sağlanmış toplam argüman sayısından büyük"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
 msgstr "`$' biçem içinde noktadan sonra kullanılmaz"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr "konumsal alan genişliği ya da duyarlığı için `$' kullanılmamış"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`l' awk biçemlerde anlamsız; yoksayıldı"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
 msgstr "`l' POSIX awk biçemlerde kullanılmaz"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`L' awk biçemlerde anlamsız; yoksayıldı"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
 msgstr "`L' POSIX awk biçemlerde kullanılmaz"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`h' awk biçemlerde anlamsız; yoksayıldı"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
 msgstr "`h' POSIX awk biçemlerde kullanılmaz"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: %g değeri `%%%c' biçimi için kapsamdışı"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "biçem dizgesini oluşturacak yeterli argüman yok"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
 msgstr "bir bunun için ^ tükendi"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: biçem belirteci denetim karakteri içermiyor"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
 msgstr "biçem dizgesi için çok fazla argüman sağlanmış"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
 msgstr "printf: argüman yok"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: sayısal olmayan argüman alındı"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: negatif argüman %g ile çağrıldı"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: başlangıç indeksi olarak %g geçersiz, 1 kullanılıyor"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr ""
 "substr: tamsayı olmayan başlangıç indeksi %g den ondalık kısım çıkarılacak"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: uzunluk %g >= 1 deÄŸil"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: uzunluk %g => 0 deÄŸil"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: tamsayı olmayan uzunluk %g den ondalık kısım çıkarılacak"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: dizge indislemesi için uzunluk olarak %g çok fazla, %g den sonrası "
 "gözardı ediliyor"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: kaynak dizge sıfır uzunlukta"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: başlangıç indisi %g dizgenin sonundan sonra"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -587,182 +597,182 @@ msgstr ""
 "substr: uzunluk %g, %g başlangıç indisinde ilk argümanın uzunluğunu (%lu) "
 "aÅŸar"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
 msgstr "strftime: ilk argüman dizge olmayan türde alındı"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: boş biçem dizgesi alındı"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: ikinci argüman sayısal olmayan türde alındı"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
 msgstr "mktime: dizge olmayan argüman alındı"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
 msgstr "system: dizge olmayan argüman alındı"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "ilklendirilmemiş `$%d' alanına başvuru"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
 msgstr "tolower: dizge olmayan argüman alındı"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
 msgstr "toupper: dizge olmayan argüman alındı"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: ilk argüman sayısal olmayan türde alındı"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: ikinci argüman sayısal olmayan türde alındı"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: sayısal olmayan argüman alındı"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: sayısal olmayan argüman alındı"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: sayısal olmayan argüman alındı"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
 msgstr "match: üçüncü argüman bir dizi değil"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
 msgstr "gensub: 0 olan 3. argüman 1 kabul edildi"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: ilk argüman sayısal olmayan türde alındı"
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: ikinci argüman sayısal değil"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
 msgstr "lshift(%lf, %lf): negatif değerler tuhaf sonuçlar verecek"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): tamsayı kısım kalacak şekilde kalanı atılacak"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
 msgstr "lshift(%lf, %lf): çok büyük kaydırma değeri tuhaf sonuçlar verecek"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: ilk argüman sayısal olmayan türde alındı"
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: ikinci argüman sayısal değil"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
 msgstr "rshift(%lf, %lf): negatif değerler tuhaf sonuçlar verecek"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): tamsayı kısım kalacak şekilde kalanı atılacak"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
 msgstr "rshift(%lf, %lf): çok büyük kaydırma değeri tuhaf sonuçlar verecek"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: ilk argüman sayısal olmayan türde alındı"
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
 msgstr "and: ikinci argüman sayısal değil"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
 msgstr "and(%lf, %lf): negatif değerler tuhaf sonuçlar verecek"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
 msgstr "and(%lf, %lf): tamsayı kısım kalacak şekilde kalanı atılacak"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: ilk argüman sayısal olmayan türde alındı"
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
 msgstr "or: ikinci argüman sayısal değil"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
 msgstr "or(%lf, %lf): negatif değerler tuhaf sonuçlar verecek"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
 msgstr "or(%lf, %lf): tamsayı kısım kalacak şekilde kalanı atılacak"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
 msgstr "xor: ilk argüman sayısal olmayan türde alındı"
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
 msgstr "xor: ikinci argüman sayısal değil"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
 msgstr "xor(%lf, %lf): negatif değerler tuhaf sonuçlar verecek"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
 msgstr "xor(%lf, %lf): tamsayı kısım kalacak şekilde kalanı atılacak"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
 msgstr "compl: sayısal olmayan argüman alındı"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
 msgstr "compl(%lf): negatif değerler tuhaf sonuçlar verecek"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
 msgstr "compl(%lf): tamsayı kısım kalacak şekilde kalanı atılacak"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' geçerli bir yerel kategori değil"
@@ -776,7 +786,7 @@ msgstr "%d. düğümtürü bilinmiyor"
 msgid "buffer overflow in genflags2str"
 msgstr "genflags2str içinde tampon taştı"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "`%s' dizisi bir sayısal bağlamda kullanılmaya çalışılıyor"
@@ -824,7 +834,7 @@ msgstr "`nextfile' bir END kuralından çağrılamaz"
 msgid "statement has no effect"
 msgstr "deyim etkisiz"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
 msgstr "`%s' işlev ismi bir değişken ya da dizi olarak kullanılamaz"
@@ -834,7 +844,7 @@ msgstr "`%s' işlev ismi bir değişken ya da dizi olarak kullanılamaz"
 msgid "reference to uninitialized argument `%s'"
 msgstr "başlangıç değeri olmayan `%s' argümanına başvuru"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "öndeğer ataması yapılmamış `%s' değişkenine başvuru"
@@ -846,44 +856,44 @@ msgid ""
 msgstr ""
 "bitiÅŸtirme: bir ifadenin yan etkileri diÄŸerinin uzunluÄŸunu deÄŸiÅŸtirmiÅŸ!"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
 msgstr "koşul bağlamında atama yapılmış"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
 msgstr "sıfırla bölme hatası"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "`%%'de sıfırla bölme hatası"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
 msgstr "tree_eval içinde kuraldışı tür (%s)"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
 msgstr "`/='de sıfırla bölme hatası"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "`%%='de sıfırla bölme hatası"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "`%s' işlevi bildirilenden daha fazla argümanla çağrıldı"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
 msgstr "`%s' işlevi tanımsız"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -894,666 +904,678 @@ msgstr ""
 "\t# İşlev Çağrı Yığını:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr "\t# -- main --\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
 msgstr "sayısal olmayan değerden alan başvurusu"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "null dizgeden alan baÅŸvurusu"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
 msgstr "%d. alana erişilmeye çalışılıyor"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
 msgstr "deÄŸiÅŸken ismine yerleÅŸik iÅŸlevin sonucu atanamaz"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' bir gawk uzantısıdır"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' bir gawk uzantısıdır"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "`%sFMT' özelliği `%s' hatalı"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "`LINT' atamasından dolayı `--lint' kapatılıyor"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
 msgstr "`extension' bir gawk uzantısıdır"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
 msgstr "extension: `%s' açılamıyor (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr "extension: kitaplık `%s': `%s' işlevi çağrılamıyor (%s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
 msgstr "extension: iÅŸlev ismi eksik"
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: `%2$s' işlevindeki `%1$c' karakteri kuraldışı"
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: `%s' işlevi yeniden tanımlanamaz"
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: `%s' işlevi zaten tanımlı"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "extension: bir gawk yerleÅŸiÄŸi olan `%s' iÅŸlev ismi olamaz"
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: işlev ismi `%s' evvelce tanımlanmış"
 
-#: ext.c:201
-#, fuzzy, c-format
+#: ext.c:204
+#, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "`%s' işlevi en çok `%d' argüman alabilecek şekilde tanımlı"
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "`%s' işlevi: %d. argüman eksik"
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 "`%s' işlevi: %d. argüman: tek değerli değişken bir dizi olarak kullanılmaya "
 "çalışılıyor"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 "`%s' işlevi: %d. argüman: dizi tek değerli bir değişken olarak kullanılmaya "
 "çalışılıyor"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
 msgstr "Ä°ÅŸlem Desteklenmiyor"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
 msgstr "NF negatif değere ayarlı"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
 msgstr "split: ikinci argüman bir dizi değil"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: üçüncü argüman olan null dizge bir gawk uzantısı"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' bir gawk uzantısıdır"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
-msgstr ""
+msgstr "`%s' yanında FIELDWIDTHS değeri geçersiz"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
 msgstr "`FS' için null dizge bir gawk uzantısıdır"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "eski awk düzenli ifadeleri `FS' değeriyle desteklemiyor"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: seçenek `%c%s' argümansız kullanılır\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: `--%s' seçeneği bilinmiyor\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: kuraldışı seçenek -- %c\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: seçenek bir argümanla kullanılır -- %c\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "`%s' okumak için açılamıyor (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "dosya tanımlayıcı %d (`%s') başarısız (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
 msgstr "redirect() içindeki ağaç türü %s geçersiz"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "`%s' yönlendirmesi içindeki ifade sadece sayısal değer içeriyor"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "`%s' yönlendirmesi içindeki ifade null dizge değeri içeriyor"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "`%s' dosya ismi (`%s' yönlendirmesi için) mantıksal ifadenin sonucu olabilir"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "`%.*s' dosyası için `>' ve `>>' karışımı gereksiz"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "`%s' veriyolu çıktı için açılamadı (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "`%s' veriyolu girdi için açılamadı (%s)"
 
-#: io.c:665
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "`%s' dosya deÄŸil dizin"
+
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
 msgstr "iki yönlü `%s' soketi G/Ç için açılamıyor (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "iki yönlü `%s' veriyolu G/Ç için açılamıyor (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "`%s'den yönlendirilemiyor (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "`%s'e yönlendirilemiyor (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "açık dosyalar için sistem sınırı aşıldı: çoğul dosya tanımlayıcılara "
 "baÅŸlarken"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "`%s' kapatılamadı (%s)."
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
 msgstr "çok fazla veriyolu ya da dosya açık"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: ikinci argüman `to' ya da `from' olmalı"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: `%.*s' bir açık dosya, veriyolu ya da alt-işlem değil"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
 msgstr "hiç açılmamış bir yönlendirmenin kapatılması"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: `%s' yönlendirmesi bir `|&' ile açılmamış, ikinci argüman yoksayıldı"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "başarısızlık durumu (%d): `%s' veriyolunun kapatılması (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "başarısızlık durumu (%d): `%s' dosyasının kapatılması (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "`%s' soketinin açıkça kapatılması istenmedi"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "`%s' alt-işleminin açıkça kapatılması istenmedi"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "`%s' veriyolunun açıkça kapatılması istenmedi"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "`%s' dosyasının açıkça kapatılması istenmedi"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "standart çıktıya yazarken hata (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "standart hataya yazarken hata (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "`%s'in veriyolu ile veri aktarımı başarısız (%s)."
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "`%s'e veriyolunun alt-işlemi ile veri aktarımı başarısız (%s)."
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "`%s'in dosya ile veri aktarımı başarısız (%s)."
 
-#: io.c:1205
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "yerel port `%s' `/inet' için geçersiz"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr "uzak konak ve port bilgisi (%s, %s) geçersiz"
+
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
 msgstr "/inet/raw istemci henüz hazır değil"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
 msgstr "`/inet/raw' sadece root tarafından kullanılabilir"
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
 msgstr "/inet/raw sunucu henüz hazır değil"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
 msgstr "özel dosya ismi `%s' içinde (bilinen) bir protokol sağlanmamış"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
 msgstr "özel dosya ismi `%s' tamamlanmamış"
 
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "`%s' deki yerel port geçersiz"
-
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
 msgstr "`/inet' e bir karşı makina ismi sağlanmalı"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
 msgstr "`/inet' e bir karşı port sağlanmalı"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "`%s' de karşı port geçersiz"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP haberleÅŸmesi desteklenmiyor"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "`%s' dosya deÄŸil dizin"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
 msgstr "`PROCINFO[\"%s\"]' kullanın (`%s' yerine)"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
 msgstr "`/dev/user' yerine `PROCINFO[...]' kullanın"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "`%s', `%s' kipinde açılamadı"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "ana pty kapatılamadı (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "ast süreçte stdÇ kapatılamadı (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "ast süreçte yardımcı pty standart çıktıya taşınamadı (dup: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "ast süreçte stdG kapatılamadı (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "ast süreçte yardımcı pty standart girdiye taşınamadı (dup: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "yardımcı pty kapatılamadı (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "ast süreçte veriyolu standart çıktıya taşınamadı (dup: %s)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "ast süreçte veriyolu standart girdiye taşınamadı (dup: %s)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
 msgstr "üst süreçte stdÇ eski durumuna getirilemedi\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
 msgstr "üst süreçte stdG eski durumuna getirilemedi\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "veriyolu kapatılamadı (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
 msgstr "`|&' desteklenmiyor"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "`%s' veriyolu açılamıyor (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "`%s' için ast süreç oluşturulamıyor (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "veri dosyası `%s' boş"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
 msgstr "daha fazla girdi belleği ayrılamadı"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
 msgstr "`%s' girdi dosyası okunurken hata: %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "`RS' çoklu karakter değeri bir gawk uzantısıdır"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
 msgstr "`-m[fr]' seçeneği gawk'da böyle kullanılmaz"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
 msgstr "-m seçeneğinin kullanımı: `-m[fr] nnn'"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr "%s: `-W %s' seçeneği tanımlı değil, yok sayıldı\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
 msgstr "`--source' seçeneği için boş argüman yoksayıldı"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "ortam değişkeni `POSIXLY_CORRECT' var: `--posix' kullanılıyor"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--posix' seçeneği `--traditional' seçeneğini etkisiz kılar"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 "`--posix'/`--traditional' seçenekleri `--non-decimal-data' seçeneğini "
 "etkisiz kılar"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "%s root yetkileriyle çalıştırıldığında güvenlik sorunları olabilir"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "standart girdi ikilik kipe ayarlanamaz (%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "standart çıktı ikilik kipe ayarlanamaz (%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "standart hata ikilik kipe ayarlanamaz (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
 msgstr "program metni hiç yok!"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Kullanımı: %s [POSIX veya GNU tarzı seçenekler] -f progdosyası [--] "
 "dosya ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Kullanımı: %s [POSIX veya GNU tarzı seçenekler] %cprogram%c dosya ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "POSIX seçenekleri:          GNU uzun seçenekleri:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "   -f progDosyası              --file=progDosyası\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "   -F ayraç                    --field-separator=ayraç\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "   -v var=deÄŸer                --assign=var=deÄŸer\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
 msgstr "   -m[fr] deÄŸer\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr "   -W compat                   --compat\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr "   -W copyleft                 --copyleft\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr "   -W copyright                --copyright\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr "   -W dump-variables[=dosya]   --dump-variables[=dosya]\n"
 
-#: main.c:681
-#, fuzzy
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
-msgstr "   -W profile[=dosya]          --profile[=dosya]\n"
+msgstr "   -W exec=dosya               --exec=dosya\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr "   -W gen-po                   --gen-po\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr "   -W help                     --help\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr "   -W lint[=ölümcül]           --lint[=ölümcül]\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr "   -W lint-old                 --lint-old\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr "   -W non-decimal-data         --non-decimal-data\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "   -W nostalgia                --nostalgia\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr "   -W parsedebug               --parsedebug\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr "   -W profile[=dosya]          --profile[=dosya]\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "   -W posix                    --posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr "   -W re-interval              --re-interval\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr "   -W source=program-metni     --source=program-metni\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr "   -W traditional              --traditional\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr "   -W usage                    --usage\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr "   -W version                  --version\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1564,10 +1586,10 @@ msgstr ""
 "Hataları raporlarken, `gawk.info' içindeki `Reporting Problems and Bugs'\n"
 "kısmının `Bugs' başlıklı bölümünden gerekli bilgileri alabilirsiniz.\n"
 "\n"
-"Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
+"Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 "\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -1577,7 +1599,7 @@ msgstr ""
 "Öntanımlı olarak standart girdiyi okur ve standart çıktıya yazar.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -1587,26 +1609,26 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' dosya\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
 "Telif hakkı (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "Bu program bir serbest yazılımdır. Bu yazılımı Free Software Foundation\n"
-"tarafından yayınlanmış olan GNU Genel Kamu Lisansının 2. ya da daha sonraki\n"
+"tarafından yayınlanmış olan GNU Genel Kamu Lisansının 3. ya da daha sonraki\n"
 "bir sürümünün koşulları altında kopyalayabilir, dağıtabilir ve/veya\n"
 "üzerinde değişiklik yapabilirsiniz.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1620,22 +1642,21 @@ msgstr ""
 "edinmek için GNU Genel Kamu Lisansına bakınız.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "GNU Genel Kamu Lisansının bir kopyasını bu programla birlikte almış\n"
-"olacaksınız; yoksa Free Software Foundation, Inc., 51 Franklin Street\n"
-"Fifth Floor, Boston, MA  02110-1301, USA. adresinden isteyebilirsiniz.\n"
+"olacaksınız; yoksa Free Software Foundation, Inc., 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA  02110-1301, USA adresinden isteyebilirsiniz.\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "POSIX awk -Ft ile dosya sistemini belirlemez"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -1644,35 +1665,35 @@ msgstr ""
 "%s: `-v' ile verilen `%s' argümanı `var=değer' biçiminde değil\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' kurala uygun bir deÄŸiÅŸken ismi deÄŸil"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%2$s=%3$s' için dosyaya bakınca, `%1$s' bir değişken ismi değil"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "Gerçel sayı istisnası"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
 msgstr "ölümcül iç hata"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "ön açılışlı bir %d dosya tanımlayıcısı yok"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "%d dosya tanımlayıcısı için /dev/null ön açılışı yapılamadı"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
 msgstr "gruplar bulunamadı: %s"
@@ -1694,23 +1715,28 @@ msgstr "hata: "
 msgid "fatal: "
 msgstr "ölümcül: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "dizge gerçel sayıya dönüştürülemiyor"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
 msgstr "dizge sonunda tersbölü"
 
-#: node.c:604
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "eski awk `\\%c' önceleme dizilimini desteklemiyor"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX `\\x' öncelemelerine izin vermez"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "`\\x' önceleme dizgesinde onaltılık rakamlar yok"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "`\\%c' önceleme dizgesi `%c' olarak kullanıldı"
@@ -1720,31 +1746,31 @@ msgstr "`\\%c' önceleme dizgesi `%c' olarak kullanıldı"
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr "%s %s `%s': close-on-exec belirlenemedi: (fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr "`%s' yazmak için açılamadı: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr "iç hata: null vname'li %s"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
 msgstr "# dahili olarak `delete' varsayıldı"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
 msgstr "# bu özdevimli olarak yüklenmiş bir ek işlevdir"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawk profili, oluÅŸturuldu: %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1753,7 +1779,7 @@ msgstr ""
 "\t# BEGIN blokları\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1762,7 +1788,7 @@ msgstr ""
 "\t# Kurallar\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
@@ -1771,7 +1797,7 @@ msgstr ""
 "\t# END blokları\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -1780,168 +1806,79 @@ msgstr ""
 "\n"
 "\t# İşlevler, alfabetik sırayla\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
 msgstr "prec_level'da anlaşılamayan tür %s"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Başarılı"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
 msgstr "EÅŸleÅŸmez"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Düzenli ifade geçersiz"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Karşılaştırma karakteri geçersiz"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Karakter sınıf ismi geçersiz"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
 msgstr "İzleyen tersbölü"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Geriye başvuru geçersiz"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "[ ya da [^ eÅŸleÅŸmiyor"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "( ya da \\( eÅŸleÅŸmiyor"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "\\{ eÅŸleÅŸmiyor"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\} içeriği geçersiz"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
 msgstr "Kapsam sonu geçersiz"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Bellek tükendi"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "düzenli ifade önceliği geçersiz"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Düzenli ifade sonu eksik kalmış"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Düzenli ifade çok büyük"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ") ya da  \\) eÅŸleÅŸmiyor"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
 msgstr "Daha önce düzenli ifade yok"
-
-#~ msgid "function %s called\n"
-#~ msgstr "%s işlevi çağrıldı\n"
-
-#~ msgid "field %d in FIELDWIDTHS, must be > 0"
-#~ msgstr "FIELDWIDTHS içindeki %d. alan > 0 olmalı"
-
-#~ msgid "or used as a variable or an array"
-#~ msgstr "ya da bir değişken ya da dizi olarak kullanılmış"
-
-#~ msgid "substr: length %g is < 0"
-#~ msgstr "substr: uzunluk %g < 0"
-
-#~ msgid "regex match failed, not enough memory to match string \"%.*s%s\""
-#~ msgstr ""
-#~ "düzenli ifade eşleşmesi sağlanamadı, \"%.*s%s\" dizgesini eşleştirmek "
-#~ "için yeterli bellek yok"
-
-#~ msgid "delete: illegal use of variable `%s' as array"
-#~ msgstr "delete: `%s' değişkeninin dizi olarak kullanımı kuraldışı"
-
-#~ msgid "asort: first argument is not an array"
-#~ msgstr "asort: ilk argüman bir dizi değil"
-
-#~ msgid "asort: second argument is not an array"
-#~ msgstr "asort: ikinci argüman bir dizi değil"
-
-#~ msgid "internal error: Node_var_array with null vname"
-#~ msgstr "iç hata: null vname'li node_var_array"
-
-#~ msgid "invalid syntax in name `%s' for variable assignment"
-#~ msgstr "değişken ismi `%s' de sözdizimi hatası"
-
-#~ msgid "or used in other expression context"
-#~ msgstr "ya da diğer ifadenin içeriğinde kullanılmış"
-
-#~ msgid "`%s' is a function, assignment is not allowed"
-#~ msgstr "`%s' bir işlevdir, bir değişken ismi olarak kullanılamaz"
-
-#~ msgid "BEGIN blocks must have an action part"
-#~ msgstr "BEGIN blokları bir eylem bölümü içermeli"
-
-#~ msgid "`nextfile' used in BEGIN or END action"
-#~ msgstr "`nextfile'  BEGIN ya da END eyleminde kullanılmış"
-
-#~ msgid "non-redirected `getline' undefined inside BEGIN or END action"
-#~ msgstr ""
-#~ "BEGIN ya da END eyleminin içinde yönlendirme yapmayan `getline' tanımsız"
-
-#~ msgid "fptr %x not in tokentab\n"
-#~ msgstr "işlev imleyicisi %x işlev isim listesinde bulunamadı\n"
-
-#~ msgid "gsub third parameter is not a changeable object"
-#~ msgstr "üçüncü gsub parametresi değiştirilebilir bir nesne değil"
-
-#~ msgid "Unbalanced ["
-#~ msgstr "Dengesiz ["
-
-#~ msgid "Unfinished \\ escape"
-#~ msgstr "Tamamlanmamış \\ escape"
-
-#~ msgid "unfinished repeat count"
-#~ msgstr "Tamamlanmamış tekrar sayısı"
-
-#~ msgid "malformed repeat count"
-#~ msgstr "Tekrar sayısı hatalı"
-
-#~ msgid "Unbalanced ("
-#~ msgstr "Dengesiz ("
-
-#~ msgid "No regexp syntax bits specified"
-#~ msgstr "Düzenli ifade sözdizimi bitleri belirtilmemiş"
-
-#~ msgid "Unbalanced )"
-#~ msgstr "Karşılıksız )"
-
-#~ msgid "out of memory"
-#~ msgstr "bellek yetersiz"
-
-#~ msgid "internal error: file `%s', line %d\n"
-#~ msgstr "iç hata: dosya `%s', satır %d\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "To report bugs, see node `Bugs' in `gawk.info', which is\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Yazılım hatalarını bildirmek için `gawk.info' içindeki `Bugs' "
-#~ "bölümündeki\n"
diff --git a/po/vi.gmo b/po/vi.gmo
index 628df455..a90a5ce4 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index 324aa674..659b7bb3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,781 +1,797 @@
-# Vietnamese translation for gawk.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Vietnamese translation for Gawk.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 3.1.4l\n"
+"Project-Id-Version: gawk 3.1.5f\n"
 "Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2005-07-06 17:20+0300\n"
-"PO-Revision-Date: 2005-06-28 14:46+0930\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
+"PO-Revision-Date: 2007-05-28 21:28+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6.3b1\n"
 
 #: array.c:112
 #, c-format
 msgid "attempt to use function `%s' as an array"
-msgstr "cố dùng chức năng «%s» là một mảng"
+msgstr "cố gắng dùng chức năng « %s » như mảng"
 
 #: array.c:115
 #, c-format
 msgid "attempt to use scalar parameter `%s' as an array"
-msgstr "cố dùng tham số vô hướng «%s» là một mảng"
+msgstr "cố gắng dùng tham số vô hướng « %s » như là mảng"
 
 #: array.c:118
 #, c-format
 msgid "attempt to use scalar `%s' as array"
-msgstr "cố dùng đi�u cô hướng «%s» là mảng"
+msgstr "cố dùng đi�u cô hướng « %s » là mảng"
 
 #: array.c:156
 #, c-format
 msgid "from %s"
 msgstr "từ %s"
 
-#: array.c:511
+#: array.c:514
 #, c-format
 msgid "reference to uninitialized element `%s[\"%s\"]'"
-msgstr "tham chiếu đến phần tử chưa khởi động «%s[\"%s\"]»"
+msgstr "tham chiếu đến phần tử chưa sở khởi « %s[\"%s\"] »"
 
-#: array.c:517
+#: array.c:520
 #, c-format
 msgid "subscript of array `%s' is null string"
 msgstr "chữ in dưới mảng «%s» là chuỗi rỗng"
 
-#: array.c:621
+#: array.c:624
 #, c-format
 msgid "delete: index `%s' not in array `%s'"
-msgstr "delete: (xóa b�) số chỉ mục «%s» không phải trong mảng «%s»"
+msgstr "delete: (xóa b�) số mũ « %s » không phải nằm trong mảng « %s »"
 
-#: array.c:791
+#: array.c:793
 #, c-format
 msgid "%s: empty (null)\n"
 msgstr "%s: rỗng (vô giá trị)\n"
 
-#: array.c:796
+#: array.c:798
 #, c-format
 msgid "%s: empty (zero)\n"
 msgstr "%s: rỗng (số không)\n"
 
-#: array.c:800
+#: array.c:802
 #, c-format
 msgid "%s: table_size = %d, array_size = %d\n"
 msgstr "%s: cỡ_bảng = %d, cỡ_mảng = %d\n"
 
-#: array.c:829
+#: array.c:831
 #, c-format
 msgid "%s: is parameter\n"
 msgstr "%s: là tham số\n"
 
-#: array.c:834
+#: array.c:836
 #, c-format
 msgid "%s: array_ref to %s\n"
-msgstr "%s: «array_ref» (mảng tham chiếu) đến «%s»\n"
+msgstr "%s: « array_ref » (mảng tham chiếu) đến « %s »\n"
 
-#: awkgram.y:208
+#: awkgram.y:215
 #, c-format
 msgid "%s blocks must have an action part"
-msgstr "M�i khối «%s» phải có một phần là hành động"
+msgstr "M�i khối %s phải có một phần kiểu hành động"
 
-#: awkgram.y:211
+#: awkgram.y:218
 msgid "each rule must have a pattern or an action part"
-msgstr "M�i quy tắc phải có một mẫu hoặc một phần là hành động"
+msgstr "M�i quy tắc phải có một mẫu hay phần kiểu hành động"
 
-#: awkgram.y:267
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr ""
+"awk cũ không hỗ trợ nhi�u quy tắc kiểu « BEGIN » (bắt đầu) hay « END » (kết "
+"thúc)"
+
+#: awkgram.y:282
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
-msgstr "«%s» là một chức năng có sẵn nên không thể định nghĩa lái nó."
+msgstr "« %s » là một chức năng có sẵn nên nó không thể được định nghĩa lái."
 
-#: awkgram.y:313
+#: awkgram.y:328
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
-"hằng biểu thức chính quy «//» hình như một chú thích C, nhưng mà không phải"
+"hằng biểu thức chính quy « // » hình như một chú thích C, nhưng mà không phải"
 
-#: awkgram.y:316
+#: awkgram.y:331
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
-"hằng biểu thức chính quy «/%s/» hình như một chú thích C, nhưng mà không phải"
+"hằng biểu thức chính quy « /%s/ » hình như một chú thích C, nhưng mà không "
+"phải"
 
-#: awkgram.y:343 awkgram.y:623
+#: awkgram.y:358 awkgram.y:653
 msgid "statement may have no effect"
-msgstr "có lẽ câu sẽ không có tác dụng"
+msgstr "câu có lẽ sẽ không có tác dụng"
 
-#: awkgram.y:440 awkgram.y:460
+#: awkgram.y:455 awkgram.y:479
 #, c-format
 msgid "`%s' used in %s action"
-msgstr "«%s» được dùng trong hành động «%s»"
+msgstr "« %s » được dùng trong hành động %s"
 
-#: awkgram.y:453 awkgram.y:456
+#: awkgram.y:470 awkgram.y:474
 msgid "`nextfile' is a gawk extension"
-msgstr "«nextfile» (tập tin kế tiếp) là một phần mở rộng gawk"
+msgstr "« nextfile » (tập tin kế tiếp) là một phần mở rộng gawk"
 
-#: awkgram.y:470
+#: awkgram.y:489
 msgid "`return' used outside function context"
-msgstr "đã dùng «return» (trở v�) ở ngoại ngữ cảnh chức năng"
+msgstr "« return » (trở v�) được dùng ở ngoại ngữ cảnh chức năng"
 
-#: awkgram.y:512
+#: awkgram.y:531
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
-"«print» (in) giản dị trong quy tắc «BEGIN» (bắt đầu) hay «END» (kết thức) "
-"thì rất có thể nên là «print\"\"»"
+"« print » (in) chuẩn trong quy tắc « BEGIN » (bắt đầu) hay « END » (kết "
+"thúc) rất có thể nên là « print\"\" »"
 
-#: awkgram.y:525 awkgram.y:532
+#: awkgram.y:547 awkgram.y:555
 msgid "`delete array' is a gawk extension"
-msgstr "«delete array» (xóa b� mảng) là một phần mở rộng gawk"
+msgstr "« delete array » (xóa b� mảng) là một phần mở rộng gawk"
 
-#: awkgram.y:540 awkgram.y:547
+#: awkgram.y:569 awkgram.y:577
 msgid "`delete(array)' is a non-portable tawk extension"
-msgstr "«delete array» (xóa b� mảng) là một phần mở rộng tawk không thể mang"
+msgstr ""
+"« delete array » (xóa b� mảng) là phần mở rộng gawk không thể mang theo"
 
-#: awkgram.y:591
+#: awkgram.y:621
 #, c-format
 msgid "duplicate case values in switch body: %s"
-msgstr "giá trị trư�ng hợp trùng trong nội dung câu chuyển đổi nhánh: %s"
+msgstr "gặp giá trị case trùng trong thân chuyển đổi (switch body): %s"
 
-#: awkgram.y:601
+#: awkgram.y:631
 msgid "Duplicate `default' detected in switch body"
-msgstr "�ã phát hiện «mặc định» trùng trong nội dung câu chuyển đổi nhánh"
+msgstr ""
+"Phát hiện « default » (mặc định) trong thân chuyển đổi (switch body): %s"
 
-#: awkgram.y:690
+#: awkgram.y:720
 msgid "multistage two-way pipelines don't work"
-msgstr "đư�ng ống dẫn hai chiếu đa giai đoạn không hoạt động được"
+msgstr "đư�ng ống dẫn hai chiếu đa giai đoạn không phải hoạt động được"
 
-#: awkgram.y:781
+#: awkgram.y:811
 msgid "regular expression on right of assignment"
-msgstr "biểu thức chính quy bên phải đi�u gán"
+msgstr "biểu thức chính quy nằm bên phải đi�u gán"
 
-#: awkgram.y:804
+#: awkgram.y:834
 msgid "regular expression on left of `~' or `!~' operator"
-msgstr "biểu thức chính quy bên trái toán tử «~» hay «!~»"
+msgstr "biểu thức chính quy nằm bên trái toán tử « ~ » hay « !~ »"
 
-#: awkgram.y:812
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "awk cũ không hỗ trợ từ khoá « in », trừ khi nằm sau « for »"
+
+#: awkgram.y:846
 msgid "regular expression on right of comparison"
-msgstr "biểu thức chính quy bên phải so sánh"
+msgstr "biểu thức chính quy nằm bên phải sự so sánh"
 
-#: awkgram.y:879
+#: awkgram.y:903
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
-"trong hành động «END» (kết thức) có «getline» (lấy dòng) không được chuyển "
-"hướng và chưa được định nghĩa."
+"trong hành động « END » (kết thúc) có « getline » (lấy dòng) không được "
+"chuyển hướng lại và chưa được xác định."
+
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr "awk cũ không hỗ trợ mảng đa chi�u"
 
-#: awkgram.y:906
+#: awkgram.y:960
 msgid "call of `length' without parentheses is not portable"
-msgstr "không thể mang l�i g�i «length» (độ dài) không có ngoặc"
+msgstr "không thể mang l�i g�i « length » (độ dài) không có dấu ngoặc"
 
-#: awkgram.y:909
+#: awkgram.y:965
 msgid "call of `length' without parentheses is deprecated by POSIX"
-msgstr "POSIX phản đối l�i g�i «length» (độ dài) không có ngoặc"
+msgstr "POSIX phản đối l�i g�i « length » (độ dài) không có dấu ngoặc"
 
-#: awkgram.y:962
+#: awkgram.y:1019
 msgid "use of non-array as array"
-msgstr "đã dùng đi�u là mảng mà không phải là mảng"
+msgstr "việc dùng đi�u khác mảng như là mảng"
 
-#: awkgram.y:964
+#: awkgram.y:1022
 msgid "invalid subscript expression"
 msgstr "biểu thức in thấp không hợp lệ"
 
-#: awkgram.y:1171
+#: awkgram.y:1249
 msgid "unexpected newline or end of string"
-msgstr "dòng mới hay kết thức chuỗi bất ng�"
+msgstr "gặp dòng mới bất ng� hay kết thúc của chuỗi"
 
-#: awkgram.y:1267
+#: awkgram.y:1366
 msgid "empty program text on command line"
-msgstr "chữ chương trình rỗng trên dòng lệnh"
+msgstr "gặp đoạn chữ chương trình rỗng nằm trên dòng lệnh"
 
-#: awkgram.y:1320
+#: awkgram.y:1422
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
-msgstr "không mở được tập tin nguồn «%s» để đ�c (%s)"
+msgstr "không thể mở tập tin nguồn « %s » để đ�c (%s)"
 
-#: awkgram.y:1397
+#: awkgram.y:1520
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
-msgstr "không đ�c được tập tin nguồn «%s» (%s)"
+msgstr "không thể đ�c tập tin nguồn « %s » (%s)"
 
-#: awkgram.y:1405
+#: awkgram.y:1528
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "tập tin nguồn «%s» là rỗng"
 
-#: awkgram.y:1596 awkgram.y:1718 awkgram.y:1736 awkgram.y:2107 awkgram.y:2194
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
 msgid "source file does not end in newline"
-msgstr "tập tin nguồn không kết thức với dòng mới"
+msgstr "tập tin nguồn không kết thúc với dòng mới"
 
-#: awkgram.y:1658
+#: awkgram.y:1782
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
-"biểu thức chính quy chưa chấm dứt thì kết thức với «\\» tại kết thức tập tin"
+"biểu thức chính quy chưa được chấm dứt kết thúc với « \\ » tại kết thúc của "
+"tập tin"
 
-#: awkgram.y:1682
+#: awkgram.y:1806
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
-"%s: %d: đi�u sửa đổi biểu thức chính quy tawk «/.../%c» không hoạt động "
-"trong trình gawk"
+"%s: %d: bộ sửa đổi biểu thức chính quy tawk « /.../%c » không hoạt động được "
+"trong gawk"
 
-#: awkgram.y:1686
+#: awkgram.y:1810
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
-"đi�u sửa đổi biểu thức chính quy tawk «/.../%c» không hoạt động trong trình "
+"bộ sửa đổi biểu thức chính quy tawk « /.../%c » không hoạt động được trong "
 "gawk"
 
-#: awkgram.y:1693
+#: awkgram.y:1817
 msgid "unterminated regexp"
-msgstr "biểu thức chính quy chưa chấm dứt "
+msgstr "biểu thức chính quy chưa được chấm dứt"
 
-#: awkgram.y:1696
+#: awkgram.y:1820
 msgid "unterminated regexp at end of file"
-msgstr "biểu thức chính quy chưa chấm dứt tại kết thức tập tin"
+msgstr "biểu thức chính quy chưa được chấm dứt nằm tại kết thúc của tập tin"
 
-#: awkgram.y:1762
+#: awkgram.y:1889
 msgid "use of `\\ #...' line continuation is not portable"
-msgstr "không thể mang khi sử dụng «\\#...» để tiếp tục dòng"
+msgstr "không thể mang khả năng dùng « \\#... » để tiếp tục dòng"
 
-#: awkgram.y:1774
+#: awkgram.y:1902
 msgid "backslash not last character on line"
-msgstr "xuyệc ngược không phải là ký tự cuối cùng trên dòng"
+msgstr "xuyệc ngược không phải là ký tự cuối cùng nằm trên dòng"
 
-#: awkgram.y:1819
+#: awkgram.y:1947
 msgid "POSIX does not allow operator `**='"
-msgstr "POSIX không cho phép toán tử «**=»"
+msgstr "POSIX không cho phép toán tử « **= »"
 
-#: awkgram.y:1821
+#: awkgram.y:1949
 msgid "old awk does not support operator `**='"
-msgstr "awk cũ không hỗ trợ toán tử «**=»"
+msgstr "awk cũ không hỗ trợ toán tử « **= »"
 
-#: awkgram.y:1830
+#: awkgram.y:1958
 msgid "POSIX does not allow operator `**'"
-msgstr "POSIX không cho phép toán tử «**»"
+msgstr "POSIX không cho phép toán tử « ** »"
 
-#: awkgram.y:1832
+#: awkgram.y:1960
 msgid "old awk does not support operator `**'"
-msgstr "awk cũ không hỗ trợ toán tử «**»"
+msgstr "awk cũ không hỗ trợ toán tử « ** »"
 
-#: awkgram.y:1863
+#: awkgram.y:1991
 msgid "operator `^=' is not supported in old awk"
-msgstr "awk cũ không hỗ trợ toán tử «^=»"
+msgstr "awk cũ không hỗ trợ toán tử « ^= »"
 
-#: awkgram.y:1871
+#: awkgram.y:1999
 msgid "operator `^' is not supported in old awk"
-msgstr "awk cũ không hỗ trợ toán tử «^»"
+msgstr "awk cũ không hỗ trợ toán tử « ^ »"
 
-#: awkgram.y:1955 awkgram.y:1970
+#: awkgram.y:2083 awkgram.y:2098
 msgid "unterminated string"
 msgstr "chuỗi không được chấm dứt"
 
-#: awkgram.y:2155
+#: awkgram.y:2283
 #, c-format
 msgid "invalid char '%c' in expression"
-msgstr "có một ký tự không hợp lệ «%c» trong biểu thức"
+msgstr "biểu thức một ký tự không hợp lệ « %c » nằm trong biểu thức"
 
-#: awkgram.y:2203
+#: awkgram.y:2331
 #, c-format
 msgid "`%s' is a gawk extension"
-msgstr "«%s» là một phần mở rộng gawk"
+msgstr "« %s » là một phần mở rộng gawk"
 
-#: awkgram.y:2206
+#: awkgram.y:2334
 #, c-format
 msgid "`%s' is a Bell Labs extension"
-msgstr "«%s» là một phần mở rộng Bell Labs (Phòng thí nghiệm Bell)"
+msgstr "« %s » là một phần mở rộng của Bell Labs (Phòng thí nghiệm Bell)"
 
-#: awkgram.y:2209
+#: awkgram.y:2337
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX không cho phép «%s»"
 
-#: awkgram.y:2213
+#: awkgram.y:2341
 #, c-format
 msgid "`%s' is not supported in old awk"
-msgstr "awk cũ không hỗ trợ «%s»"
+msgstr "awk cũ không hỗ trợ « %s »"
 
-#: awkgram.y:2239
+#: awkgram.y:2367
 msgid "`goto' considered harmful!\n"
-msgstr "đã thấy là «goto» gây tai hại\n"
+msgstr "« goto » được xem là gây tai hại\n"
 
-#: awkgram.y:2301
+#: awkgram.y:2429
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
-msgstr "«%d» không hợp lệ là số đối số cho «%s»"
+msgstr "« %d » không hợp lệ như là số đối số cho « %s »"
 
-#: awkgram.y:2320 awkgram.y:2323
+#: awkgram.y:2448 awkgram.y:2451
 msgid "match: third argument is a gawk extension"
 msgstr "match: (khớp) đối số thứ ba là phần mở rộng gawk"
 
-#: awkgram.y:2336
+#: awkgram.y:2464
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
-"%s: khi đối số cuối cùng của thay thế, hằng mã nguồn chuỗi không có tác dụng"
+"%s: khi đối số cuối cùng của sự thay thế, hằng mã nguồn chuỗi không có tác "
+"dụng"
 
-#: awkgram.y:2339
+#: awkgram.y:2467
 #, c-format
 msgid "%s third parameter is not a changeable object"
-msgstr "tham số thứ ba «%s» không phải là một đối tượng có thể thay đổi"
+msgstr "tham số thứ ba %s không phải là một đối tượng có thể thay đổi"
 
-#: awkgram.y:2366 awkgram.y:2369
+#: awkgram.y:2494 awkgram.y:2497
 msgid "close: second argument is a gawk extension"
 msgstr "close: (đóng) đối số thứ hai là phần mở rộng gawk"
 
-#: awkgram.y:2379
+#: awkgram.y:2507
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
-msgstr "dùng «dcgettext(_\"...\")» không đúng: hãy loại b� gạch dưới đi trước"
+msgstr "dùng « dcgettext(_\"...\") » không đúng: hãy gỡ b� gạch dưới nằm trước"
 
-#: awkgram.y:2394
+#: awkgram.y:2522
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
-msgstr "dùng «dcgettext(_\"...\")» không đúng: hãy loại b� gạch dưới đi trước"
+msgstr "dùng « dcgettext(_\"...\") » không đúng: hãy gỡ b� gạch dưới nằm trước"
 
-#: awkgram.y:2465
+#: awkgram.y:2594
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
-msgstr "chức năng «%s»: tham số «#%d», «%s», nhân đôi tham số «#%d»"
+msgstr "chức năng « %s »: tham số « #%d », « %s », nhân đôi tham số « #%d »"
 
-#: awkgram.y:2498
+#: awkgram.y:2627
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
-msgstr "chức năng «%s»: tham số «%s» che biến toàn cục"
+msgstr "chức năng « %s »: tham số « %s » che biến toàn cục"
 
-#: awkgram.y:2610
+#: awkgram.y:2739
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "không mở được «%s» để ghi (%s)"
 
-#: awkgram.y:2611 profile.c:93
+#: awkgram.y:2740 profile.c:94
 msgid "sending profile to standard error"
-msgstr "đang gởi tiểu sở sơ lược cho thiết bị lỗi chuẩn"
+msgstr "đang gởi hồ sơ cho thiết bị lỗi chuẩn"
 
-#: awkgram.y:2643
+#: awkgram.y:2772
 #, c-format
 msgid "%s: close failed (%s)"
-msgstr "%s: đóng thất bại (%s)"
+msgstr "%s: lỗi đóng (%s)"
 
-#: awkgram.y:2764
+#: awkgram.y:2893
 msgid "shadow_funcs() called twice!"
-msgstr "shadow_funcs() (chức năng bóng) được g�i hai lần!"
+msgstr "shadow_funcs() (chức năng bóng) được g�i hai lần !"
 
-#: awkgram.y:2791
+#: awkgram.y:2920
 msgid "there were shadowed variables."
-msgstr "đã có một số biến bị che"
+msgstr "có biến bị bóng."
 
-#: awkgram.y:2864
+#: awkgram.y:2993
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
-msgstr "chức năng «%s»: không dùng được tên chức năng là tên tham số"
+msgstr "chức năng « %s »: không thể dùng tên chức năng như là tên tham số"
 
-#: awkgram.y:2874
+#: awkgram.y:3003
 #, c-format
 msgid "function name `%s' previously defined"
-msgstr "tên chức năng «%s» được định nghĩa trước"
+msgstr "tên chức năng « %s » được xác định trước"
 
-#: awkgram.y:3025 awkgram.y:3031
+#: awkgram.y:3154 awkgram.y:3160
 #, c-format
 msgid "function `%s' called but never defined"
-msgstr "chức năng «%s» được g�i nhưng mà chưa định nghĩa"
+msgstr "chức năng « %s » được g�i nhưng mà chưa xác định"
 
-#: awkgram.y:3034
+#: awkgram.y:3163
 #, c-format
 msgid "function `%s' defined but never called"
-msgstr "chức năng «%s» được định nghĩa nhưng mà chưa g�i"
+msgstr "chức năng « %s » được xác định nhưng mà chưa được g�i"
 
-#: awkgram.y:3061
+#: awkgram.y:3190
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
-msgstr "hằng biểu thức chính quy cho tham số «#%d» làm giá trị luận lý"
+msgstr "hằng biểu thức chính quy cho tham số « #%d » làm giá trị luận lý (bun)"
 
-#: awkgram.y:3105
+#: awkgram.y:3234
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
 "or used as a variable or an array"
 msgstr ""
-"chức năng «%s» được g�i khi có dấu cách giữa tên và «(»\n"
-"hoặc được dùng là một biến hay là một mảng"
+"chức năng « %s » được g�i với dấu cách nằm giữa tên và « ( »\n"
+"hoặc được dùng như là biến hay mảng"
 
-#: builtin.c:145
+#: builtin.c:119
 #, c-format
 msgid "%s to \"%s\" failed (%s)"
-msgstr "%s đến «%s» thất bại (%s)"
+msgstr "%s tới « %s » bị lỗi (%s)"
 
-#: builtin.c:146
+#: builtin.c:120
 msgid "standard output"
 msgstr "thiết bị xuất chuẩn"
 
-#: builtin.c:147
+#: builtin.c:121
 msgid "reason unknown"
 msgstr "không biết sao"
 
-#: builtin.c:160
+#: builtin.c:134
 msgid "exp: received non-numeric argument"
 msgstr "exp: đã nhận đối số không phải thuộc số"
 
-#: builtin.c:166
+#: builtin.c:140
 #, c-format
 msgid "exp: argument %g is out of range"
-msgstr "exp: đối số «%g» ở ngoại phạm vị"
+msgstr "exp: đối số « %g » ở ngoại phạm vị"
 
-#: builtin.c:224
+#: builtin.c:198
 #, c-format
 msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
 msgstr ""
-"fflush: không thể xóa sạch: ống dẫn «%s» được mở để đ�c, không phải để ghi"
+"fflush: không thể xóa sạch: ống dẫn « %s » được mở để đ�c, không phải để ghi"
 
-#: builtin.c:227
+#: builtin.c:201
 #, c-format
 msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
 msgstr ""
 "fflush: không thể xóa sạch: tập tin «%s» được mở để đ�c, không phải để ghi"
 
-#: builtin.c:239
+#: builtin.c:213
 #, c-format
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr ""
-"fflush: «%s» không phải là một tập tin đã mở, một ống dẫn hay một đồng tiến "
-"trình"
+"fflush: « %s » không phải là tập tin đã mở, ống dẫn hay đồng tiến trình"
 
-#: builtin.c:332
+#: builtin.c:306
 msgid "index: received non-string first argument"
-msgstr "index: (số chỉ mục) đã nhận đối số đầu không phải là chuỗi"
+msgstr "index: (chỉ mục) đã nhận đối số thứ nhất không phải là chuỗi"
 
-#: builtin.c:334
+#: builtin.c:308
 msgid "index: received non-string second argument"
-msgstr "index: (số chỉ mục) đã nhận đối số thứ hai không phải là chuỗi"
+msgstr "index: (chỉ mục) đã nhận đối số thứ hai không phải là chuỗi"
 
-#: builtin.c:449
+#: builtin.c:423
 msgid "int: received non-numeric argument"
-msgstr "int: (số nguyên) đã nhận đối số không phải thuộc số"
+msgstr "int: (số nguyên?) đã nhận đối số không phải thuộc số"
 
-#: builtin.c:472
-#, fuzzy
+#: builtin.c:448
 msgid "`length(array)' is a gawk extension"
-msgstr "«delete array» (xóa b� mảng) là một phần mở rộng gawk"
+msgstr "« length(array) » (độ dài mảng) là một phần mở rộng gawk"
 
-#: builtin.c:481
+#: builtin.c:458
 msgid "length: received non-string argument"
 msgstr "length: (độ dài) đã nhận đối số không phải chuỗi"
 
-#: builtin.c:506
+#: builtin.c:483
 msgid "log: received non-numeric argument"
 msgstr "log: (bản ghi) đã nhận đối số không phải thuộc số"
 
-#: builtin.c:509
+#: builtin.c:486
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: (bản ghi) đã nhận đối số âm «%g»"
 
-#: builtin.c:673 builtin.c:676
+#: builtin.c:693 builtin.c:696
 msgid "must use `count$' on all formats or none"
-msgstr ""
-"phải sử dụng «count$» hoặc với m�i định dạng hoặc không với định dạng nào"
+msgstr "phải dùng « count$ » với m�i dạng thức hay không dùng cả"
 
-#: builtin.c:778
+#: builtin.c:799
 msgid "`$' is not permitted in awk formats"
-msgstr "không cho phép «$» trong định dạng awk"
+msgstr "không cho phép « $ » trong định dạng awk"
 
-#: builtin.c:784
+#: builtin.c:805
 msgid "arg count with `$' must be > 0"
-msgstr "khi dùng «$» thì số đếm đối số phải là >0"
+msgstr "số đếm đối số với « $ » phải là >0"
 
-#: builtin.c:786
+#: builtin.c:807
 #, c-format
 msgid "arg count %ld greater than total number of supplied arguments"
-msgstr "số đếm đối số «%ld» lớn hơn tổng số đối số được cung cấp"
+msgstr "số đếm đối số %ld lớn hơn tổng số đối số được cung cấp"
 
-#: builtin.c:788
+#: builtin.c:809
 msgid "`$' not permitted after period in format"
-msgstr "không cho phép «$» sau dấu chấm trong định dạng"
+msgstr "không cho phép « $ » nằm sau dấu chấm trong định dạng"
 
-#: builtin.c:801
+#: builtin.c:822
 msgid "no `$' supplied for positional field width or precision"
 msgstr ""
-"chưa cung cấp «$» cho độ rộng trư�ng thuộc vị trí hoặc cho độ chính xác"
+"chưa cung cấp « $ » cho độ rộng trư�ng thuộc vị trí hay cho độ chính xác"
 
-#: builtin.c:867
+#: builtin.c:888
 msgid "`l' is meaningless in awk formats; ignored"
-msgstr "chữ «l» không có nghĩa trong định dạng awk nên bị b� qua"
+msgstr "chữ « l » không có nghĩa trong định dạng awk nên bị b� qua"
 
-#: builtin.c:871
+#: builtin.c:892
 msgid "`l' is not permitted in POSIX awk formats"
-msgstr "không cho phép chữ «l» trong định dạng awk POSIX"
+msgstr "không cho phép chữ « l » nằm trong định dạng awk POSIX"
 
-#: builtin.c:882
+#: builtin.c:903
 msgid "`L' is meaningless in awk formats; ignored"
-msgstr "chữ «L» không có nghĩa trong định dạng awk nên bị b� qua"
+msgstr "chữ « L » không có nghĩa trong định dạng awk nên bị b� qua"
 
-#: builtin.c:886
+#: builtin.c:907
 msgid "`L' is not permitted in POSIX awk formats"
-msgstr "không cho phép chữ «L» trong định dạng awk POSIX"
+msgstr "không cho phép chữ « L » nằm trong định dạng awk POSIX"
 
-#: builtin.c:897
+#: builtin.c:918
 msgid "`h' is meaningless in awk formats; ignored"
-msgstr "chữ «h» không có nghĩa trong định dạng awk nên bị b� qua"
+msgstr "chữ « h » không có nghĩa trong định dạng awk nên bị b� qua"
 
-#: builtin.c:901
+#: builtin.c:922
 msgid "`h' is not permitted in POSIX awk formats"
-msgstr "không cho phép chữ «h» trong định dạng awk POSIX"
+msgstr "không cho phép chữ « h » nằm trong định dạng awk POSIX"
 
-#: builtin.c:1132
+#: builtin.c:1182
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
-msgstr "[s]printf: giá trị «%g» ở ngoại phạm vị cho định dạng «%%%c»"
+msgstr "[s]printf: giá trị %g ở ngoại phạm vị cho dạng thức « %%%c »"
 
-#: builtin.c:1198
+#: builtin.c:1266
 msgid "not enough arguments to satisfy format string"
 msgstr "chưa có đủ đối số để đáp ứng chuỗi định dạng"
 
-#: builtin.c:1200
+#: builtin.c:1268
 msgid "^ ran out for this one"
-msgstr "hết «^» cho đi�u này"
+msgstr "hết « ^ » cho đi�u này"
 
-#: builtin.c:1205
+#: builtin.c:1274
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: đi�u ghi rõ định dạng không có chữ đi�u khiển"
 
-#: builtin.c:1208
+#: builtin.c:1277
 msgid "too many arguments supplied for format string"
-msgstr "đã cung cấp quá nhi�u đối số cho chuỗi định dạng"
+msgstr "quá nhi�u đối số được cung cấp cho chuỗi định dạng"
 
-#: builtin.c:1274 builtin.c:1277
+#: builtin.c:1352 builtin.c:1355
 msgid "printf: no arguments"
-msgstr "printf: không có đối số nào"
+msgstr "printf: không có đối số"
 
-#: builtin.c:1301
+#: builtin.c:1379
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: (căn bậc hai) đã nhận đối số không phải thuộc số"
 
-#: builtin.c:1305
+#: builtin.c:1383
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: (căn bậc hai) đã g�i với đối số âm «%g»"
 
-#: builtin.c:1329
+#: builtin.c:1407
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
-msgstr "substr: (chuỗi con) số chỉ mục đầu «%g» không hợp lệ nên dùng «1»"
+msgstr "substr: (chuỗi phụ) số chỉ mục đầu « %g » không hợp lệ nên dùng 1"
 
-#: builtin.c:1334
+#: builtin.c:1412
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
-msgstr "substr: (chuỗi con) sẽ cắt xén số chỉ mục không phải số nguyên «%g»"
+msgstr ""
+"substr: (chuỗi phụ) số chỉ mục đầu không phải số nguyên « %g » sẽ bị cắt ngắn"
 
-#: builtin.c:1353
+#: builtin.c:1431
 #, c-format
 msgid "substr: length %g is not >= 1"
-msgstr "substr: (chuỗi con) độ dài «%g» không phải ≥1"
+msgstr "substr: (chuỗi phụ) độ dài %g không phải ≥1"
 
-#: builtin.c:1355
+#: builtin.c:1433
 #, c-format
 msgid "substr: length %g is not >= 0"
-msgstr "substr: (chuỗi con) độ dài «%g» không phải ≥0"
+msgstr "substr: (chuỗi phụ) độ dài %g không phải ≥0"
 
-#: builtin.c:1362
+#: builtin.c:1440
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
-msgstr "substr: (chuỗi con) sẽ cắt xén độ dài không phải số nguyên «%g»"
+msgstr "substr: (chuỗi phụ) sẽ cắt xén độ dài không phải số nguyên « %g »"
 
-#: builtin.c:1367
+#: builtin.c:1445
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
-msgstr ""
-"substr: (chuỗi con) độ dài «%g» quá lớn cho chỉ mục chuỗi nên cắt xén xuống "
-"«%g»"
+msgstr "substr: độ dài %g quá lớn để chỉ mục chuỗi nên xén ngắn thành %g"
 
-#: builtin.c:1379
+#: builtin.c:1457
 msgid "substr: source string is zero length"
 msgstr "substr: (chuỗi con) chuỗi nguồn có độ dài số không"
 
-#: builtin.c:1395
+#: builtin.c:1473
 #, c-format
 msgid "substr: start index %g is past end of string"
-msgstr "substr: (chuỗi con) chỉ mục đầu «%g» sau kết thức chuỗi"
+msgstr "substr: (chuỗi phụ) số chỉ mục đầu %g nằm sau kết thúc của chuỗi"
 
-#: builtin.c:1403
+#: builtin.c:1481
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
 msgstr ""
-"substr: (chuỗi con) độ dài «%g» tại chỉ mục đầu «%g» thì vượt quá độ dài của "
-"đối số đầu («%lu»)"
+"substr: (chuỗi phụ) độ dài %g tại số chỉ mục đầu %g vượt quá độ dài của đối "
+"số đầu (%lu)"
 
-#: builtin.c:1478
+#: builtin.c:1558
 msgid "strftime: received non-string first argument"
-msgstr "strftime: đã nhận đối số đầu không phải chuỗi"
+msgstr "strftime: đã nhận đối số thứ nhất khác chuỗi"
 
-#: builtin.c:1484
+#: builtin.c:1564
 msgid "strftime: received empty format string"
 msgstr "strftime: đã nhận chuỗi định dạng rỗng"
 
-#: builtin.c:1493
+#: builtin.c:1573
 msgid "strftime: received non-numeric second argument"
-msgstr "strftime: đã nhận đối số thứ hai không phải thuộc số"
+msgstr "strftime: đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:1556
+#: builtin.c:1650
 msgid "mktime: received non-string argument"
-msgstr "mktime: đã nhận đối số không phải chuỗi"
+msgstr "mktime: đã nhận đối số khác chuỗi"
 
-#: builtin.c:1601
+#: builtin.c:1695
 msgid "system: received non-string argument"
-msgstr "system: (hệ thống) đã nhận đối số không phải chuỗi"
+msgstr "system: (hệ thống) đã nhận đối số khác chuỗi"
 
-#: builtin.c:1722 eval.c:2039
+#: builtin.c:1816 eval.c:2041
 #, c-format
 msgid "reference to uninitialized field `$%d'"
-msgstr "tham chiếu đến trư�ng chưa khởi động «$%d»"
+msgstr "gặp tham chiếu đến trư�ng chưa được sở khởi « $%d »"
 
-#: builtin.c:1827
+#: builtin.c:1921
 msgid "tolower: received non-string argument"
-msgstr "tolower: (đến thấp hơn) đã nhận đối số không phải chuỗi"
+msgstr "tolower: (đến thấp hơn) đã nhận đối số khác chuỗi"
 
-#: builtin.c:1857
+#: builtin.c:1951
 msgid "toupper: received non-string argument"
-msgstr "toupper: (đến cao hơn) đã nhận đối số không phải chuỗi"
+msgstr "toupper: (đến cao hơn) đã nhận đối số khác chuỗi"
 
-#: builtin.c:1890
+#: builtin.c:1984
 msgid "atan2: received non-numeric first argument"
-msgstr "atan2: đã nhận đối số đầu không phải thuộc số"
+msgstr "atan2: đã nhận đối số thứ nhất khác thuộc số"
 
-#: builtin.c:1892
+#: builtin.c:1986
 msgid "atan2: received non-numeric second argument"
-msgstr "atan2: đã nhận đối số thứ hai không phải thuộc số"
+msgstr "atan2: đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:1911
+#: builtin.c:2005
 msgid "sin: received non-numeric argument"
 msgstr "sin: đã nhận đối số không phải thuộc số"
 
-#: builtin.c:1927
+#: builtin.c:2021
 msgid "cos: received non-numeric argument"
 msgstr "cos: đã nhận đối số không phải thuộc số"
 
-#: builtin.c:1977
+#: builtin.c:2071
 msgid "srand: received non-numeric argument"
 msgstr "srand: đã nhận đối số không phải thuộc số"
 
-#: builtin.c:2012
+#: builtin.c:2106
 msgid "match: third argument is not an array"
-msgstr "match: (khớp) đối số thứ ba không phải là một mảng"
+msgstr "match: (khớp) đối số thứ ba không phải là mảng"
 
-#: builtin.c:2555
+#: builtin.c:2650
 msgid "gensub: third argument of 0 treated as 1"
-msgstr "gensub: (tạo đi�u con) đối số thứ ba là «0» thì được xử lý là «1»"
+msgstr "gensub: đối số thứ ba 0 được xử lý như 1"
 
-#: builtin.c:2715
+#: builtin.c:2766
 msgid "lshift: received non-numeric first argument"
-msgstr "lshift: (dịch trái) đã nhận đối số đầu không phải thuộc số"
+msgstr "lshift: đã nhận đối số đầu không phải thuộc số"
 
-#: builtin.c:2717
+#: builtin.c:2768
 msgid "lshift: received non-numeric second argument"
-msgstr "lshift: (dịch trái) đã nhận đối số thứ hai không phải thuộc số"
+msgstr "lshift: (dịch bên trái) đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:2723
+#: builtin.c:2774
 #, c-format
 msgid "lshift(%lf, %lf): negative values will give strange results"
-msgstr "lshift(%lf, %lf): giá trị âm thì sẽ gây ra kết quả lạ"
+msgstr "lshift(%lf, %lf): giá trị âm sẽ gây ra kết quả lạ"
 
-#: builtin.c:2725
+#: builtin.c:2776
 #, c-format
 msgid "lshift(%lf, %lf): fractional values will be truncated"
-msgstr "lshift(%lf, %lf): giá trị thuộc phân số thì sẽ bị cắt xén"
+msgstr "lshift(%lf, %lf): giá trị thuộc phân số sẽ bị xén ngắn"
 
-#: builtin.c:2727
+#: builtin.c:2778
 #, c-format
 msgid "lshift(%lf, %lf): too large shift value will give strange results"
-msgstr "lshift(%lf, %lf): giá trị dịch quá lớn thì sẽ gây ra kết quả lạ"
+msgstr "lshift(%lf, %lf): giá trị dịch quá lớn sẽ gây ra kết quả lạ"
 
-#: builtin.c:2753
+#: builtin.c:2804
 msgid "rshift: received non-numeric first argument"
-msgstr "rshift: đã nhận đối số đầu không phải thuộc số"
+msgstr "rshift: đã nhận đối số thứ nhất khác thuộc số"
 
-#: builtin.c:2755
+#: builtin.c:2806
 msgid "rshift: received non-numeric second argument"
-msgstr "rshift: (dịch phải) đã nhận đối số thứ hai không phải thuộc số"
+msgstr "rshift: (dịch bên phải) đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:2761
+#: builtin.c:2812
 #, c-format
 msgid "rshift(%lf, %lf): negative values will give strange results"
-msgstr "rshift(%lf, %lf): giá trị âm thì sẽ gây ra kết quả lạ"
+msgstr "rshift(%lf, %lf): giá trị âm sẽ gây ra kết quả lạ"
 
-#: builtin.c:2763
+#: builtin.c:2814
 #, c-format
 msgid "rshift(%lf, %lf): fractional values will be truncated"
-msgstr "rshift(%lf, %lf): giá trị thuộc phân số thì sẽ bị cắt xén"
+msgstr "rshift(%lf, %lf): giá trị thuộc phân số sẽ bị xén ngắn"
 
-#: builtin.c:2765
+#: builtin.c:2816
 #, c-format
 msgid "rshift(%lf, %lf): too large shift value will give strange results"
-msgstr "rshift(%lf, %lf): giá trị dịch quá lớn thì sẽ gây ra kết quả lạ"
+msgstr "rshift(%lf, %lf): giá trị dịch quá lớn sẽ gây ra kết quả lạ"
 
-#: builtin.c:2791
+#: builtin.c:2842
 msgid "and: received non-numeric first argument"
 msgstr "and: (và) đã nhận đối số đầu không phải thuộc số"
 
-#: builtin.c:2793
+#: builtin.c:2844
 msgid "and: received non-numeric second argument"
-msgstr "and: (và) đã nhận đối số thứ hai không phải thuộc số"
+msgstr "and: (và) đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:2799
+#: builtin.c:2850
 #, c-format
 msgid "and(%lf, %lf): negative values will give strange results"
-msgstr "and(%lf, %lf): (và) giá trị âm thì sẽ gây ra kết quả lạ"
+msgstr "and(%lf, %lf): (và) giá trị âm sẽ gây ra kết quả lạ"
 
-#: builtin.c:2801
+#: builtin.c:2852
 #, c-format
 msgid "and(%lf, %lf): fractional values will be truncated"
-msgstr "and(%lf, %lf): (và) giá trị thuộc phân số thì sẽ bị cắt xén"
+msgstr "and(%lf, %lf): (và) giá trị thuộc phân số sẽ bị xén ngắn"
 
-#: builtin.c:2827
+#: builtin.c:2878
 msgid "or: received non-numeric first argument"
 msgstr "or: (hoặc) đã nhận đối số đầu không phải thuộc số"
 
-#: builtin.c:2829
+#: builtin.c:2880
 msgid "or: received non-numeric second argument"
-msgstr "or: (hoặc) đã nhận đối số thứ hai không phải thuộc số"
+msgstr "or: (hoặc) đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:2835
+#: builtin.c:2886
 #, c-format
 msgid "or(%lf, %lf): negative values will give strange results"
-msgstr "or(%lf, %lf): (hoặc) giá trị âm thì sẽ gây ra kết quả lạ"
+msgstr "or(%lf, %lf): (hoặc) giá trị âm sẽ gây ra kết quả lạ"
 
-#: builtin.c:2837
+#: builtin.c:2888
 #, c-format
 msgid "or(%lf, %lf): fractional values will be truncated"
-msgstr "or(%lf, %lf): (hoặc) giá trị thuộc phân số thì sẽ bị cắt xén"
+msgstr "or(%lf, %lf): (hoặc) giá trị thuộc phân số sẽ bị xén ngắn"
 
-#: builtin.c:2863
+#: builtin.c:2914
 msgid "xor: received non-numeric first argument"
-msgstr "xor: (không hoặc) đã nhận đối số đầu không phải thuộc số"
+msgstr "xor: (không hoặc) đã nhận đối số thứ nhất khác thuộc số"
 
-#: builtin.c:2865
+#: builtin.c:2916
 msgid "xor: received non-numeric second argument"
-msgstr "xor: (không hoặc) đã nhận đối số thứ hai không phải thuộc số"
+msgstr "xor: đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:2871
+#: builtin.c:2922
 #, c-format
 msgid "xor(%lf, %lf): negative values will give strange results"
-msgstr "xor(%lf, %lf): (không hoặc) giá trị âm thì sẽ gây ra kết quả lạ"
+msgstr "xor(%lf, %lf): (không hoặc) giá trị âm sẽ gây ra kết quả lạ"
 
-#: builtin.c:2873
+#: builtin.c:2924
 #, c-format
 msgid "xor(%lf, %lf): fractional values will be truncated"
-msgstr "xor(%lf, %lf): (không hoặc) giá trị thuộc phân số thì sẽ bị cắt xén"
+msgstr "xor(%lf, %lf): (không hoặc) giá trị thuộc phân số sẽ bị xén ngắn"
 
-#: builtin.c:2897
+#: builtin.c:2948
 msgid "compl: received non-numeric argument"
-msgstr "compl: (biên dịch) đã nhận đối số không phải thuộc số"
+msgstr "compl: (biên dịch) đã nhận đối số khác thuộc số"
 
-#: builtin.c:2903
+#: builtin.c:2954
 #, c-format
 msgid "compl(%lf): negative value will give strange results"
-msgstr "compl(%lf): (biên dịch) giá trị âm thì sẽ gây ra kết quả lạ"
+msgstr "compl(%lf): (biên dịch) giá trị âm sẽ gây ra kết quả lạ"
 
-#: builtin.c:2905
+#: builtin.c:2956
 #, c-format
 msgid "compl(%lf): fractional value will be truncated"
-msgstr "compl(%lf): (biên dịch) giá trị thuộc phân số thì sẽ bị cắt xén"
+msgstr "compl(%lf): (biên dịch) giá trị thuộc phân số se bị xén ngắn"
 
-#: builtin.c:3078
+#: builtin.c:3129
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: «%s» không phải là một phân loại mi�n địa phương hợp lệ"
@@ -783,76 +799,76 @@ msgstr "dcgettext: «%s» không phải là má»™t phân loại miá»�n địa phÆ
 #: eval.c:303
 #, c-format
 msgid "unknown nodetype %d"
-msgstr "không biết kiểu nút «%d»"
+msgstr "không biết kiểu nút %d"
 
 #: eval.c:353
 msgid "buffer overflow in genflags2str"
-msgstr "vùng đệm vượt quá trong «genflags2str» (tạo ra c� đến chuỗi)"
+msgstr "tràn bộ đệm trong « genflags2str » (tạo ra c� đến chuỗi)"
 
-#: eval.c:385 eval.c:391 profile.c:838
+#: eval.c:385 eval.c:391 profile.c:817
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
-msgstr "cố dùng mảng «%s» trong một ngữ cảnh vô hướng"
+msgstr "cố gắng dùng mảng « %s » trong một ngữ cảnh vô hướng"
 
 #: eval.c:733
 #, c-format
 msgid "for loop: array `%s' changed size from %ld to %ld during loop execution"
 msgstr ""
-"for loop: (cho vòng lặp) mảng «%s» đã thay đổi kích thước từ «%ld» đến «%ld» "
+"cho loop: (cho vòng lặp) mảng « %s » đã thay đổi kích thước từ %ld đến %ld "
 "trong khi thực hiện vòng lặp"
 
 #: eval.c:754
 msgid "`break' outside a loop is not portable"
-msgstr "không thể mang «break» (ngắt) ở ngoại một vòng lặp"
+msgstr "không thể mang khả năng « break » (ngắt) nằm ở ngoại vòng lặp"
 
 #: eval.c:758
 msgid "`break' outside a loop is not allowed"
-msgstr "không cho phép «break» (ngắt) ở ngoại một vòng lặp"
+msgstr "không cho phép « break » (ngắt) nằm ở ngoại vòng lặp"
 
 #: eval.c:775
 msgid "`continue' outside a loop is not portable"
-msgstr "không thể mang «continue» (tiếp tục) ở ngoại một vòng lặp"
+msgstr "không thể mang khả năng « continue » (tiếp tục) nằm ở ngoại vòng lặp"
 
 #: eval.c:779
 msgid "`continue' outside a loop is not allowed"
-msgstr "không cho phép «continue» (tiếp tục) ở ngoại một vòng lặp"
+msgstr "không cho phép « continue » (tiếp tục) nằm ở ngoại vòng lặp"
 
 #: eval.c:813
 msgid "`next' cannot be called from a BEGIN rule"
-msgstr "không g�i được «next» (kế tiếp) từ một quy tắc «BEGIN» (bắt đầu)"
+msgstr "không thể g�i « next » (kế tiếp) từ quy tắc « BEGIN » (bắt đầu)"
 
 #: eval.c:815
 msgid "`next' cannot be called from an END rule"
-msgstr "không g�i được «next» (kế tiếp) từ một quy tắc «END» kết thức)"
+msgstr "không thể g�i « next » (kế tiếp) từ quy tắc « END » kết thúc)"
 
 #: eval.c:824
 msgid "`nextfile' cannot be called from a BEGIN rule"
 msgstr ""
-"không g�i được «nextfile» (tập tin kế tiếp) từ một quy tắc «BEGIN» (bắt đầu)"
+"không thể g�i « nextfile » (tập tin kế tiếp) từ quy tắc « BEGIN » (bắt đầu)"
 
 #: eval.c:826
 msgid "`nextfile' cannot be called from an END rule"
 msgstr ""
-"không g�i được «nextfile» (tập tin kế tiếp) từ một quy tắc «END» kết thức)"
+"không thể g�i « nextfile » (tập tin kế tiếp) từ quy tắc « END » kết thúc)"
 
 #: eval.c:875
 msgid "statement has no effect"
 msgstr "câu không có tác dụng"
 
-#: eval.c:952 eval.c:1893
+#: eval.c:952 eval.c:1895
 #, c-format
 msgid "can't use function name `%s' as variable or array"
-msgstr "không thể dùng tên chức năng «%s» với là biến hay mảng"
+msgstr "không thể dùng tên chức năng « %s » như là biến hay mảng"
 
 #: eval.c:959 eval.c:965
 #, c-format
 msgid "reference to uninitialized argument `%s'"
-msgstr "tham chiếu đến đối số chưa khởi động «%s»"
+msgstr "gặp tham chiếu đến đối số chưa được sở khởi « %s »"
 
-#: eval.c:974 eval.c:1902
+#: eval.c:974 eval.c:1904
 #, c-format
 msgid "reference to uninitialized variable `%s'"
-msgstr "tham chiếu đến biến chưa khởi động «%s»"
+msgstr "gặp tham chiếu đến biến chưa được sở khởi « %s »"
 
 #: eval.c:1120
 msgid ""
@@ -860,46 +876,46 @@ msgid ""
 "another!"
 msgstr ""
 "concatenation: (nối chuỗi) hiệu ứng khác trong một biểu thức nào đó đã thay "
-"đổi độ dài của một biểu thức khác."
+"đổi độ dài của một biểu thức khác !"
 
-#: eval.c:1200
+#: eval.c:1202
 msgid "assignment used in conditional context"
-msgstr "đã dùng đi�u gán trong ngữ cảnh chỉ đi�u kiện"
+msgstr "đi�u gán được dùng trong ngữ cảnh đi�u kiện"
 
-#: eval.c:1278
+#: eval.c:1280
 msgid "division by zero attempted"
-msgstr "cố chia cho số không"
+msgstr "cố gắng chia cho số không"
 
-#: eval.c:1293
+#: eval.c:1295
 #, c-format
 msgid "division by zero attempted in `%%'"
-msgstr "cố chia cho số không trong «%%»"
+msgstr "cố gắng chia cho số không trong « %% »"
 
-#: eval.c:1308 profile.c:714
+#: eval.c:1310 profile.c:693
 #, c-format
 msgid "illegal type (%s) in tree_eval"
-msgstr "không cho phép kiểu (%s) trong «tree_eval» (ước lượng cây)"
+msgstr "không cho phép kiểu (%s) trong « tree_eval » (ước lượng cây)"
 
-#: eval.c:1471
+#: eval.c:1473
 msgid "division by zero attempted in `/='"
-msgstr "cố chia cho số không trong «/=»"
+msgstr "cố gắng chia cho số không trong « /= »"
 
-#: eval.c:1493
+#: eval.c:1495
 #, c-format
 msgid "division by zero attempted in `%%='"
-msgstr "cố chia cho số không trong «%%=»"
+msgstr "cố gắng chia cho số không trong « %%= »"
 
-#: eval.c:1758
+#: eval.c:1760
 #, c-format
 msgid "function `%s' called with more arguments than declared"
-msgstr "đã g�i chức năng «%s» với nhi�u đối số hơn được tuyên bố"
+msgstr "chức năng « %s » được g�i với số đối số hơn số được tuyên bố"
 
-#: eval.c:1802
+#: eval.c:1804
 #, c-format
 msgid "function `%s' not defined"
-msgstr "chưa định nghĩa chức năng «%s»"
+msgstr "chưa xác định chức năng « %s »"
 
-#: eval.c:1865
+#: eval.c:1867
 #, c-format
 msgid ""
 "\n"
@@ -910,725 +926,740 @@ msgstr ""
 "\t# �ống g�i chức năng:\n"
 "\n"
 
-#: eval.c:1868
+#: eval.c:1870
 #, c-format
 msgid "\t# -- main --\n"
 msgstr ""
 "\t# -- main --\n"
 "(chính)\n"
 
-#: eval.c:2023
+#: eval.c:2025
 msgid "attempt to field reference from non-numeric value"
-msgstr "cố tham chiếu trư�ng từ giá trị không thuộc số"
+msgstr "cố gắng tham chiếu trư�ng từ giá trị khác thuộc số"
 
-#: eval.c:2025
+#: eval.c:2027
 msgid "attempt to reference from null string"
 msgstr "cố tham chiếu từ chuỗi vô giá trị"
 
-#: eval.c:2031
+#: eval.c:2033
 #, c-format
 msgid "attempt to access field %d"
-msgstr "cố truy cập trư�ng «%d»"
+msgstr "cố gắng truy cập trư�ng %d"
 
-#: eval.c:2052 eval.c:2059 profile.c:935
+#: eval.c:2054 eval.c:2061 profile.c:914
 msgid "assignment is not allowed to result of builtin function"
-msgstr "không cho phép gán cho kết quả của chức năng «builtin» (có sẵn)"
+msgstr "không cho phép gán cho kết quả của chức năng « builtin » (có sẵn)"
 
-#: eval.c:2123
+#: eval.c:2125
 msgid "`IGNORECASE' is a gawk extension"
-msgstr "«IGNORECASE» (b� qua chữ hoa/thư�ng) là một phần mở rộng gawk"
+msgstr "« IGNORECASE » (b� qua chữ hoa/thư�ng) là phần mở rộng gawk"
 
-#: eval.c:2153
+#: eval.c:2155
 msgid "`BINMODE' is a gawk extension"
-msgstr "«BINMODE» (chế độ nhị phân) là một phần mở rộng gawk"
+msgstr "« BINMODE » (chế độ nhị phân) là phần mở rộng gawk"
 
-#: eval.c:2275
+#: eval.c:2277
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
-msgstr "đi�u ghi rõ «%s» «%sFMT» sai"
+msgstr "đặc tả « %sFMT » sai « %s »"
 
-#: eval.c:2353
+#: eval.c:2355
 msgid "turning off `--lint' due to assignment to `LINT'"
-msgstr "đang tắt «--lint» vì gán cho «LINT»"
+msgstr "đang tắt « --lint » do việc gán cho « LINT »"
 
-#: ext.c:60 ext.c:64
+#: ext.c:62 ext.c:67
 msgid "`extension' is a gawk extension"
-msgstr "«extension» là một phần mở rộng gawk"
+msgstr "« extension » là một phần mở rộng gawk"
 
-#: ext.c:74
+#: ext.c:77
 #, c-format
 msgid "extension: cannot open `%s' (%s)\n"
-msgstr "extension: (phần mở rộng) không mở được «%s» (%s)\n"
+msgstr "extension: (phần mở rộng) không thể mở « %s » (%s)\n"
 
-#: ext.c:82
+#: ext.c:85
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
-"extension: (phần mở rộng) thư viên «%s»: không g�i được chức năng «%s» (%s)\n"
+"extension: (phần mở rộng) thư viện « %s »: không thể g�i chức năng « %s » (%"
+"s)\n"
 
-#: ext.c:102
+#: ext.c:105
 msgid "extension: missing function name"
-msgstr "extension: (phần mở rộng) thiếu tên chức năng"
+msgstr "extension: (phần mở rộng) tên chức năng còn thiếu"
 
-#: ext.c:107
+#: ext.c:110
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr ""
-"extension: (phần mở rộng) không cho phép ký tự «%c» trong tên chức năng «%s»"
+"extension: (phần mở rộng) gặp ký tự cấm « %c » nằm trong tên chức năng « %s »"
 
-#: ext.c:113
+#: ext.c:116
 #, c-format
 msgid "extension: can't redefine function `%s'"
-msgstr "extension: (phần mở rộng) không thể định nghĩa lại chức nắng «%s»"
+msgstr "extension: (phần mở rộng) không thể xác định lại chức năng « %s »"
 
-#: ext.c:117
+#: ext.c:120
 #, c-format
 msgid "extension: function `%s' already defined"
-msgstr "extension: (phần mở rộng) đã định nghĩa chức năng «%s» rồi"
+msgstr "extension: (phần mở rộng) chức năng « %s » đã được xác định"
 
-#: ext.c:122
+#: ext.c:125
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
-"extension: (phần mở rộng) không thể dùng «%s» có sẵn gawk là tên chức năng"
+"extension: (phần mở rộng) không thể dùng đi�u có sẵn của gawk « %s » như là "
+"tên chức năng"
 
-#: ext.c:124
+#: ext.c:127
 #, c-format
 msgid "extension: function name `%s' previously defined"
-msgstr "extension: (phần mở rộng) tên chức năng «%s» được định nghĩa trước"
+msgstr "tên chức năng « %s » đã được xác định trước"
 
-#: ext.c:201
+#: ext.c:204
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
-msgstr "chức năng «%s» được định nghĩa để chấp nhận nhi�u nhất «%d» đối số"
+msgstr "chức năng « %s » được xác định để chấp nhấn %d đối số tối đa"
 
-#: ext.c:204
+#: ext.c:207
 #, c-format
 msgid "function `%s': missing argument #%d"
-msgstr "chức năng «%s» thiếu đối số «#%d»"
+msgstr "chức năng « %s » còn thiếu đối số thứ %d"
 
-#: ext.c:214
+#: ext.c:217
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
-msgstr "chức năng «%s»: đối số «#%d»: cố dùng đi�u vô hướng là một mảng"
+msgstr ""
+"chức năng « %s »: đối số thứ %d: cố gắng dùng đi�u vô hướng như là mảng"
 
-#: ext.c:218
+#: ext.c:221
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
-msgstr "chức năng «%s»: đối số «#%d»: cố dùng mảng là một đi�u vô hướng"
+msgstr ""
+"chức năng « %s »: đối số thứ %d: cố gắng dùng mảng như là đi�u vô hướng"
 
-#: ext.c:243
+#: ext.c:246
 msgid "Operation Not Supported"
-msgstr "Không hỗ trợ thao tác ấy"
+msgstr "Thao tác không được hỗ trợ"
 
-#: field.c:326
+#: field.c:330
 msgid "NF set to negative value"
-msgstr "đã lập «NF» là giá trị âm"
+msgstr "« NF » được đặt thành giá trị âm"
 
-#: field.c:819
+#: field.c:823
 msgid "split: second argument is not an array"
-msgstr "split: (chia tách) đối số thứ hai không phải là một mảng"
+msgstr "split: (chia tách) đối số thứ hai không phải là mảng"
 
-#: field.c:853
+#: field.c:857
 msgid "split: null string for third arg is a gawk extension"
 msgstr ""
-"split: (chia tách) chuỗi vô giá trị cho đối số thứ ba là một phần mở rộng "
-"gawk"
+"split: (chia tách) chuỗi vô giá trị cho đối số thứ ba là phần mở rộng gawk"
 
-#: field.c:905
+#: field.c:909
 msgid "`FIELDWIDTHS' is a gawk extension"
-msgstr "«FIELDWIDTHS» (độ rộng trư�ng) là một phần mở rộng gawk"
+msgstr "« FIELDWIDTHS » (độ rộng trư�ng) là phần mở rộng gawk"
 
-#: field.c:935 field.c:946
+#: field.c:939 field.c:953
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
-msgstr "Giá trị «FIELDWIDTHS» (độ rộng trư�ng) không hợp lệ, gần «%s»"
+msgstr "giá trị FIELDWIDTHS (độ rộng trư�ng) không hợp lệ, gần « %s »"
 
-#: field.c:1027
+#: field.c:1036
 msgid "null string for `FS' is a gawk extension"
-msgstr "chuỗi vô giá trị cho «FS» là một phần mở rộng gawk"
+msgstr "chuỗi vô giá trị cho « FS » là phần mở rộng gawk"
 
-#: getopt.c:571 getopt.c:590
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "awk cũ không hỗ trợ biểu thức chính quy làm giá trị của « FS »"
+
+#: getopt.c:571 getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tùy ch�n «%s» là mơ hồ\n"
+msgstr "%s: tùy ch�n « %s » là mơ hồ\n"
 
-#: getopt.c:623 getopt.c:627
+#: getopt.c:620 getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: tùy ch�n «--%s» không cho phép đối số\n"
+msgstr "%s: tùy ch�n « --%s » không cho phép đối số\n"
 
-#: getopt.c:636 getopt.c:641
+#: getopt.c:633 getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: tùy ch�n «%c%s» không cho phép đối số\n"
+msgstr "%s: tùy ch�n « %c%s » không cho phép đối số\n"
 
-#: getopt.c:687 getopt.c:709 getopt.c:1040 getopt.c:1062
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy ch�n «%s» cần đến đối số\n"
 
-#: getopt.c:747 getopt.c:750
+#: getopt.c:738 getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: không chấp nhận tùy ch�n «--%s»\n"
+msgstr "%s: không nhận diện tùy ch�n « --%s »\n"
 
-#: getopt.c:758 getopt.c:761
+#: getopt.c:749 getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: không chấp nhận tùy ch�n «%c%s»\n"
+msgstr "%s: không nhận diện tùy ch�n « %c%s »\n"
 
-#: getopt.c:816 getopt.c:819
+#: getopt.c:804 getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: không cho phép tùy ch�n «-- %c»\n"
+msgstr "%s: không cho phép tùy ch�n « -- %c »\n"
 
-#: getopt.c:825 getopt.c:828
+#: getopt.c:813 getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: tùy ch�n không hợp lệ «-- %c»\n"
+msgstr "%s: tùy ch�n không hợp lệ « -- %c »\n"
 
-#: getopt.c:883 getopt.c:902 getopt.c:1115 getopt.c:1136 main.c:448
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: tùy ch�n cần đến đối số «-- %c»\n"
+msgstr "%s: tùy ch�n cần đến đối số « -- %c »\n"
 
-#: getopt.c:955 getopt.c:974
+#: getopt.c:937 getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: tùy ch�n «-W %s» là mơ hồ\n"
+msgstr "%s: tùy ch�n « -W %s » là mơ hồ\n"
 
-#: getopt.c:998 getopt.c:1019
+#: getopt.c:977 getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: tùy ch�n «-W %s» không cho phép đối số\n"
 
-#: io.c:307
+#: io.c:345
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "không mở được tập tin «%s» để ghi (%s)"
 
-#: io.c:398
+#: io.c:436
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
-msgstr "đóng «fd %d» («%s») thất bại (%s)"
+msgstr "lỗi đóng « fd %d » (« %s ») (%s)"
 
-#: io.c:536
+#: io.c:575
 #, c-format
 msgid "invalid tree type %s in redirect()"
-msgstr "kiểu cây không hợp lệ «%s» trong «redirect()»"
+msgstr "kiểu cây không hợp lệ « %s » trong « redirect() »"
 
-#: io.c:542
+#: io.c:581
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
-msgstr "biểu thức trong đi�u chuyển hướng «%s» chỉ có giá trị thuộc số"
+msgstr "biểu thức trong đi�u chuyển hướng « %s » chỉ có giá trị thuộc số"
 
-#: io.c:548
+#: io.c:587
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "biểu thức cho đi�u chuyển hướng «%s» có giá trị chuỗi vô giá trị"
 
-#: io.c:553
+#: io.c:592
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "tên tập tin «%s» cho đi�u chuyển hướng «%s» có lẽ là kết quả của biểu thức "
 "luận lý"
 
-#: io.c:591
+#: io.c:630
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
-msgstr "không cần hợp «>» vào «>>» cho tập tin «%.*s»"
+msgstr "không cần hợp « > » và « >> » cho tập tin « %.*s »"
 
-#: io.c:643
+#: io.c:682
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
-msgstr "không mở được ống dẫn «%s» để xuất (%s)"
+msgstr "không thể mở ống dẫn « %s » để xuất (%s)"
 
-#: io.c:652
+#: io.c:691
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
-msgstr "không mở được ống dẫn «%s» để gõ (%s)"
+msgstr "không thể mở ống dẫn « %s » để nhập (%s)"
+
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "tập tin « %s » là thư mục"
 
-#: io.c:665
+#: io.c:706
 #, c-format
 msgid "can't open two way socket `%s' for input/output (%s)"
-msgstr "không mở được ổ cắm hai chi�u «%s» để gõ/xuất (%s)"
+msgstr "không thể mở ổ cắm hai chi�u « %s » để nhập/xuất (%s)"
 
-#: io.c:669
+#: io.c:710
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
-msgstr "không mở được ống dẫn hai chi�u «%s» để gõ/xuất (%s)"
+msgstr "không thể mở ống dẫn hai chi�u « %s » để nhập/xuất (%s)"
 
-#: io.c:745
+#: io.c:786
 #, c-format
 msgid "can't redirect from `%s' (%s)"
-msgstr "không thể chuyển hướng từ «%s» (%s)"
+msgstr "không thể chuyển hướng từ « %s » (%s)"
 
-#: io.c:748
+#: io.c:789
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "không thể chuyển hướng đến «%s» (%s)"
 
-#: io.c:787
+#: io.c:828
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
-"đã gặp giới hạn hệ thống cho tập tin đang mở nên bắt đầu phối hợp nhi�u dòng "
-"đi�u diễn tả tâp tin"
+"đã tới giới hạn hệ thống v� tập tin được mở nên bắt đầu phối hợp nhi�u dòng "
+"đi�u mô tả tập tin"
 
-#: io.c:803
+#: io.c:844
 #, c-format
 msgid "close of `%s' failed (%s)."
-msgstr "đóng «%s» thất bại (%s)"
+msgstr "lỗi đóng « %s » (%s)"
 
-#: io.c:811
+#: io.c:852
 msgid "too many pipes or input files open"
-msgstr "quá nhi�u ống dẫn hay tập tin gõ đang mở"
+msgstr "quá nhi�u ống dẫn hay tập tin nhập được mở"
 
-#: io.c:834
+#: io.c:875
 msgid "close: second argument must be `to' or `from'"
-msgstr "close: (đóng) đối số thứ hai phải là «to» (đến) hay «from» (từ)"
+msgstr "close: (đóng) đối số thứ hai phải là « to » (đến) hay « from » (từ)"
 
-#: io.c:848
+#: io.c:889
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
-"close: (đóng) «%.*s» không phải là một tập tin đang mở, một ống dẫn hay tiến "
-"trình với nhau"
+"close: (đóng) « %.*s » không phải là tập tin được mở, ống dẫn hay tiến trình "
+"vá»›i nhau"
 
-#: io.c:852
+#: io.c:893
 msgid "close of redirection that was never opened"
-msgstr "đã đóng đi�u chuyển hướng chưa mở"
+msgstr "việc đóng đi�u chuyển hướng chưa mở"
 
-#: io.c:948
+#: io.c:989
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
-"close: (đóng) đi�u chuyển hướng «%s» không do «|&» mở nên đối số thứ hai bị "
-"b� qua"
+"close: (đóng) đi�u chuyển hướng « %s » không được mở bởi « |& » nên đối số "
+"thứ hai bị b� qua"
 
-#: io.c:964
+#: io.c:1005
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "trạng thái thất bại (%d) khi đóng ống dẫn «%s» (%s)"
 
-#: io.c:967
+#: io.c:1008
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "trạng thái thất bại (%d) khi đóng tập tin «%s» (%s)"
 
-#: io.c:987
+#: io.c:1028
 #, c-format
 msgid "no explicit close of socket `%s' provided"
-msgstr "chưa cung cấp đi�u đóng ổ cắm «%s» dứt khoát"
+msgstr "không có việc đóng dứt khoát ổ cắm « %s » được cung cấp"
 
-#: io.c:990
+#: io.c:1031
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
-msgstr "chưa cung cấp đi�u đóng tiến trình với nhau «%s» dứt khoát"
+msgstr "không có việc đóng dứt khoát đồng tiến trình « %s » được cung cấp"
 
-#: io.c:993
+#: io.c:1034
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
-msgstr "chưa cung cấp đi�u đóng ống dẫn «%s» dứt khoát"
+msgstr "không có việc đóng dứt khoát ống dẫn « %s » được cung cấp"
 
-#: io.c:996
+#: io.c:1037
 #, c-format
 msgid "no explicit close of file `%s' provided"
-msgstr "chưa cung cấp đi�u đóng tập tin «%s» dứt khoát"
+msgstr "không có việc đóng dứt khoát tập tin « %s » được cung cấp"
 
-#: io.c:1025 io.c:1080 main.c:718 main.c:756
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "gặp lỗi khi ghi thiết bị xụất chuẩn (%s)"
 
-#: io.c:1029 io.c:1085
+#: io.c:1070 io.c:1126
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "gặp lỗi khi ghi thiết bị lỗi chuẩn (%s)"
 
-#: io.c:1037
+#: io.c:1078
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
-msgstr "xóa sạch ống dẫn «%s» thất bại (%s)"
+msgstr "lỗi xóa sạch ống dẫn « %s » (%s)"
 
-#: io.c:1040
+#: io.c:1081
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
-msgstr "xóa sạch ống dẫn đồng tiến trình đến «%s» thất bại (%s)"
+msgstr "lỗi xóa sạch ống dẫn đồng tiến trình đến « %s » (%s)"
 
-#: io.c:1043
+#: io.c:1084
 #, c-format
 msgid "file flush of `%s' failed (%s)."
-msgstr "xóa sạch tập tin «%s» thất bại (%s)"
+msgstr "lỗi xóa sạch tập tin « %s » (%s)"
+
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "cổng cục bộ %s không hợp lệ trong « /inet »"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr "thông tin v� máy/cổng ở xa (%s, %s) không phải hợp lệ"
 
-#: io.c:1205
+#: io.c:1250
 msgid "/inet/raw client not ready yet, sorry"
-msgstr "tiếc là trình khách «/inet/raw» chưa sẵn sàng"
+msgstr "tiếc là ứng dụng khách <inet/raw> chưa sẵn sàng"
 
-#: io.c:1207 io.c:1244
+#: io.c:1253 io.c:1289
 msgid "only root may use `/inet/raw'."
-msgstr "chỉ ngư�i chủ (root) có thể sử dụng «/inet/raw» thôi"
+msgstr "chỉ ngư�i chủ (root) có thể dùng </inet/raw> thôi"
 
-#: io.c:1242
+#: io.c:1287
 msgid "/inet/raw server not ready yet, sorry"
-msgstr "tiếc là trình phục vụ «/inet/raw» chưa sẵn sàng"
+msgstr "tiếc là trình phục vụ </inet/raw> chưa sẵn sàng"
 
-#: io.c:1332
+#: io.c:1385
 #, c-format
 msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "trong tên tập tin đặc biệt «%s» không cung cấp giao thức (đã biết) nào"
+msgstr ""
+"trong tên tập tin đặc biệt « %s » không cung cấp giao thức (đã biết) nào"
 
-#: io.c:1350
+#: io.c:1399
 #, c-format
 msgid "special file name `%s' is incomplete"
-msgstr "tên tập tin đặc biệt «%s» chưa xong"
-
-#: io.c:1362
-#, c-format
-msgid "local port invalid in `%s'"
-msgstr "trong «%s» cổng địa phương không hợp lệ"
+msgstr "tên tập tin đặc biệt « %s » chưa xong"
 
-#: io.c:1374
+#: io.c:1414
 msgid "must supply a remote hostname to `/inet'"
-msgstr "phải cung cấp một tên máy từ xa cho «/inet»"
+msgstr "phải cung cấp một tên máy từ xa cho </inet>"
 
-#: io.c:1389
+#: io.c:1432
 msgid "must supply a remote port to `/inet'"
-msgstr "phải cung cấp một cổng từ xa cho «/inet»"
+msgstr "phải cung cấp một cổng từ xa cho </inet>"
 
-#: io.c:1395
-#, c-format
-msgid "remote port invalid in `%s'"
-msgstr "trong «%s» cổng từ xa không hợp lệ"
-
-#: io.c:1405
+#: io.c:1439
 msgid "TCP/IP communications are not supported"
-msgstr "không hỗ trợ truy�n thông TCP/IP"
+msgstr "truy�n thông TCP/IP không được hỗ trợ"
 
-#: io.c:1414 io.c:1595
-#, c-format
-msgid "file `%s' is a directory"
-msgstr "tập tin «%s» là một thư mục"
-
-#: io.c:1484
+#: io.c:1509
 #, c-format
 msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
-msgstr "hãy dùng «PROCINFO[\"%s\"]» (thông tin tiến trình) thay vào «%s»"
+msgstr "hãy dùng « PROCINFO[\"%s\"] » (thông tin tiến trình) thay cho « %s »"
 
-#: io.c:1516
+#: io.c:1547
 msgid "use `PROCINFO[...]' instead of `/dev/user'"
-msgstr "hãy dùng «PROCINFO[...]» (thông tin tiến trình) thay vào «/dev/user»"
+msgstr "hãy dùng « PROCINFO[...] » (thông tin tiến trình) thay cho </dev/user>"
 
-#: io.c:1581 io.c:1763
+#: io.c:1612 io.c:1798
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "không mở được «%s», chế độ «%s»"
 
-#: io.c:1814
+#: io.c:1849
 #, c-format
 msgid "close of master pty failed (%s)"
-msgstr "đóng pty cái thất bại (%s)"
+msgstr "lỗi đóng pty (tài sản?) chính (%s)"
 
-#: io.c:1816 io.c:1968 io.c:2119
+#: io.c:1851 io.c:2003 io.c:2154
 #, c-format
 msgid "close of stdout in child failed (%s)"
-msgstr "đóng thiết bị xuất chuẩn trong tiến trình con thất bại (%s)"
+msgstr "lỗi đóng thiết bị xuất chuẩn trong tiến trình con (%s)"
 
-#: io.c:1819
+#: io.c:1854
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
-"di chuyển pty phụ đến thiết bị xuất chuẩn thất bại trong tiến trình con "
-"(dup: %s) (nhân đôi)"
+"lỗi di chuyển pty (tài sản?) phụ tới thiết bị xuất chuẩn trong đi�u con "
+"(nhân đôi: %s)"
 
-#: io.c:1821 io.c:1973
+#: io.c:1856 io.c:2008
 #, c-format
 msgid "close of stdin in child failed (%s)"
-msgstr "đóng thiết bị gõ chuẩn trong tiến trình con thất bại (%s)"
+msgstr "lỗi đóng thiết bị nhập chuẩn trong tiến trình con (%s)"
 
-#: io.c:1824
+#: io.c:1859
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
-"di chuyển đi�u phụ đến thiết bị gõ chuẩn thất bại trong tiến trình con (dup: "
-"%s) (nhân đôi)"
+"lỗi di chuyển pty (tài sản?) phụ tới thiết bị nhập chuẩn trong đi�u con "
+"(nhân đôi: %s)"
 
-#: io.c:1826 io.c:1845
+#: io.c:1861 io.c:1880
 #, c-format
 msgid "close of slave pty failed (%s)"
-msgstr "đóng đi�u phụ thất bại (%s)"
+msgstr "lỗi đóng pty (tài sản?) phụ (%s)"
 
-#: io.c:1919 io.c:1971 io.c:2100 io.c:2122
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
-"di chuyển ống dẫn đến thiết bị xuất chuẩn thất bại trong tiến trình con "
-"(dup: %s) (nhân đôi)"
+"lỗi di chuyển ống dẫn đến thiết bị xuất chuẩn trong tiến trình con (dup: %s) "
+"(nhân đôi)"
 
-#: io.c:1923 io.c:1976
+#: io.c:1958 io.c:2011
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
-"di chuyển ống dẫn đến thiết bị gõ chuẩn thất bại trong tiến trình con (dup: %"
-"s) (nhân đôi)"
+"lỗi di chuyển ống dẫn đến thiết bị nhập chuẩn trong tiến trình con (dup: %s) "
+"(nhân đôi)"
 
-#: io.c:1940 io.c:2113
+#: io.c:1975 io.c:2148
 msgid "restoring stdout in parent process failed\n"
-msgstr "phục hồi thiết bị xuất chuẩn trong tiến trình mẹ thất bại\n"
+msgstr "lỗi phục hồi thiết bị xuất chuẩn trong tiến trình mẹ\n"
 
-#: io.c:1945
+#: io.c:1980
 msgid "restoring stdin in parent process failed\n"
-msgstr "phục hồi thiết bị gõ chuẩn trong tiến trình mẹ thất bại\n"
+msgstr "lỗi phục hồi thiết bị nhập chuẩn trong tiến trình mẹ\n"
 
-#: io.c:1979 io.c:2124 io.c:2135
+#: io.c:2014 io.c:2159 io.c:2170
 #, c-format
 msgid "close of pipe failed (%s)"
-msgstr "đóng ống dẫn thất bại (%s)"
+msgstr "lỗi đóng ống dẫn (%s)"
 
-#: io.c:2024
+#: io.c:2059
 msgid "`|&' not supported"
-msgstr "không hỗ trợ «|&»"
+msgstr "« |& » không được hỗ trợ"
 
-#: io.c:2090
+#: io.c:2125
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
-msgstr "không mở được «%s» (%s)"
+msgstr "không thể mở ống dẫn « %s » (%s)"
 
-#: io.c:2131
+#: io.c:2166
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
-msgstr "không tạo được tiến trình con cho «%s» (fork: %s)"
+msgstr "không thể tạo tiến trình con cho « %s » (fork: %s)"
 
-#: io.c:2506
+#: io.c:2548
 #, c-format
 msgid "data file `%s' is empty"
-msgstr "tập tin dữ liệu «%s» là rỗng"
+msgstr "tập tin dữ liệu « %s » là rỗng"
 
-#: io.c:2547 io.c:2555
+#: io.c:2589 io.c:2597
 msgid "could not allocate more input memory"
-msgstr "không thể cấp phát bộ nhớ gõ nhi�u hơn"
+msgstr "không thể cấp phát bộ nhớ nhập thêm nữa"
 
-#: io.c:2919 io.c:2984
+#: io.c:2965 io.c:3038
 #, c-format
 msgid "error reading input file `%s': %s"
-msgstr "gặp lỗi khi đ�c tập tin gõ «%s»: %s"
+msgstr "gặp lỗi khi đ�c tập tin nhập « %s »: %s"
 
-#: io.c:3109
+#: io.c:3163
 msgid "multicharacter value of `RS' is a gawk extension"
-msgstr "giá trị đa ký tự của «RS» là một phần mở rộng gawk"
+msgstr "giá trị đa ký tự của « RS » là phần mở rộng gawk"
 
-#: main.c:338
+#: main.c:351
 msgid "`-m[fr]' option irrelevant in gawk"
-msgstr "«-m[fr]» tùy ch�n không thích đang trong gawk"
+msgstr "tùy ch�n « -m[fr] » không thích đang trong gawk"
 
-#: main.c:340
+#: main.c:353
 msgid "-m option usage: `-m[fr] nnn'"
-msgstr "cách sử dụng tùy ch�n «-m»: «-m[fr] nnn»"
+msgstr "cách sử dụng tùy ch�n «-m»: « -m[fr] nnn »"
 
-#: main.c:357
+#: main.c:370
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: tùy ch�n «-W %s» không được nhận diện nên bị b� qua\n"
+msgstr "%s: tùy ch�n « -W %s » không được nhận diện nên bị b� qua\n"
 
-#: main.c:394
+#: main.c:407
 msgid "empty argument to `--source' ignored"
-msgstr "đối số rỗng tới «--source» (nguồn) bị b� qua"
+msgstr "đối số rỗng tới « --source » (nguồn) bị b� qua"
 
-#: main.c:467
+#: main.c:480
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
-"đã lập biến môi trư�ng «POSIXLY_CORRECT» (đúng cách POSIX) thì đang bật tùy "
-"ch�n «--posix»"
+"biến môi trư�ng « POSIXLY_CORRECT » (đúng kiểu POSIX) đã được đặt; đang bật "
+"tùy ch�n « --posix »"
 
-#: main.c:472
+#: main.c:486
 msgid "`--posix' overrides `--traditional'"
-msgstr "tùy ch�n «--posix» đè «--traditional» (truy�n thống)"
+msgstr "tùy ch�n « --posix » có quy�n cao hơn « --traditional » (truy�n thống)"
 
-#: main.c:483
+#: main.c:497
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
-"«--posix»/«--traditional» (truy�n thống) đè «--non-decimal-data» (dữ liệu "
-"không phải thập phân)"
+"« --posix »/« --traditional » (truy�n thống) có quy�n cao hơn « --non-"
+"decimal-data » (dữ liệu khác thập phân)"
 
-#: main.c:487
+#: main.c:501
 #, c-format
 msgid "running %s setuid root may be a security problem"
-msgstr "chạy «%s» với tư cách «setuid root» thì có lẽ sẽ rủi r� bảo mật"
+msgstr "việc chạy %s với tư cách « setuid root » có thể rủi r� bảo mật"
 
-#: main.c:528
+#: main.c:542
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
-msgstr "không lập được chế độ nhị phân trên thiết bị gõ chuẩn (%s)"
+msgstr "không thể đặt chế độ nhị phân trên thiết bị nhập chuẩn (%s)"
 
-#: main.c:531
+#: main.c:545
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
-msgstr "không lập được chế độ nhị phân trên thiết bị xuất chuẩn (%s)"
+msgstr "không thể đặt chế độ nhị phân trên thiết bị xuất chuẩn (%s)"
 
-#: main.c:533
+#: main.c:547
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
-msgstr "không lập được chế độ nhị phân trên thiết bị lỗi chuẩn (%s)"
+msgstr "không thể đặt chế độ nhị phân trên thiết bị lỗi chuẩn (%s)"
 
-#: main.c:572
+#: main.c:586
 msgid "no program text at all!"
-msgstr "không có chữ chương trình nào cả!"
+msgstr "không có đoạn chữ chương trình nào cả !"
 
-#: main.c:665
+#: main.c:690
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Cách sử dụng: %s [tùy ch�n kiểu POSIX hay GNU] -f tập_tin_chương_trình [--] "
 "tập_tin ...\n"
 
-#: main.c:667
+#: main.c:692
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Cách sử dụng: %s [tùy ch�n kiểu POSIX hay GNU] [--] %cchương_trình%c "
 "tập_tin ...\n"
 
-#: main.c:672
+#: main.c:697
 msgid "POSIX options:\t\tGNU long options:\n"
 msgstr "tùy ch�n POSIX:\t\ttùy ch�n dài GNU:\n"
 
-#: main.c:673
+#: main.c:698
 msgid "\t-f progfile\t\t--file=progfile\n"
-msgstr "\t-f tập_tin_chương_trình\t\t--tập_tin=tập_tin_chương_trình\n"
+msgstr "\t-f tập_tin_chương_trình\t\t--file=tập_tin_chương_trình\n"
 
-#: main.c:674
+#: main.c:699
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
-msgstr "\t-F fs\t\t\t--field-separator=fs\t\tđi�u phân cách trư�ngs\n"
+msgstr "\t-F fs\t\t\t--field-separator=đi�u phân cách trư�ng\n"
 
-#: main.c:675
+#: main.c:700
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr ""
-"\t-v var=val\t\t--assign=var=val\n"
-"(var là viết tắt cho variable: biến\n"
-"val là viết tắt cho value: giá trị\n"
-"assign: gán)\n"
+"\t-v var=giá trị\t\t--assign=biến=giá_trị\n"
+"(assign: gán, var: biến)\n"
 
-#: main.c:676
+#: main.c:701
 msgid "\t-m[fr] val\n"
-msgstr "\t-m[fr] val\n"
+msgstr "\t-m[fr] giá_trị\n"
 
-#: main.c:677
+#: main.c:702
 msgid "\t-W compat\t\t--compat\n"
 msgstr ""
 "\t-W compat\t\t--compat\n"
 "(compat là viết tắt cho compatible: tương thích)\n"
 
-#: main.c:678
+#: main.c:703
 msgid "\t-W copyleft\t\t--copyleft\n"
 msgstr ""
 "\t-W copyleft\t\t--copyleft\n"
-"(sao chép trái)\n"
+"(tắc quy�n ngược)\n"
 
-#: main.c:679
+#: main.c:704
 msgid "\t-W copyright\t\t--copyright\n"
 msgstr ""
 "\t-W copyright\t\t--copyright\n"
-"(sao chép phải hoặc bản quy�n)\n"
+"(tác quy�n)\n"
 
-#: main.c:680
+#: main.c:705
 msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
 msgstr ""
 "\t-W dump-variables[=tập_tin]\t--dump-variables[=tập_tin]\n"
 "(đổ các biến)\n"
 
-#: main.c:681
+#: main.c:706
 msgid "\t-W exec=file\t\t--exec=file\n"
-msgstr "\t-W exec=file\t\t--exec=file\n"
+msgstr "\t-W exec=tập_tin\t\t--exec=tập_tin\n"
 
-#: main.c:682
+#: main.c:707
 msgid "\t-W gen-po\t\t--gen-po\n"
 msgstr ""
 "\t-W gen-po\t\t--gen-po\n"
 "(gen là viết tắt cho generate: tạo ra)\n"
 
-#: main.c:683
+#: main.c:708
 msgid "\t-W help\t\t\t--help\n"
 msgstr ""
 "\t-W help\t\t\t--help\n"
 "(trợ giúp)\n"
 
-#: main.c:684
+#: main.c:709
 msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 msgstr ""
 "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
 "(l? int là viết tắt cho integer: số nguyên\n"
 "fatal: nghiêm tr�ng)\n"
 
-#: main.c:685
+#: main.c:710
 msgid "\t-W lint-old\t\t--lint-old\n"
 msgstr ""
 "\t-W lint-old\t\t--lint-old\n"
 "(old: cũ)\n"
 
-#: main.c:686
+#: main.c:711
 msgid "\t-W non-decimal-data\t--non-decimal-data\n"
 msgstr ""
 "\t-W non-decimal-data\t--non-decimal-data\n"
-"(dữ liệu không phải thập phân)\n"
+"(dữ liệu khác thập phân)\n"
 
-#: main.c:688
+#: main.c:713
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr ""
 "\t-W nostalgia\t\t--nostalgia\n"
 "(nỗi luyến tiếc quá khứ)\n"
 
-#: main.c:691
+#: main.c:716
 msgid "\t-W parsedebug\t\t--parsedebug\n"
 msgstr ""
 "\t-W parsedebug\t\t--parsedebug\n"
 "(parse: phân tách\n"
 "debug: gỡ lỗi)\n"
 
-#: main.c:693
+#: main.c:718
 msgid "\t-W profile[=file]\t--profile[=file]\n"
 msgstr ""
 "\t-W profile[=tập_tin]\t--profile[=tập_tin]\n"
-"(profile: tiểu sử sơ lược)\n"
+"(profile: hồ sơ)\n"
 
-#: main.c:694
+#: main.c:719
 msgid "\t-W posix\t\t--posix\n"
 msgstr "\t-W posix\t\t--posix\n"
 
-#: main.c:695
+#: main.c:720
 msgid "\t-W re-interval\t\t--re-interval\n"
 msgstr ""
 "\t-W re-interval\t\t--re-interval\n"
 "(re-[động từ]: [làm] lại\n"
 "interval: th�i gian giữa hai lúc)\n"
 
-#: main.c:696
+#: main.c:721
 msgid "\t-W source=program-text\t--source=program-text\n"
 msgstr ""
 "\t-W source=program-text\t--source=program-text\n"
 "(source: nguồn\n"
-"program-text: các văn bản trong chương trình)\n"
+"program-text: đoạn chữ của chương trình)\n"
 
-#: main.c:697
+#: main.c:722
 msgid "\t-W traditional\t\t--traditional\n"
 msgstr ""
 "\t-W traditional\t\t--traditional\n"
 "(truy�n thống)\n"
 
-#: main.c:698
+#: main.c:723
 msgid "\t-W usage\t\t--usage\n"
 msgstr ""
 "\t-W usage\t\t--usage\n"
 "(cách sử dụng)\n"
 
-#: main.c:699
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
 msgid "\t-W version\t\t--version\n"
 msgstr ""
 "\t-W version\t\t--version\n"
 "(phiên bản)\n"
 
-#: main.c:703
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -1636,50 +1667,52 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"�ể thông báo lỗi, hãy xem phần «Bugs» (Lỗi) trong tập tin «gawk.info»\n"
-"trong phần «Reporting Problems and Bugs» (thông báo vấn đ� và lỗi)\n"
+"�ể thông báo lỗi, xem nút « Bugs » (lỗi) trong tập tin\n"
+"thông tin « gawk.info » mà nằm trong phần\n"
+"« Reporting Problems and Bugs » (thông báo vấn đ� và lỗi)\n"
 "trong bản in.\n"
+"\n"
 
-#: main.c:707
+#: main.c:738
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
-"gawk là một ngôn ngữ quét mẫu và xử lý.\n"
-"Mặc định là nó đ�c từ thiết bị gõ chuẩn và ghi vào thiết bị xuất chuẩn.\n"
+"gawk là ngôn ngữ quét và xử lý mẫu.\n"
+"Mặc định là nó đ�c thiết bị nhập chuẩn và ghi ra thiết bị xuất chuẩn.\n"
 "\n"
 
-#: main.c:711
+#: main.c:742
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
-"Thí dụ:\n"
+"Thí dụ :\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:731
+#: main.c:762
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 msgstr ""
-"Bản quy�n © 1989, 1991-%d Tổ chức Phần m�m Tự do.\n"
+"Tác quy�n © năm 1989, 1991-%d của Tổ chức Phần m�m Tự do.\n"
 "\n"
 "Chương trình này là phần m�m tự do; bạn có thể phân phối lại nó\n"
-"và/hay sửa đổi nó với đi�u kiện của Quy�n Công Chung GNU (GPL)\n"
-"như do Tổ chức Phần m�m Tự do xuất bản, hoặc phiên bản 2\n"
-"của Quy�n ấy, hoặc (tùy ch�n) bất cứ phiên bản sau nào.\n"
+"và/hay sửa đổi nó với đi�u kiện của Bản Quy�n Công Chung GNU (GPL)\n"
+"như do Tổ chức Phần m�m Tự do xuất bản, hoặc phiên bản 3\n"
+"của Bản Quy�n, hoặc (tùy ch�n) bất cứ phiên bản sau nào.\n"
 "\n"
 
-#: main.c:739
+#: main.c:770
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1690,69 +1723,67 @@ msgstr ""
 "Chúng tôi phân phối chương trình này vì mong muốn nó hữu ích,\n"
 "nhưng mà KHÔNG BẢO �ẢM GÌ CẢ, không ngay cả ngụ ý bảo đảm\n"
 "KHẢ NĂNG B�N hoặc KHẢ NĂNG LÀM VIỆC DỨT KHO�T.\n"
-"Hãy xem Quy�n Công Chung GNU (GNU General Public Licence)\n"
-"để tìm chi tiết.\n"
+"Hãy xem Bản Quy�n Công Chung GNU (GPL) để tìm chi tiết.\n"
 "\n"
 
-#: main.c:745
+#: main.c:781
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
-"USA.\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
-"Bện nên đã nhận một bản sao của Quy�n Công Chung GNU\n"
-"cũng với chương trình này; nếu không thì hãy viết cho\n"
+"Bện nên đã nhận một bản sao của Bản Quy�n Công Chung GNU\n"
+"cùng với chương trình này; nếu không, hãy viết thư cho\n"
 "Tổ chức Phần m�m Tự do:\n"
 "Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor,\n"
-"Boston, MA  02110-1301, USA. (Mỹ)\n"
+"Boston, MA  02110-1301, USA (Mỹ).\n"
 
-#: main.c:781
+#: main.c:816
 msgid "-Ft does not set FS to tab in POSIX awk"
-msgstr "-Ft không lập FS là tab trong awk POSIX"
+msgstr "-Ft không đặt FS (hệ thống tập tin?) là tab trong awk POSIX"
 
-#: main.c:1018
+#: main.c:1060
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
-"%s: đối số «%s» với «-v» không phải có dạng «biến=giá_trị» \n"
+"%s: đối số « %s » đối với « -v » không phải có dạng « biến=giá_trị »\n"
 "\n"
 
-#: main.c:1038
+#: main.c:1080
 #, c-format
 msgid "`%s' is not a legal variable name"
-msgstr "«%s» không phải là một tên biến cho phép"
+msgstr "« %s » không phải là tên biến hợp lệ"
 
-#: main.c:1041
+#: main.c:1083
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
-msgstr "«%s» không phải là một tên biến nên đang tìm tập tin «%s=%s»"
+msgstr "« %s » không phải là tên biến; đang tìm tập tin « %s=%s »"
 
-#: main.c:1074
+#: main.c:1122
 msgid "floating point exception"
 msgstr "ngoại lệ điểm phù động"
 
-#: main.c:1081
+#: main.c:1129
 msgid "fatal error: internal error"
-msgstr "lỗi  nghiêm tr�ng: lỗi nội bộ"
+msgstr "lỗi nghiêm tr�ng: lỗi nội bộ"
 
-#: main.c:1132
+#: main.c:1180
 #, c-format
 msgid "no pre-opened fd %d"
-msgstr "không có «fd %d» đã mở trước"
+msgstr "không có fd (chỉ thị tập tin?) %d đã mở trước"
 
-#: main.c:1139
+#: main.c:1187
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
-msgstr "không mở được «/dev/null» trước cho «fd %d»"
+msgstr "không thể mở </dev/null> trước cho fd (chỉ thị tập tin?) %d"
 
-#: main.c:1162 main.c:1171
+#: main.c:1210 main.c:1219
 #, c-format
 msgid "could not find groups: %s"
-msgstr "không tìm được nhóm: %s"
+msgstr "không tìm thấy nhóm: %s"
 
 #: msg.c:54
 #, c-format
@@ -1761,7 +1792,7 @@ msgstr "dòng lệnh:"
 
 #: msg.c:120
 msgid "warning: "
-msgstr "cảnh báo:"
+msgstr "cảnh báo : "
 
 #: msg.c:142
 msgid "error: "
@@ -1769,61 +1800,66 @@ msgstr "lá»—i: "
 
 #: msg.c:178
 msgid "fatal: "
-msgstr "nghiêm tr�ng:"
+msgstr "nghiêm tr�ng: "
 
-#: node.c:59 node.c:66 node.c:75 node.c:90 node.c:119
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
 msgid "can't convert string to float"
 msgstr "không thể chuyển đổi chuỗi sang đi�u lơ lửng"
 
-#: node.c:414
+#: node.c:406
 msgid "backslash at end of string"
-msgstr "xuyệc ngoặc tại kết thức chuỗi"
+msgstr "gặp xuyệc ngoặc tại kết thúc của chuỗi"
 
-#: node.c:604
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "awk cũ không hỗ trợ dãy thoát « \\%c »"
+
+#: node.c:599
 msgid "POSIX does not allow `\\x' escapes"
-msgstr "POSIX không cho phép đi�u thoát «\\x»"
+msgstr "POSIX không cho phép đi�u thoát « \\x »"
 
-#: node.c:610
+#: node.c:605
 msgid "no hex digits in `\\x' escape sequence"
-msgstr "không có số thập lúc phân trong dây thoát «\\x»"
+msgstr "không có số thập lúc nằm trong dây thoát « \\x »"
 
-#: node.c:644
+#: node.c:639
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
-msgstr "dây thoát «\\%c» được xử lý là «%c» giản dị"
+msgstr "dây thoát « \\%c » được xử lý như là « %c » chuẩn"
 
 #: posix/gawkmisc.c:172
 #, c-format
 msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
 msgstr ""
-"%s %s «%s»: không lập được «close-on-exec» (đóng một khi thực hiện) (fcntl: %"
-"s)"
+"%s %s « %s »: không thể đặt « close-on-exec » (đóng một khi thực hiện) "
+"(fcntl: %s)"
 
-#: profile.c:91
+#: profile.c:92
 #, c-format
 msgid "could not open `%s' for writing: %s"
-msgstr "không mở được «%s» để ghi: %s"
+msgstr "không thể mở « %s » để ghi: %s"
 
-#: profile.c:467
+#: profile.c:450
 #, c-format
 msgid "internal error: %s with null vname"
-msgstr "lỗi nội bộ: «%s» với vname (tên biến) vô giá trị"
+msgstr "lỗi nội bộ: %s với vname (tên biến?) vô giá trị"
 
-#: profile.c:531
+#: profile.c:514
 msgid "# treated internally as `delete'"
-msgstr "# được xử lý nội bộ là «xóa b�»"
+msgstr "# được xử lý nội bộ là « delete » (xoá b�)"
 
-#: profile.c:1168
+#: profile.c:1147
 #, c-format
 msgid "# this is a dynamically loaded extension function"
-msgstr "# đây là một chức năng mở rộng được tải một cách động"
+msgstr "# đây là một chức năng mở rộng được tải động"
 
-#: profile.c:1199
+#: profile.c:1178
 #, c-format
 msgid "\t# gawk profile, created %s\n"
-msgstr "\t# tiểu sở sơ lược gawk, được tạo %s\n"
+msgstr "\t# hồ sơ gawk, được tạo %s\n"
 
-#: profile.c:1202
+#: profile.c:1181
 #, c-format
 msgid ""
 "\t# BEGIN block(s)\n"
@@ -1832,7 +1868,7 @@ msgstr ""
 "\t# khối BEGIN (bắt đầu)\n"
 "\n"
 
-#: profile.c:1212
+#: profile.c:1191
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
@@ -1841,177 +1877,181 @@ msgstr ""
 "\t# Quy tắc\n"
 "\n"
 
-#: profile.c:1218
+#: profile.c:1197
 #, c-format
 msgid ""
 "\t# END block(s)\n"
 "\n"
 msgstr ""
-"\t# khối END (kết thức)\n"
+"\t# khối END (kết thúc)\n"
 "\n"
 
-#: profile.c:1238
+#: profile.c:1217
 #, c-format
 msgid ""
 "\n"
 "\t# Functions, listed alphabetically\n"
 msgstr ""
 "\n"
-"\t# Các chức năng theo thứ tự abc\n"
+"\t# Danh sách các chức năng theo thứ tự abc\n"
 
-#: profile.c:1453
+#: profile.c:1470
 #, c-format
 msgid "unexpected type %s in prec_level"
-msgstr "gặp kiểu bất ng� «%s» trong «prec_level» (cấp trước?)"
+msgstr "gặp kiểu bất ng� « %s » trong « prec_level » (cấp nằm trước?)"
 
-#: regcomp.c:160
+#: regcomp.c:132
 msgid "Success"
 msgstr "Thành công"
 
-#: regcomp.c:163
+#: regcomp.c:135
 msgid "No match"
-msgstr "Không khớp với gì"
+msgstr "Không khớp"
 
-#: regcomp.c:166
+#: regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Biểu thức chính quy không hợp lệ"
 
-#: regcomp.c:169
+#: regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Ký tự đối chiếu không hợp lệ"
 
-#: regcomp.c:172
+#: regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Tên hạng ký tự không hợp lệ"
 
-#: regcomp.c:175
+#: regcomp.c:147
 msgid "Trailing backslash"
-msgstr "Có xuyệc ngược theo sau"
+msgstr "Gặp xuyệc ngược nằm theo"
 
-#: regcomp.c:178
+#: regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Tham chiếu trở lại không hợp lệ"
 
-#: regcomp.c:181
+#: regcomp.c:153
 msgid "Unmatched [ or [^"
-msgstr "Chưa khớp «[» hay «[^»"
+msgstr "Chưa khớp « [ » hay « [^ »"
 
-#: regcomp.c:184
+#: regcomp.c:156
 msgid "Unmatched ( or \\("
-msgstr "Chưa khớp «(» hay «\\(»"
+msgstr "Chưa khớp « ( » hay « \\( »"
 
-#: regcomp.c:187
+#: regcomp.c:159
 msgid "Unmatched \\{"
-msgstr "Chưa khớp «\\{»"
+msgstr "Chưa khớp « \\{ »"
 
-#: regcomp.c:190
+#: regcomp.c:162
 msgid "Invalid content of \\{\\}"
-msgstr "Nội dụng «\\{\\}» không hợp lệ"
+msgstr "Nội dụng « \\{\\} » không hợp lệ"
 
-#: regcomp.c:193
+#: regcomp.c:165
 msgid "Invalid range end"
-msgstr "Kết thức mi�n không hợp lệ"
+msgstr "Kết thúc phạm vị không hợp lệ"
 
-#: regcomp.c:196
+#: regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Hết bộ nhớ rồi"
 
-#: regcomp.c:199
+#: regcomp.c:171
 msgid "Invalid preceding regular expression"
-msgstr "Biểu thức chính quy đi trước không hợp lệ"
+msgstr "Biểu thức chính quy nằm trước không hợp lệ"
 
-#: regcomp.c:202
+#: regcomp.c:174
 msgid "Premature end of regular expression"
-msgstr "Kết thức quá sớm của biểu thức chính quy"
+msgstr "Kết thúc quá sớm của biểu thức chính quy"
 
-#: regcomp.c:205
+#: regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Biểu thức chính quy quá lớn"
 
-#: regcomp.c:208
+#: regcomp.c:180
 msgid "Unmatched ) or \\)"
-msgstr "Chưa khớp «)» hay «\\)»"
+msgstr "Chưa khớp « ) » hay « \\) »"
 
-#: regcomp.c:688
+#: regcomp.c:664
 msgid "No previous regular expression"
-msgstr "Không có biểu thức chính quy đi trước"
+msgstr "Không có biểu thức chính quy nằm trước"
+
+#~ msgid "remote port invalid in `%s'"
+#~ msgstr "trong « %s » có cổng từ xa không hợp lệ"
 
 #~ msgid "delete: illegal use of variable `%s' as array"
 #~ msgstr "delete: (xóa b�) không cho phép cách dùng biến «%s» là mảng"
 
 #~ msgid "asort: first argument is not an array"
-#~ msgstr "asort: (sắp xếp) đối số đầu không phải là một mảng"
+#~ msgstr "asort: (sắp xếp) đối số đầu không phải là mảng"
 
 #~ msgid "asort: second argument is not an array"
-#~ msgstr "asort: (sắp xếp) đối số thứ hai không phải là một mảng"
+#~ msgstr "asort: (sắp xếp) đối số thứ hai không phải là mảng"
 
 #~ msgid ""
 #~ "\n"
 #~ "To report bugs, see node `Bugs' in `gawk.info', which is\n"
 #~ msgstr ""
 #~ "\n"
-#~ "�ể thông báo lỗi, hãy xem phần «Bugs» (lỗi) trong tập tin «gawk.info», \n"
+#~ "�ể thông báo lỗi, hãy xem phần « Bugs » (lỗi) trong tập tin « gawk.info "
+#~ "», \n"
 
 #~ msgid "invalid syntax in name `%s' for variable assignment"
-#~ msgstr "cú pháp không hợp lệ trong tên «%s» trong đi�u gán biến"
+#~ msgstr "cú pháp không hợp lệ trong tên « %s » đối với đi�u gán biến"
 
 #~ msgid "internal error: Node_var_array with null vname"
-#~ msgstr "lỗi nội bộ: «Node_var_array» với vname (tên biến) vô giá trị"
+#~ msgstr "lỗi nội bộ: « Node_var_array » với vname (tên biến?) vô giá trị"
 
 #~ msgid "or used in other expression context"
 #~ msgstr "hoặc được dùng trong ngữ cảnh biểu thức khác"
 
 #~ msgid "`%s' is a function, assignment is not allowed"
-#~ msgstr "«%s» là một chức năng thì không cho phép gán"
+#~ msgstr "« %s » là một chức năng thì không cho phép gán"
 
 #~ msgid "BEGIN blocks must have an action part"
-#~ msgstr "M�i khối BEGIN (bắt đầu) phải có một phần là hành động"
+#~ msgstr "M�i khối BEGIN (bắt đầu) phải có một phần kiểu hành động"
 
 #~ msgid "`nextfile' used in BEGIN or END action"
 #~ msgstr ""
-#~ "đã dùng «nextfile» (tập tin kế tiếp) trong hành động «BEGIN» (bắt đầu) "
-#~ "hay «END» (kết thức)"
+#~ "« nextfile » (tập tin kế tiếp) được dùng trong hành động « BEGIN » (bắt "
+#~ "đầu) hay « END » (kết thúc)"
 
 #~ msgid "non-redirected `getline' undefined inside BEGIN or END action"
 #~ msgstr ""
-#~ "trong hành động «BEGIN» (đầu) hay «END» (kết thức), có «getline» (lấy "
-#~ "dòng) không được chuyển hướng và chưa được định nghĩa."
+#~ "trong hành động « BEGIN » (đầu) hay « END » (kết thúc), có « getline "
+#~ "» (lấy dòng) không được chuyển hướng lại và chưa được xác định."
 
 #~ msgid "fptr %x not in tokentab\n"
-#~ msgstr "«fptr %x» không phải trong «tokentab»\n"
+#~ msgstr "« fptr %x » không phải nằm trong « tokentab »\n"
 
 #~ msgid "gsub third parameter is not a changeable object"
 #~ msgstr "tham số thứ ba gsub không phải là một đối tượng có thể thay đổi"
 
 #~ msgid "Unfinished \\ escape"
-#~ msgstr "«\\ escape» chưa xong"
+#~ msgstr "« \\ escape » (thoát) chưa xong"
 
 #~ msgid "unfinished repeat count"
-#~ msgstr "việc đếm lần nữa chưa xong"
+#~ msgstr "việc đếm lại chưa xong"
 
 #~ msgid "malformed repeat count"
-#~ msgstr "việc đếm lần nữa dạng sai"
+#~ msgstr "việc đếm lại dạng sai"
 
 #~ msgid "Unbalanced ["
-#~ msgstr "Chưa cân bằng «[»"
+#~ msgstr "Chưa cân bằng « [ »"
 
 #~ msgid "Unbalanced ("
-#~ msgstr "Chưa cân bằng «(»"
+#~ msgstr "Chưa cân bằng « ( »"
 
 #~ msgid "No regexp syntax bits specified"
 #~ msgstr "Chưa ghi rõ bit cú pháp biểu thức chính quy"
 
 #~ msgid "Unbalanced )"
-#~ msgstr "Chưa cân bằng «)»"
+#~ msgstr "Chưa cân bằng « ) »"
 
 #~ msgid "out of memory"
 #~ msgstr "hết bộ nhớ"
 
 #~ msgid "field %d in FIELDWIDTHS, must be > 0"
-#~ msgstr "trư�ng %d trong «FIELDWIDTHS», phải > 0"
+#~ msgstr "trư�ng %d trong « FIELDWIDTHS » phải là > 0"
 
 #~ msgid "function %s called\n"
-#~ msgstr "đã g�i chức năng «%s»\n"
+#~ msgstr "chức năng « %s » được g�i\n"
 
 #~ msgid "internal error: file `%s', line %d\n"
-#~ msgstr "lỗi nội bộ: tập tin «%s», dòng %d\n"
+#~ msgstr "lỗi nội bộ : tập tin « %s », dòng %d\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
new file mode 100644
index 00000000..c514b958
--- /dev/null
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 00000000..915db4c6
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,1858 @@
+# Chinese translations for gawk package
+# gawk 软件包的简体中文翻译.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gawk package.
+# LI Daobing <lidaobing@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gawk 3.1.5f\n"
+"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
+"POT-Creation-Date: 2007-09-30 22:33+0200\n"
+"PO-Revision-Date: 2007-06-13 03:57+0800\n"
+"Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
+"sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: array.c:112
+#, c-format
+msgid "attempt to use function `%s' as an array"
+msgstr "试图把函数“%s�当数组使用"
+
+#: array.c:115
+#, c-format
+msgid "attempt to use scalar parameter `%s' as an array"
+msgstr "试图把标��数“%s�当数组使用"
+
+#: array.c:118
+#, c-format
+msgid "attempt to use scalar `%s' as array"
+msgstr "试图把标�“%s�当数组使用"
+
+#: array.c:156
+#, c-format
+msgid "from %s"
+msgstr "从 %s"
+
+#: array.c:514
+#, c-format
+msgid "reference to uninitialized element `%s[\"%s\"]'"
+msgstr "引用未�始化的元素“%s[\"%s\"]�"
+
+#: array.c:520
+#, c-format
+msgid "subscript of array `%s' is null string"
+msgstr "数组“%s�的下标是空字符串"
+
+#: array.c:624
+#, c-format
+msgid "delete: index `%s' not in array `%s'"
+msgstr "删除: 索引“%s��在数组“%s�中"
+
+#: array.c:793
+#, c-format
+msgid "%s: empty (null)\n"
+msgstr "%s: 空(null)\n"
+
+#: array.c:798
+#, c-format
+msgid "%s: empty (zero)\n"
+msgstr "%s: 空(zero)\n"
+
+#: array.c:802
+#, c-format
+msgid "%s: table_size = %d, array_size = %d\n"
+msgstr "%s: 表格大� = %d, 数组大� = %d\n"
+
+#: array.c:831
+#, c-format
+msgid "%s: is parameter\n"
+msgstr "%s: 是�数\n"
+
+#: array.c:836
+#, c-format
+msgid "%s: array_ref to %s\n"
+msgstr "%s: 数组引用到 %s\n"
+
+#: awkgram.y:215
+#, c-format
+msgid "%s blocks must have an action part"
+msgstr "%s �必须有一个行为部分"
+
+#: awkgram.y:218
+msgid "each rule must have a pattern or an action part"
+msgstr "�个规则必须有一个模�或行为部分"
+
+#: awkgram.y:254 awkgram.y:263
+msgid "old awk does not support multiple `BEGIN' or `END' rules"
+msgstr "�的 awk �支�多个“BEGIN�或“END�规则"
+
+#: awkgram.y:282
+#, c-format
+msgid "`%s' is a built-in function, it cannot be redefined"
+msgstr "“%s�是内置函数，�能被�定义"
+
+#: awkgram.y:328
+msgid "regexp constant `//' looks like a C++ comment, but is not"
+msgstr "正则表达�常�“//�看起�� C++ 注释，但其实�是"
+
+#: awkgram.y:331
+#, c-format
+msgid "regexp constant `/%s/' looks like a C comment, but is not"
+msgstr "正则表达�常�“/%s/�看起�� C 注释，但其实�是"
+
+#: awkgram.y:358 awkgram.y:653
+msgid "statement may have no effect"
+msgstr "表达��能无任何效果"
+
+#: awkgram.y:455 awkgram.y:479
+#, c-format
+msgid "`%s' used in %s action"
+msgstr "“%s�被用于 %s 行为"
+
+#: awkgram.y:470 awkgram.y:474
+msgid "`nextfile' is a gawk extension"
+msgstr "“nextfile�是 gawk 扩展"
+
+#: awkgram.y:489
+msgid "`return' used outside function context"
+msgstr "“return�在函数外使用"
+
+#: awkgram.y:531
+msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
+msgstr "在 BEGIN 或 END 规则中，“print�也许应该写�“print \"\"�"
+
+#: awkgram.y:547 awkgram.y:555
+msgid "`delete array' is a gawk extension"
+msgstr "“delete array�是 gawk 扩展"
+
+#: awkgram.y:569 awkgram.y:577
+msgid "`delete(array)' is a non-portable tawk extension"
+msgstr "“delete(array)�是��移�的 tawk 扩展"
+
+#: awkgram.y:621
+#, c-format
+msgid "duplicate case values in switch body: %s"
+msgstr "switch 中有��的 case 值: %s"
+
+#: awkgram.y:631
+msgid "Duplicate `default' detected in switch body"
+msgstr "switch 中有��的“default�"
+
+#: awkgram.y:720
+msgid "multistage two-way pipelines don't work"
+msgstr "多阶��管�无法工作"
+
+#: awkgram.y:811
+msgid "regular expression on right of assignment"
+msgstr "正则表达�在赋值算符的�边"
+
+#: awkgram.y:834
+msgid "regular expression on left of `~' or `!~' operator"
+msgstr "正则表达�在“~�或“!~�算符的左边"
+
+#: awkgram.y:840 awkgram.y:913
+msgid "old awk does not support the keyword `in' except after `for'"
+msgstr "� awk �支�关键�“in�在“for�的��"
+
+#: awkgram.y:846
+msgid "regular expression on right of comparison"
+msgstr "正则表达�在比较算符的�边"
+
+#: awkgram.y:903
+msgid "non-redirected `getline' undefined inside END action"
+msgstr "在 END 环境中，��定�的“getline�未定义"
+
+#: awkgram.y:914
+msgid "old awk does not support multidimensional arrays"
+msgstr "� awk �支�多维数组"
+
+#: awkgram.y:960
+msgid "call of `length' without parentheses is not portable"
+msgstr "�带括�调用“length�是��以移�的"
+
+#: awkgram.y:965
+msgid "call of `length' without parentheses is deprecated by POSIX"
+msgstr "POSIX 认为�带括�调用“length�是已过时的"
+
+#: awkgram.y:1019
+msgid "use of non-array as array"
+msgstr "把�数组�数组使用"
+
+#: awkgram.y:1022
+msgid "invalid subscript expression"
+msgstr "无效的下标表达�"
+
+#: awkgram.y:1249
+msgid "unexpected newline or end of string"
+msgstr "未预期的新行或字符串结�"
+
+#: awkgram.y:1366
+msgid "empty program text on command line"
+msgstr "命令行中程�体为空"
+
+#: awkgram.y:1422
+#, c-format
+msgid "can't open source file `%s' for reading (%s)"
+msgstr "无法以读模�打开�文件“%s�(%s)"
+
+#: awkgram.y:1520
+#, c-format
+msgid "can't read sourcefile `%s' (%s)"
+msgstr "无法读��文件“%s�(%s)"
+
+#: awkgram.y:1528
+#, c-format
+msgid "source file `%s' is empty"
+msgstr "�文件“%s�为空"
+
+#: awkgram.y:1720 awkgram.y:1842 awkgram.y:1860 awkgram.y:2235 awkgram.y:2322
+msgid "source file does not end in newline"
+msgstr "�文件�以�行符结�"
+
+#: awkgram.y:1782
+msgid "unterminated regexp ends with `\\' at end of file"
+msgstr "未终止的正则表达�在文件结�处以“\\�结�"
+
+#: awkgram.y:1806
+#, c-format
+msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
+msgstr "%s: %d: tawk 正则表达�修饰符“/.../%c�无法在 gawk 中工作"
+
+#: awkgram.y:1810
+#, c-format
+msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
+msgstr "tawk 正则表达�修饰符“/.../%c�无法在 gawk 中工作"
+
+#: awkgram.y:1817
+msgid "unterminated regexp"
+msgstr "未终止的正则表达�"
+
+#: awkgram.y:1820
+msgid "unterminated regexp at end of file"
+msgstr "未终止的正则表达�在文件结�处"
+
+#: awkgram.y:1889
+msgid "use of `\\ #...' line continuation is not portable"
+msgstr "使用“\\ #...��续行是��移�的"
+
+#: awkgram.y:1902
+msgid "backslash not last character on line"
+msgstr "�斜��是行的最�一个字符"
+
+#: awkgram.y:1947
+msgid "POSIX does not allow operator `**='"
+msgstr "POSIX ��许�作符“**=�"
+
+#: awkgram.y:1949
+msgid "old awk does not support operator `**='"
+msgstr "� awk �支��作符“**=�"
+
+#: awkgram.y:1958
+msgid "POSIX does not allow operator `**'"
+msgstr "POSIX ��许�作符“**�"
+
+#: awkgram.y:1960
+msgid "old awk does not support operator `**'"
+msgstr "� awk �支��作符“**�"
+
+#: awkgram.y:1991
+msgid "operator `^=' is not supported in old awk"
+msgstr "� awk �支��作符“^=�"
+
+#: awkgram.y:1999
+msgid "operator `^' is not supported in old awk"
+msgstr "� awk �支��作符“^�"
+
+#: awkgram.y:2083 awkgram.y:2098
+msgid "unterminated string"
+msgstr "未结�的字符串"
+
+#: awkgram.y:2283
+#, c-format
+msgid "invalid char '%c' in expression"
+msgstr "表达�中的无效字符“%c�"
+
+#: awkgram.y:2331
+#, c-format
+msgid "`%s' is a gawk extension"
+msgstr "“%s�是 gawk 扩展"
+
+#: awkgram.y:2334
+#, c-format
+msgid "`%s' is a Bell Labs extension"
+msgstr "“%s�是�尔实验室扩展"
+
+#: awkgram.y:2337
+#, c-format
+msgid "POSIX does not allow `%s'"
+msgstr "POSIX ��许“%s�"
+
+#: awkgram.y:2341
+#, c-format
+msgid "`%s' is not supported in old awk"
+msgstr "� awk �支�“%s�"
+
+#: awkgram.y:2367
+msgid "`goto' considered harmful!\n"
+msgstr "“goto�有害�\n"
+
+#: awkgram.y:2429
+#, c-format
+msgid "%d is invalid as number of arguments for %s"
+msgstr "%d 是 %s 的无效�数个数"
+
+#: awkgram.y:2448 awkgram.y:2451
+msgid "match: third argument is a gawk extension"
+msgstr "match: 第三个�数是 gawk 扩展"
+
+#: awkgram.y:2464
+#, c-format
+msgid "%s: string literal as last arg of substitute has no effect"
+msgstr "%s: 字符串作为 substitute 的最�一个�数无任何效果"
+
+#: awkgram.y:2467
+#, c-format
+msgid "%s third parameter is not a changeable object"
+msgstr "%s 第三个�数�是一个��对象"
+
+#: awkgram.y:2494 awkgram.y:2497
+msgid "close: second argument is a gawk extension"
+msgstr "close: 第二个�数是 gawk 扩展"
+
+#: awkgram.y:2507
+msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
+msgstr "使用 dcgettext(_\"...\") 是错误的: 去掉开始的下划线"
+
+#: awkgram.y:2522
+msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
+msgstr "使用 dcngettext(_\"...\") 是错误的: 去掉开始的下划线"
+
+#: awkgram.y:2594
+#, c-format
+msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
+msgstr "函数“%s�: 第 %d 个�数, “%s�, 与第 %d 个�数��"
+
+#: awkgram.y:2627
+#, c-format
+msgid "function `%s': parameter `%s' shadows global variable"
+msgstr "函数“%s�: �数“%s�掩盖了公共��"
+
+#: awkgram.y:2739
+#, c-format
+msgid "could not open `%s' for writing (%s)"
+msgstr "无法以写模�打开“%s�（%s)"
+
+#: awkgram.y:2740 profile.c:94
+msgid "sending profile to standard error"
+msgstr "���置到标准错误输出"
+
+#: awkgram.y:2772
+#, c-format
+msgid "%s: close failed (%s)"
+msgstr "%s: 关闭失败(%s)"
+
+#: awkgram.y:2893
+msgid "shadow_funcs() called twice!"
+msgstr "shadow_funcs() 被调用两次�"
+
+#: awkgram.y:2920
+msgid "there were shadowed variables."
+msgstr "那里有被掩盖的��。"
+
+#: awkgram.y:2993
+#, c-format
+msgid "function `%s': can't use function name as parameter name"
+msgstr "函数“%s�: 无法使用函数�作为�数�"
+
+#: awkgram.y:3003
+#, c-format
+msgid "function name `%s' previously defined"
+msgstr "函数�“%s���已定义"
+
+#: awkgram.y:3154 awkgram.y:3160
+#, c-format
+msgid "function `%s' called but never defined"
+msgstr "函数“%s�被调用但�未被定义"
+
+#: awkgram.y:3163
+#, c-format
+msgid "function `%s' defined but never called"
+msgstr "函数“%s�被定义但�未被调用"
+
+#: awkgram.y:3190
+#, c-format
+msgid "regexp constant for parameter #%d yields boolean value"
+msgstr "第 %d 个�数的正则表达�常�产生布尔值"
+
+#: awkgram.y:3234
+#, c-format
+msgid ""
+"function `%s' called with space between name and `(',\n"
+"or used as a variable or an array"
+msgstr ""
+"函数“%s�被调用时�字与“(�间有空格，\n"
+"或被用作��或数组"
+
+#: builtin.c:119
+#, c-format
+msgid "%s to \"%s\" failed (%s)"
+msgstr "%s 到 \"%s\" 失败 (%s)"
+
+#: builtin.c:120
+msgid "standard output"
+msgstr "标准输出"
+
+#: builtin.c:121
+msgid "reason unknown"
+msgstr "未知原因"
+
+#: builtin.c:134
+msgid "exp: received non-numeric argument"
+msgstr "exp: 收到�数字�数"
+
+#: builtin.c:140
+#, c-format
+msgid "exp: argument %g is out of range"
+msgstr "exp: �数 %g 超出范围"
+
+#: builtin.c:198
+#, c-format
+msgid "fflush: cannot flush: pipe `%s' opened for reading, not writing"
+msgstr "fflush: 无法使用: 管�“%s�以�读方�打开，��写"
+
+#: builtin.c:201
+#, c-format
+msgid "fflush: cannot flush: file `%s' opened for reading, not writing"
+msgstr "fflush: 无法使用: 文件“%s�以�读方�打开，��写"
+
+#: builtin.c:213
+#, c-format
+msgid "fflush: `%s' is not an open file, pipe or co-process"
+msgstr "fflush: “%s��是一个已打开文件�管�或�作进程"
+
+#: builtin.c:306
+msgid "index: received non-string first argument"
+msgstr "index: 第一个�数�是字符串"
+
+#: builtin.c:308
+msgid "index: received non-string second argument"
+msgstr "index: 第二个�数�是字符串"
+
+#: builtin.c:423
+msgid "int: received non-numeric argument"
+msgstr "int: 收到�数字�数"
+
+#: builtin.c:448
+msgid "`length(array)' is a gawk extension"
+msgstr "“length(array)�是 gawk 扩展"
+
+#: builtin.c:458
+msgid "length: received non-string argument"
+msgstr "length: 收到�字符串�数"
+
+#: builtin.c:483
+msgid "log: received non-numeric argument"
+msgstr "log: 收到�数字�数"
+
+#: builtin.c:486
+#, c-format
+msgid "log: received negative argument %g"
+msgstr "log: 收到负数�数 %g"
+
+#: builtin.c:693 builtin.c:696
+msgid "must use `count$' on all formats or none"
+msgstr "�么在所有格�上使用“count$�，�么完全�使用"
+
+#: builtin.c:799
+msgid "`$' is not permitted in awk formats"
+msgstr "awk 格�中��许 “$�"
+
+#: builtin.c:805
+msgid "arg count with `$' must be > 0"
+msgstr "�有“$�的�数个数必须大于0"
+
+#: builtin.c:807
+#, c-format
+msgid "arg count %ld greater than total number of supplied arguments"
+msgstr "�数个数 %ld 大于�供的�数总个数"
+
+#: builtin.c:809
+msgid "`$' not permitted after period in format"
+msgstr "格���许在“.��使用“$�"
+
+#: builtin.c:822
+msgid "no `$' supplied for positional field width or precision"
+msgstr "没有为格�宽度或精度�供“$�"
+
+#: builtin.c:888
+msgid "`l' is meaningless in awk formats; ignored"
+msgstr "“l�在 awk 格�中无�义；忽略"
+
+#: builtin.c:892
+msgid "`l' is not permitted in POSIX awk formats"
+msgstr "“l���许在 POSIX awk 格�中使用"
+
+#: builtin.c:903
+msgid "`L' is meaningless in awk formats; ignored"
+msgstr "“L�在 awk 格�中无�义；忽略"
+
+#: builtin.c:907
+msgid "`L' is not permitted in POSIX awk formats"
+msgstr "“L���许在 POSIX awk 格�中使用"
+
+#: builtin.c:918
+msgid "`h' is meaningless in awk formats; ignored"
+msgstr "“h�在 awk 格�中无�义；忽略"
+
+#: builtin.c:922
+msgid "`h' is not permitted in POSIX awk formats"
+msgstr "“h���许在 POSIX awk 格�中使用"
+
+#: builtin.c:1182
+#, c-format
+msgid "[s]printf: value %g is out of range for `%%%c' format"
+msgstr "[s]printf: 值 %g 对“%%%c�格��说超出范围"
+
+#: builtin.c:1266
+msgid "not enough arguments to satisfy format string"
+msgstr "相对格��说�数个数�足"
+
+#: builtin.c:1268
+msgid "^ ran out for this one"
+msgstr "^ 跑出范围"
+
+#: builtin.c:1274
+msgid "[s]printf: format specifier does not have control letter"
+msgstr "[s]printf: 指定格���控制字符"
+
+#: builtin.c:1277
+msgid "too many arguments supplied for format string"
+msgstr "相对格��说�数个数过多"
+
+#: builtin.c:1352 builtin.c:1355
+msgid "printf: no arguments"
+msgstr "printf: 没有�数"
+
+#: builtin.c:1379
+msgid "sqrt: received non-numeric argument"
+msgstr "sqrt: 收到�数字�数"
+
+#: builtin.c:1383
+#, c-format
+msgid "sqrt: called with negative argument %g"
+msgstr "sqrt: 收到负数�数 %g"
+
+#: builtin.c:1407
+#, c-format
+msgid "substr: start index %g is invalid, using 1"
+msgstr "substr: 开始�标 %g 无效，使用 1"
+
+#: builtin.c:1412
+#, c-format
+msgid "substr: non-integer start index %g will be truncated"
+msgstr "substr: �整数的开始�标 %g 会被截断"
+
+#: builtin.c:1431
+#, c-format
+msgid "substr: length %g is not >= 1"
+msgstr "substr: 长度 %g �于 1"
+
+#: builtin.c:1433
+#, c-format
+msgid "substr: length %g is not >= 0"
+msgstr "substr: 长度 %g �于 0"
+
+#: builtin.c:1440
+#, c-format
+msgid "substr: non-integer length %g will be truncated"
+msgstr "substr: �整数的长度 %g 会被截断"
+
+#: builtin.c:1445
+#, c-format
+msgid "substr: length %g too big for string indexing, truncating to %g"
+msgstr "substr: 长度 %g 作为字符串�标过大，截断至 %g"
+
+#: builtin.c:1457
+msgid "substr: source string is zero length"
+msgstr "substr: �字符串长度为0"
+
+#: builtin.c:1473
+#, c-format
+msgid "substr: start index %g is past end of string"
+msgstr "substr: 开始�标 %g 超出字符串尾部"
+
+#: builtin.c:1481
+#, c-format
+msgid ""
+"substr: length %g at start index %g exceeds length of first argument (%lu)"
+msgstr "substr: 在开始�标 %2$g 下长度 %1$g 超出第一个�数的长度 (%3$lu)"
+
+#: builtin.c:1558
+msgid "strftime: received non-string first argument"
+msgstr "strftime: 第一个�数�是字符串"
+
+#: builtin.c:1564
+msgid "strftime: received empty format string"
+msgstr "strftime: 收到空格�字符串"
+
+#: builtin.c:1573
+msgid "strftime: received non-numeric second argument"
+msgstr "strftime: 第二个�数�是数字"
+
+#: builtin.c:1650
+msgid "mktime: received non-string argument"
+msgstr "mktime: 收到�字符串�数"
+
+#: builtin.c:1695
+msgid "system: received non-string argument"
+msgstr "system: 收到�字符串�数"
+
+#: builtin.c:1816 eval.c:2041
+#, c-format
+msgid "reference to uninitialized field `$%d'"
+msgstr "引用未�始化的字段“$%d�"
+
+#: builtin.c:1921
+msgid "tolower: received non-string argument"
+msgstr "tolower: 收到�字符串�数"
+
+#: builtin.c:1951
+msgid "toupper: received non-string argument"
+msgstr "toupper: 收到�字符串�数"
+
+#: builtin.c:1984
+msgid "atan2: received non-numeric first argument"
+msgstr "atan2: 第一个�数�是数字"
+
+#: builtin.c:1986
+msgid "atan2: received non-numeric second argument"
+msgstr "atan2: 第二个�数�是数字"
+
+#: builtin.c:2005
+msgid "sin: received non-numeric argument"
+msgstr "sin: 收到�数字�数"
+
+#: builtin.c:2021
+msgid "cos: received non-numeric argument"
+msgstr "cos: 收到�数字�数"
+
+#: builtin.c:2071
+msgid "srand: received non-numeric argument"
+msgstr "srand: 收到�数字�数"
+
+#: builtin.c:2106
+msgid "match: third argument is not an array"
+msgstr "match: 第三个�数�是数组"
+
+#: builtin.c:2650
+msgid "gensub: third argument of 0 treated as 1"
+msgstr "gensub: 第三个�数 0 被当作 1"
+
+#: builtin.c:2766
+msgid "lshift: received non-numeric first argument"
+msgstr "lshift: 第一个�数�是数字"
+
+#: builtin.c:2768
+msgid "lshift: received non-numeric second argument"
+msgstr "lshift: 第二个�数�是数字"
+
+#: builtin.c:2774
+#, c-format
+msgid "lshift(%lf, %lf): negative values will give strange results"
+msgstr "lshift(%lf, %lf): 负值会得到奇怪的结果"
+
+#: builtin.c:2776
+#, c-format
+msgid "lshift(%lf, %lf): fractional values will be truncated"
+msgstr "lshift(%lf, %lf): �数部分会被截断"
+
+#: builtin.c:2778
+#, c-format
+msgid "lshift(%lf, %lf): too large shift value will give strange results"
+msgstr "lshift(%lf, %lf): 过大的移�会得到奇怪的结果"
+
+#: builtin.c:2804
+msgid "rshift: received non-numeric first argument"
+msgstr "rshift: 第一个�数�是数字"
+
+#: builtin.c:2806
+msgid "rshift: received non-numeric second argument"
+msgstr "rshift: 第二个�数�是数字"
+
+#: builtin.c:2812
+#, c-format
+msgid "rshift(%lf, %lf): negative values will give strange results"
+msgstr "rshift(%lf, %lf): 负值会得到奇怪的结果"
+
+#: builtin.c:2814
+#, c-format
+msgid "rshift(%lf, %lf): fractional values will be truncated"
+msgstr "rshift(%lf, %lf): �数部分会被截断"
+
+#: builtin.c:2816
+#, c-format
+msgid "rshift(%lf, %lf): too large shift value will give strange results"
+msgstr "rshift(%lf, %lf): 过大的移�会得到奇怪的结果"
+
+#: builtin.c:2842
+msgid "and: received non-numeric first argument"
+msgstr "and: 第一个�数�是数字"
+
+#: builtin.c:2844
+msgid "and: received non-numeric second argument"
+msgstr "and: 第二个�数�是数字"
+
+#: builtin.c:2850
+#, c-format
+msgid "and(%lf, %lf): negative values will give strange results"
+msgstr "and(%lf, %lf): 负值会得到奇怪的结果"
+
+#: builtin.c:2852
+#, c-format
+msgid "and(%lf, %lf): fractional values will be truncated"
+msgstr "and(%lf, %lf): �数部分会被截断"
+
+#: builtin.c:2878
+msgid "or: received non-numeric first argument"
+msgstr "or: 第一个�数�是数字"
+
+#: builtin.c:2880
+msgid "or: received non-numeric second argument"
+msgstr "or: 第二个�数�是数字"
+
+#: builtin.c:2886
+#, c-format
+msgid "or(%lf, %lf): negative values will give strange results"
+msgstr "or(%lf, %lf): 负值会得到奇怪的结果"
+
+#: builtin.c:2888
+#, c-format
+msgid "or(%lf, %lf): fractional values will be truncated"
+msgstr "or(%lf, %lf): �数部分会被截断"
+
+#: builtin.c:2914
+msgid "xor: received non-numeric first argument"
+msgstr "xor: 第一个�数�是数字"
+
+#: builtin.c:2916
+msgid "xor: received non-numeric second argument"
+msgstr "xor: 第二个�数�是数字"
+
+#: builtin.c:2922
+#, c-format
+msgid "xor(%lf, %lf): negative values will give strange results"
+msgstr "xor(%lf, %lf): 负值会得到奇怪的结果"
+
+#: builtin.c:2924
+#, c-format
+msgid "xor(%lf, %lf): fractional values will be truncated"
+msgstr "xor(%lf, %lf): �数部分会被截断"
+
+#: builtin.c:2948
+msgid "compl: received non-numeric argument"
+msgstr "compl: 收到�数字�数"
+
+#: builtin.c:2954
+#, c-format
+msgid "compl(%lf): negative value will give strange results"
+msgstr "compl(%lf): 负值会得到奇怪的结果"
+
+#: builtin.c:2956
+#, c-format
+msgid "compl(%lf): fractional value will be truncated"
+msgstr "compl(%lf): �数部分会被截断"
+
+#: builtin.c:3129
+#, c-format
+msgid "dcgettext: `%s' is not a valid locale category"
+msgstr "dcgettext: “%s��是一个��的本地化目录"
+
+#: eval.c:303
+#, c-format
+msgid "unknown nodetype %d"
+msgstr "未知的结点类型 %d"
+
+#: eval.c:353
+msgid "buffer overflow in genflags2str"
+msgstr "genflags2str 时缓冲区溢出"
+
+#: eval.c:385 eval.c:391 profile.c:817
+#, c-format
+msgid "attempt to use array `%s' in a scalar context"
+msgstr "试图在标�环境中使用数组“%s�"
+
+#: eval.c:733
+#, c-format
+msgid "for loop: array `%s' changed size from %ld to %ld during loop execution"
+msgstr "for loop: 数组“%s�在循环执行时大�从 %ld 改�为 %ld"
+
+#: eval.c:754
+msgid "`break' outside a loop is not portable"
+msgstr "“break�在循环外使用是��移�的"
+
+#: eval.c:758
+msgid "`break' outside a loop is not allowed"
+msgstr "“break�在循环外使用是��许的"
+
+#: eval.c:775
+msgid "`continue' outside a loop is not portable"
+msgstr "“continue�在循环外使用是��移�的"
+
+#: eval.c:779
+msgid "`continue' outside a loop is not allowed"
+msgstr "“continue�在循环外使用是��许的"
+
+#: eval.c:813
+msgid "`next' cannot be called from a BEGIN rule"
+msgstr "在 BEGIN 规则中��许调用“next�"
+
+#: eval.c:815
+msgid "`next' cannot be called from an END rule"
+msgstr "在 END 规则中��许调用“next�"
+
+#: eval.c:824
+msgid "`nextfile' cannot be called from a BEGIN rule"
+msgstr "在 BEGIN 规则中��许调用“nextfile�"
+
+#: eval.c:826
+msgid "`nextfile' cannot be called from an END rule"
+msgstr "在 END 规则中��许调用“nextfile�"
+
+#: eval.c:875
+msgid "statement has no effect"
+msgstr "表达�无任何作用"
+
+#: eval.c:952 eval.c:1895
+#, c-format
+msgid "can't use function name `%s' as variable or array"
+msgstr "无法使用函数�“%s�作为��或数组"
+
+#: eval.c:959 eval.c:965
+#, c-format
+msgid "reference to uninitialized argument `%s'"
+msgstr "引用未�始化的�数“%s�"
+
+#: eval.c:974 eval.c:1904
+#, c-format
+msgid "reference to uninitialized variable `%s'"
+msgstr "引用未�始化的��“%s�"
+
+#: eval.c:1120
+msgid ""
+"concatenation: side effects in one expression have changed the length of "
+"another!"
+msgstr "concatenation: 一个表达�的�外效应已改��一个的长度�"
+
+#: eval.c:1202
+msgid "assignment used in conditional context"
+msgstr "在�件表达�中赋值"
+
+#: eval.c:1280
+msgid "division by zero attempted"
+msgstr "试图除0"
+
+#: eval.c:1295
+#, c-format
+msgid "division by zero attempted in `%%'"
+msgstr "在“%%�中试图除0"
+
+#: eval.c:1310 profile.c:693
+#, c-format
+msgid "illegal type (%s) in tree_eval"
+msgstr "tree_eval 中的�法类型 (%s)"
+
+#: eval.c:1473
+msgid "division by zero attempted in `/='"
+msgstr "在“/=�中试图除0"
+
+#: eval.c:1495
+#, c-format
+msgid "division by zero attempted in `%%='"
+msgstr "在“%%=�中试图除0"
+
+#: eval.c:1760
+#, c-format
+msgid "function `%s' called with more arguments than declared"
+msgstr "函数“%s�被调用时�供了比声明时更多的�数"
+
+#: eval.c:1804
+#, c-format
+msgid "function `%s' not defined"
+msgstr "函数“%s�未定义"
+
+#: eval.c:1867
+#, c-format
+msgid ""
+"\n"
+"\t# Function Call Stack:\n"
+"\n"
+msgstr ""
+"\n"
+"\t# 函数调用栈:\n"
+"\n"
+
+#: eval.c:1870
+#, c-format
+msgid "\t# -- main --\n"
+msgstr "\t# -- main --\n"
+
+#: eval.c:2025
+msgid "attempt to field reference from non-numeric value"
+msgstr "试图从�数值引用字段编�"
+
+#: eval.c:2027
+msgid "attempt to reference from null string"
+msgstr "试图从空字符串引用"
+
+#: eval.c:2033
+#, c-format
+msgid "attempt to access field %d"
+msgstr "试图访问字段 %d"
+
+#: eval.c:2054 eval.c:2061 profile.c:914
+msgid "assignment is not allowed to result of builtin function"
+msgstr "��许对内置函数的结果赋值"
+
+#: eval.c:2125
+msgid "`IGNORECASE' is a gawk extension"
+msgstr "“IGNORECASE�是 gawk 扩展"
+
+#: eval.c:2155
+msgid "`BINMODE' is a gawk extension"
+msgstr "“BINMODE�是 gawk 扩展"
+
+#: eval.c:2277
+#, c-format
+msgid "bad `%sFMT' specification `%s'"
+msgstr "错误的“%sFMT�实现“%s�"
+
+#: eval.c:2355
+msgid "turning off `--lint' due to assignment to `LINT'"
+msgstr "由于对“LINT�赋值所以关闭“--lint�"
+
+#: ext.c:62 ext.c:67
+msgid "`extension' is a gawk extension"
+msgstr "“extension�是 gawk 扩展"
+
+#: ext.c:77
+#, c-format
+msgid "extension: cannot open `%s' (%s)\n"
+msgstr "extension: 无法打开 “%s�(%s)\n"
+
+#: ext.c:85
+#, c-format
+msgid "extension: library `%s': cannot call function `%s' (%s)\n"
+msgstr "extension: 库“%s�: 无法调用函数“%s�(%s)\n"
+
+#: ext.c:105
+msgid "extension: missing function name"
+msgstr "extension: 缺少函数�"
+
+#: ext.c:110
+#, c-format
+msgid "extension: illegal character `%c' in function name `%s'"
+msgstr "extension: 函数�“%2$s�中有�法字符“%1$c�"
+
+#: ext.c:116
+#, c-format
+msgid "extension: can't redefine function `%s'"
+msgstr "extension: 无法�定义函数“%s�"
+
+#: ext.c:120
+#, c-format
+msgid "extension: function `%s' already defined"
+msgstr "extension: 函数“%s�已�被定义"
+
+#: ext.c:125
+#, c-format
+msgid "extension: can't use gawk built-in `%s' as function name"
+msgstr "extension: 无法使用 gawk 内置的 “%s� 作为函数�"
+
+#: ext.c:127
+#, c-format
+msgid "extension: function name `%s' previously defined"
+msgstr "extension: 函数�“%s���已被定义"
+
+#: ext.c:204
+#, c-format
+msgid "function `%s' defined to take no more than %d argument(s)"
+msgstr "函数“%s�被定义为支��超过 %d 个�数"
+
+#: ext.c:207
+#, c-format
+msgid "function `%s': missing argument #%d"
+msgstr "函数“%s�: 缺少第 %d 个�数"
+
+#: ext.c:217
+#, c-format
+msgid "function `%s': argument #%d: attempt to use scalar as an array"
+msgstr "函数“%s�: 第 %d 个�数: 试图把标�当作数组使用"
+
+#: ext.c:221
+#, c-format
+msgid "function `%s': argument #%d: attempt to use array as a scalar"
+msgstr "函数“%s�: 第 %d 个�数: 试图把数组当标�使用"
+
+#: ext.c:246
+msgid "Operation Not Supported"
+msgstr "�作�被支�"
+
+#: field.c:330
+msgid "NF set to negative value"
+msgstr "NF 被设置为负值"
+
+#: field.c:823
+msgid "split: second argument is not an array"
+msgstr "split: 第二个�数�是数组"
+
+#: field.c:857
+msgid "split: null string for third arg is a gawk extension"
+msgstr "split: 第三个�数为空是 gawk 扩展"
+
+#: field.c:909
+msgid "`FIELDWIDTHS' is a gawk extension"
+msgstr "“FIELDWIDTHS�是 gawk 扩展"
+
+#: field.c:939 field.c:953
+#, c-format
+msgid "invalid FIELDWIDTHS value, near `%s'"
+msgstr "“%s�附近 FIELDWIDTHS 值无效"
+
+#: field.c:1036
+msgid "null string for `FS' is a gawk extension"
+msgstr "把“FS�设为空字符串是 gawk 扩展"
+
+#: field.c:1040
+msgid "old awk does not support regexps as value of `FS'"
+msgstr "� awk �支�把“FS�设置为正则表达�"
+
+#: getopt.c:571 getopt.c:587
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: 选项“%s�有歧义\n"
+
+#: getopt.c:620 getopt.c:624
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: 选项“--%s���许有�数\n"
+
+#: getopt.c:633 getopt.c:638
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: 选项“%c%s���许有�数\n"
+
+#: getopt.c:681 getopt.c:700 getopt.c:1016 getopt.c:1035
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: 选项“%s�需�一个�数\n"
+
+#: getopt.c:738 getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: 无法识别选项“--%s�\n"
+
+#: getopt.c:749 getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: 无法识别选项“%c%s�\n"
+
+#: getopt.c:804 getopt.c:807
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: �法选项 -- %c\n"
+
+#: getopt.c:813 getopt.c:816
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: 无效选项 -- %c\n"
+
+#: getopt.c:868 getopt.c:884 getopt.c:1088 getopt.c:1106 main.c:461
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: 选项需�一个�数 -- %c\n"
+
+#: getopt.c:937 getopt.c:953
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: 选项“-W %s�有歧义\n"
+
+#: getopt.c:977 getopt.c:995
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: 选项“-W %s���许�数\n"
+
+#: io.c:345
+#, c-format
+msgid "cannot open file `%s' for reading (%s)"
+msgstr "无法以读模�打开文件“%s�(%s)"
+
+#: io.c:436
+#, c-format
+msgid "close of fd %d (`%s') failed (%s)"
+msgstr "关闭文件� %d (“%s�)失败(%s)"
+
+#: io.c:575
+#, c-format
+msgid "invalid tree type %s in redirect()"
+msgstr "在 redirect() 中的无效的树类型 %s"
+
+#: io.c:581
+#, c-format
+msgid "expression in `%s' redirection only has numeric value"
+msgstr "“%s��定�中的表达��有数字值"
+
+#: io.c:587
+#, c-format
+msgid "expression for `%s' redirection has null string value"
+msgstr "“%s��定�中的表达�是空字符串"
+
+#: io.c:592
+#, c-format
+msgid "filename `%s' for `%s' redirection may be result of logical expression"
+msgstr "“%2$s��定�中的文件�“%1$s��能是逻辑表达�的结果"
+
+#: io.c:630
+#, c-format
+msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
+msgstr "在文件“%.*s�中�必�的混�使用“>�和“>>�"
+
+#: io.c:682
+#, c-format
+msgid "can't open pipe `%s' for output (%s)"
+msgstr "无法为输出打开管�“%s�(%s)"
+
+#: io.c:691
+#, c-format
+msgid "can't open pipe `%s' for input (%s)"
+msgstr "无法为输入打开管�“%s�(%s)"
+
+#: io.c:698 io.c:1448
+#, c-format
+msgid "file `%s' is a directory"
+msgstr "文件“%s�是一个目录"
+
+#: io.c:706
+#, c-format
+msgid "can't open two way socket `%s' for input/output (%s)"
+msgstr "无法为输入/输出打开��端�“%s�(%s)"
+
+#: io.c:710
+#, c-format
+msgid "can't open two way pipe `%s' for input/output (%s)"
+msgstr "无法为输入/输出打开��管�“%s�(%s)"
+
+#: io.c:786
+#, c-format
+msgid "can't redirect from `%s' (%s)"
+msgstr "无法自“%s��定�(%s)"
+
+#: io.c:789
+#, c-format
+msgid "can't redirect to `%s' (%s)"
+msgstr "无法�定�到“%s�(%s)"
+
+#: io.c:828
+msgid ""
+"reached system limit for open files: starting to multiplex file descriptors"
+msgstr "打开的文件数达到系统�制: 开始�用文件�述符"
+
+#: io.c:844
+#, c-format
+msgid "close of `%s' failed (%s)."
+msgstr "关闭“%s�失败(%s)。"
+
+#: io.c:852
+msgid "too many pipes or input files open"
+msgstr "打开过多管�或输入文件"
+
+#: io.c:875
+msgid "close: second argument must be `to' or `from'"
+msgstr "close: 第二个�数必须是“to�或“from�"
+
+#: io.c:889
+#, c-format
+msgid "close: `%.*s' is not an open file, pipe or co-process"
+msgstr "close: “%.*s��是一个已打开文件�管�或�作进程"
+
+#: io.c:893
+msgid "close of redirection that was never opened"
+msgstr "关闭一个从未被打开的�定�"
+
+#: io.c:989
+#, c-format
+msgid "close: redirection `%s' not opened with `|&', second argument ignored"
+msgstr "close: �定�“%s��是用“|&�打开，第二个�数被忽略"
+
+#: io.c:1005
+#, c-format
+msgid "failure status (%d) on pipe close of `%s' (%s)"
+msgstr "关闭管�“%2$s�时失败，失败状�为(%1$d)(%3$s)"
+
+#: io.c:1008
+#, c-format
+msgid "failure status (%d) on file close of `%s' (%s)"
+msgstr "关闭文件“%2$s�时失败，失败状�为(%1$d)(%3$s)"
+
+#: io.c:1028
+#, c-format
+msgid "no explicit close of socket `%s' provided"
+msgstr "未显�关闭端�“%s�"
+
+#: io.c:1031
+#, c-format
+msgid "no explicit close of co-process `%s' provided"
+msgstr "未显�关闭�作进程“%s�"
+
+#: io.c:1034
+#, c-format
+msgid "no explicit close of pipe `%s' provided"
+msgstr "未显�关闭管�“%s�"
+
+#: io.c:1037
+#, c-format
+msgid "no explicit close of file `%s' provided"
+msgstr "未显�关闭文件“%s�"
+
+#: io.c:1066 io.c:1121 main.c:749 main.c:791
+#, c-format
+msgid "error writing standard output (%s)"
+msgstr "�标准输出写时�生错误 (%s)"
+
+#: io.c:1070 io.c:1126
+#, c-format
+msgid "error writing standard error (%s)"
+msgstr "�标准错误输出写时�生错误 (%s)"
+
+#: io.c:1078
+#, c-format
+msgid "pipe flush of `%s' failed (%s)."
+msgstr "刷新管�“%s�时出错(%s)。"
+
+#: io.c:1081
+#, c-format
+msgid "co-process flush of pipe to `%s' failed (%s)."
+msgstr "刷新�作进程管�“%s�时出错(%s)。"
+
+#: io.c:1084
+#, c-format
+msgid "file flush of `%s' failed (%s)."
+msgstr "刷新文件“%s�时出错(%s)。"
+
+#: io.c:1198
+#, c-format
+msgid "local port %s invalid in `/inet'"
+msgstr "本地端� %s 在“/inet�中无效"
+
+#: io.c:1215
+#, c-format
+msgid "remote host and port information (%s, %s) invalid"
+msgstr "远程主机和端�信� (%s, %s) 无效"
+
+#: io.c:1250
+msgid "/inet/raw client not ready yet, sorry"
+msgstr "/inet/raw 客户端未准备好，对�起"
+
+#: io.c:1253 io.c:1289
+msgid "only root may use `/inet/raw'."
+msgstr "仅 root 能使用 “/inet/raw�"
+
+#: io.c:1287
+msgid "/inet/raw server not ready yet, sorry"
+msgstr "/inet/raw �务器未准备好，对�起"
+
+#: io.c:1385
+#, c-format
+msgid "no (known) protocol supplied in special filename `%s'"
+msgstr "未�供特殊文件�的“%s�的访问�议"
+
+#: io.c:1399
+#, c-format
+msgid "special file name `%s' is incomplete"
+msgstr "特殊文件�“%s�是�完整的"
+
+#: io.c:1414
+msgid "must supply a remote hostname to `/inet'"
+msgstr "必须�供远程主机�给“/inet�"
+
+#: io.c:1432
+msgid "must supply a remote port to `/inet'"
+msgstr "必须�供远程端�给“/inet�"
+
+#: io.c:1439
+msgid "TCP/IP communications are not supported"
+msgstr "TCP/IP 通讯�被支�"
+
+#: io.c:1509
+#, c-format
+msgid "use `PROCINFO[\"%s\"]' instead of `%s'"
+msgstr "使用“PROCINFO[\"%s\"]�而�是“%s�"
+
+#: io.c:1547
+msgid "use `PROCINFO[...]' instead of `/dev/user'"
+msgstr "使用“PROCINFO[...]�而�是“/dev/user�"
+
+#: io.c:1612 io.c:1798
+#, c-format
+msgid "could not open `%s', mode `%s'"
+msgstr "无法以模�“%2$s�打开“%1$s�"
+
+#: io.c:1849
+#, c-format
+msgid "close of master pty failed (%s)"
+msgstr "关闭主 pty 失败(%s)"
+
+#: io.c:1851 io.c:2003 io.c:2154
+#, c-format
+msgid "close of stdout in child failed (%s)"
+msgstr "在�进程中关闭标准输出失败(%s)"
+
+#: io.c:1854
+#, c-format
+msgid "moving slave pty to stdout in child failed (dup: %s)"
+msgstr "在�进程中将从 pty 改为标准输出失败(dup: %s)"
+
+#: io.c:1856 io.c:2008
+#, c-format
+msgid "close of stdin in child failed (%s)"
+msgstr "在�进程中关闭标准输入失败(%s)"
+
+#: io.c:1859
+#, c-format
+msgid "moving slave pty to stdin in child failed (dup: %s)"
+msgstr "在�进程中将从 pty 改为标准输入失败(dup: %s)"
+
+#: io.c:1861 io.c:1880
+#, c-format
+msgid "close of slave pty failed (%s)"
+msgstr "关闭从 pty 失败(%s)"
+
+#: io.c:1954 io.c:2006 io.c:2135 io.c:2157
+#, c-format
+msgid "moving pipe to stdout in child failed (dup: %s)"
+msgstr "在�进程中将管�改为标准输出失败(dup: %s)"
+
+#: io.c:1958 io.c:2011
+#, c-format
+msgid "moving pipe to stdin in child failed (dup: %s)"
+msgstr "在�进程中将管�改为标准输入失败(dup: %s)"
+
+#: io.c:1975 io.c:2148
+msgid "restoring stdout in parent process failed\n"
+msgstr "在父进程中��标准输出失败\n"
+
+#: io.c:1980
+msgid "restoring stdin in parent process failed\n"
+msgstr "在父进程中��标准输入失败\n"
+
+#: io.c:2014 io.c:2159 io.c:2170
+#, c-format
+msgid "close of pipe failed (%s)"
+msgstr "关闭管�失败(%s)"
+
+#: io.c:2059
+msgid "`|&' not supported"
+msgstr "“|&��被支�"
+
+#: io.c:2125
+#, c-format
+msgid "cannot open pipe `%s' (%s)"
+msgstr "无法打开管�“%s�(%s)"
+
+#: io.c:2166
+#, c-format
+msgid "cannot create child process for `%s' (fork: %s)"
+msgstr "无法为“%s�创建�进程(fork: %s)"
+
+#: io.c:2548
+#, c-format
+msgid "data file `%s' is empty"
+msgstr "数�文件“%s�为空"
+
+#: io.c:2589 io.c:2597
+msgid "could not allocate more input memory"
+msgstr "无法分�更多的输入内存"
+
+#: io.c:2965 io.c:3038
+#, c-format
+msgid "error reading input file `%s': %s"
+msgstr "读�输入文件“%s�时出错: %s"
+
+#: io.c:3163
+msgid "multicharacter value of `RS' is a gawk extension"
+msgstr "“RS�设置为多字符是 gawk 扩展"
+
+#: main.c:351
+msgid "`-m[fr]' option irrelevant in gawk"
+msgstr "“-m[fr]�选项在 gawk 中�相关"
+
+#: main.c:353
+msgid "-m option usage: `-m[fr] nnn'"
+msgstr "-m 选项用法: “-m[fr] nnn�"
+
+#: main.c:370
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: 选项“-W %s�无法识别，忽略\n"
+
+#: main.c:407
+msgid "empty argument to `--source' ignored"
+msgstr "“--source�的空�数被忽略"
+
+#: main.c:480
+msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
+msgstr "环境��“POSIXLY_CORRECT�被设置: 打开“--posix�"
+
+#: main.c:486
+msgid "`--posix' overrides `--traditional'"
+msgstr "“--posix�覆盖“--traditional�"
+
+#: main.c:497
+msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
+msgstr "“--posix�或“--traditional�覆盖“--non-decimal-data�"
+
+#: main.c:501
+#, c-format
+msgid "running %s setuid root may be a security problem"
+msgstr "以设置 root ID 方��行“%s��能存在安全�洞"
+
+#: main.c:542
+#, c-format
+msgid "can't set binary mode on stdin (%s)"
+msgstr "无法在标准输入上设置二进制模�(%s)"
+
+#: main.c:545
+#, c-format
+msgid "can't set binary mode on stdout (%s)"
+msgstr "无法在标准输出上设置二进制模�(%s)"
+
+#: main.c:547
+#, c-format
+msgid "can't set binary mode on stderr (%s)"
+msgstr "无法在标准错误输出上设置二进制模�(%s)"
+
+#: main.c:586
+msgid "no program text at all!"
+msgstr "完全没有程�正文�"
+
+#: main.c:690
+#, c-format
+msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
+msgstr "用法: %s [POSIX 或 GNU 风格选项] -f 脚本文件 [--] 文件 ...\n"
+
+#: main.c:692
+#, c-format
+msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
+msgstr "用法: %s [POSIX 或 GNU 风格选项] [--] %c程�%c 文件 ...\n"
+
+#: main.c:697
+msgid "POSIX options:\t\tGNU long options:\n"
+msgstr "POSIX 选项:     \t\tGNU 长选项:\n"
+
+#: main.c:698
+msgid "\t-f progfile\t\t--file=progfile\n"
+msgstr "\t-f 脚本文件\t\t--file=脚本文件\n"
+
+#: main.c:699
+msgid "\t-F fs\t\t\t--field-separator=fs\n"
+msgstr "\t-F fs\t\t\t--field-separator=fs\n"
+
+#: main.c:700
+msgid "\t-v var=val\t\t--assign=var=val\n"
+msgstr "\t-v var=val\t\t--assign=var=val\n"
+
+#: main.c:701
+msgid "\t-m[fr] val\n"
+msgstr "\t-m[fr] val\n"
+
+#: main.c:702
+msgid "\t-W compat\t\t--compat\n"
+msgstr "\t-W compat\t\t--compat\n"
+
+#: main.c:703
+msgid "\t-W copyleft\t\t--copyleft\n"
+msgstr "\t-W copyleft\t\t--copyleft\n"
+
+#: main.c:704
+msgid "\t-W copyright\t\t--copyright\n"
+msgstr "\t-W copyright\t\t--copyright\n"
+
+#: main.c:705
+msgid "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
+msgstr "\t-W dump-variables[=file]\t--dump-variables[=file]\n"
+
+#: main.c:706
+msgid "\t-W exec=file\t\t--exec=file\n"
+msgstr "\t-W exec=file\t\t--exec=file\n"
+
+#: main.c:707
+msgid "\t-W gen-po\t\t--gen-po\n"
+msgstr "\t-W gen-po\t\t--gen-po\n"
+
+#: main.c:708
+msgid "\t-W help\t\t\t--help\n"
+msgstr "\t-W help\t\t\t--help\n"
+
+#: main.c:709
+msgid "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
+msgstr "\t-W lint[=fatal]\t\t--lint[=fatal]\n"
+
+#: main.c:710
+msgid "\t-W lint-old\t\t--lint-old\n"
+msgstr "\t-W lint-old\t\t--lint-old\n"
+
+#: main.c:711
+msgid "\t-W non-decimal-data\t--non-decimal-data\n"
+msgstr "\t-W non-decimal-data\t--non-decimal-data\n"
+
+#: main.c:713
+msgid "\t-W nostalgia\t\t--nostalgia\n"
+msgstr "\t-W nostalgia\t\t--nostalgia\n"
+
+#: main.c:716
+msgid "\t-W parsedebug\t\t--parsedebug\n"
+msgstr "\t-W parsedebug\t\t--parsedebug\n"
+
+#: main.c:718
+msgid "\t-W profile[=file]\t--profile[=file]\n"
+msgstr "\t-W profile[=file]\t--profile[=file]\n"
+
+#: main.c:719
+msgid "\t-W posix\t\t--posix\n"
+msgstr "\t-W posix\t\t--posix\n"
+
+#: main.c:720
+msgid "\t-W re-interval\t\t--re-interval\n"
+msgstr "\t-W re-interval\t\t--re-interval\n"
+
+#: main.c:721
+msgid "\t-W source=program-text\t--source=program-text\n"
+msgstr "\t-W source=program-text\t--source=program-text\n"
+
+#: main.c:722
+msgid "\t-W traditional\t\t--traditional\n"
+msgstr "\t-W traditional\t\t--traditional\n"
+
+#: main.c:723
+msgid "\t-W usage\t\t--usage\n"
+msgstr "\t-W usage\t\t--usage\n"
+
+#: main.c:724
+msgid "\t-W use-lc-numeric\t--use-lc-numeric\n"
+msgstr ""
+
+#: main.c:725
+msgid "\t-W version\t\t--version\n"
+msgstr "\t-W version\t\t--version\n"
+
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: main.c:734
+msgid ""
+"\n"
+"To report bugs, see node `Bugs' in `gawk.info', which is\n"
+"section `Reporting Problems and Bugs' in the printed version.\n"
+"\n"
+msgstr ""
+"\n"
+"�交错误报告请�考“gawk.info�中的“Bugs�页，它�于打�版本中的“Reporting\n"
+"Problems and Bugs�一节\n"
+"\n"
+"翻译错误请�信至 translation-team-zh-cn@lists.sourceforge.net\n"
+"\n"
+
+#: main.c:738
+msgid ""
+"gawk is a pattern scanning and processing language.\n"
+"By default it reads standard input and writes standard output.\n"
+"\n"
+msgstr ""
+"gawk 是一个模�扫��处�语言。缺�情况下它从标准输入读入并写至标准输出。\n"
+"\n"
+
+#: main.c:742
+msgid ""
+"Examples:\n"
+"\tgawk '{ sum += $1 }; END { print sum }' file\n"
+"\tgawk -F: '{ print $1 }' /etc/passwd\n"
+msgstr ""
+"范例:\n"
+"\tgawk '{ sum += $1 }; END { print sum }' file\n"
+"\tgawk -F: '{ print $1 }' /etc/passwd\n"
+
+#: main.c:762
+#, c-format
+msgid ""
+"Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+msgstr ""
+"版�所有 © 1989, 1991-%d 自由软件基金会(FSF)。\n"
+"\n"
+"该程�为自由软件，你�以在自由软件基金会�布的 GNU 通用公共许��(GPL)第\n"
+"3版或以�版本下修改或�新�布。\n"
+"\n"
+
+#: main.c:770
+msgid ""
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+msgstr ""
+"该程�之所以被�布是因为希望他能对你有所用处，但我们�作任何担�。这包�\n"
+"但��于任何商业适售性以�针对特定目的的适用性的担�。详情�� GNU 通用公\n"
+"共许��(GPL)。\n"
+"\n"
+
+#: main.c:781
+#, fuzzy
+msgid ""
+"You should have received a copy of the GNU General Public License\n"
+"along with this program. If not, see http://www.gnu.org/licenses/.\n"
+msgstr ""
+"你应该收到程�附带的一份 GNU 通用公共许��(GPL)。如果没有收到，�写信至\n"
+"“the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
+"Boston, MA 02110-1301, USA.�索�。\n"
+
+#: main.c:816
+msgid "-Ft does not set FS to tab in POSIX awk"
+msgstr "在 POSIX awk 中 -Ft �会将 FS 设为制表符(tab)"
+
+#: main.c:1060
+#, c-format
+msgid ""
+"%s: `%s' argument to `-v' not in `var=value' form\n"
+"\n"
+msgstr ""
+"%s: “-v�的�数“%s��是“var=value�形�\n"
+"\n"
+
+#: main.c:1080
+#, c-format
+msgid "`%s' is not a legal variable name"
+msgstr "“%s��是一个�法的���"
+
+#: main.c:1083
+#, c-format
+msgid "`%s' is not a variable name, looking for file `%s=%s'"
+msgstr "“%s��是一个���，查找文件“%s=%s�"
+
+#: main.c:1122
+msgid "floating point exception"
+msgstr "浮点数异常"
+
+#: main.c:1129
+msgid "fatal error: internal error"
+msgstr "致命错误: 内部错误"
+
+#: main.c:1180
+#, c-format
+msgid "no pre-opened fd %d"
+msgstr "文件�述符 %d 未被打开"
+
+#: main.c:1187
+#, c-format
+msgid "could not pre-open /dev/null for fd %d"
+msgstr "无法为文件�述符 %d 预打开 /dev/null"
+
+#: main.c:1210 main.c:1219
+#, c-format
+msgid "could not find groups: %s"
+msgstr "无法找到组: %s"
+
+#: msg.c:54
+#, c-format
+msgid "cmd. line:"
+msgstr "命令行:"
+
+#: msg.c:120
+msgid "warning: "
+msgstr "警告: "
+
+#: msg.c:142
+msgid "error: "
+msgstr "错误: "
+
+#: msg.c:178
+msgid "fatal: "
+msgstr "致命错误: "
+
+#: node.c:63 node.c:78 node.c:105 node.c:121 node.c:151
+msgid "can't convert string to float"
+msgstr "无法将字符串转化为浮点数"
+
+#: node.c:406
+msgid "backslash at end of string"
+msgstr "字符串尾部的�斜�"
+
+#: node.c:548
+#, c-format
+msgid "old awk does not support the `\\%c' escape sequence"
+msgstr "� awk �支�“\\%c�转义�列"
+
+#: node.c:599
+msgid "POSIX does not allow `\\x' escapes"
+msgstr "POSIX ��许“\\x�转义符"
+
+#: node.c:605
+msgid "no hex digits in `\\x' escape sequence"
+msgstr "“\\x�转义�列中没有�六进制数"
+
+#: node.c:639
+#, c-format
+msgid "escape sequence `\\%c' treated as plain `%c'"
+msgstr "转义�列“\\%c�被当作�纯的“%c�"
+
+#: posix/gawkmisc.c:172
+#, c-format
+msgid "%s %s `%s': could not set close-on-exec: (fcntl: %s)"
+msgstr "%s %s “%s�: 无法设置 close-on-exec: (fcntl: %s)"
+
+#: profile.c:92
+#, c-format
+msgid "could not open `%s' for writing: %s"
+msgstr "无法以写模�打开“%s�: %s"
+
+#: profile.c:450
+#, c-format
+msgid "internal error: %s with null vname"
+msgstr "内部错误: %s 带有空的 vname"
+
+#: profile.c:514
+msgid "# treated internally as `delete'"
+msgstr "# 内部处�为“delete�"
+
+#: profile.c:1147
+#, c-format
+msgid "# this is a dynamically loaded extension function"
+msgstr "# 这是一个动�加载的扩展函数"
+
+#: profile.c:1178
+#, c-format
+msgid "\t# gawk profile, created %s\n"
+msgstr "\t# gawk �置, 创建 %s\n"
+
+#: profile.c:1181
+#, c-format
+msgid ""
+"\t# BEGIN block(s)\n"
+"\n"
+msgstr ""
+"\t# BEGIN �\n"
+"\n"
+
+#: profile.c:1191
+#, c-format
+msgid ""
+"\t# Rule(s)\n"
+"\n"
+msgstr ""
+"\t# 规则\n"
+"\n"
+
+#: profile.c:1197
+#, c-format
+msgid ""
+"\t# END block(s)\n"
+"\n"
+msgstr ""
+"\t# END �\n"
+"\n"
+
+#: profile.c:1217
+#, c-format
+msgid ""
+"\n"
+"\t# Functions, listed alphabetically\n"
+msgstr ""
+"\n"
+"\t# 函数列表，字典�\n"
+
+#: profile.c:1470
+#, c-format
+msgid "unexpected type %s in prec_level"
+msgstr "在 prec_level 中未预期的类型 %s"
+
+#: regcomp.c:132
+msgid "Success"
+msgstr "�功"
+
+#: regcomp.c:135
+msgid "No match"
+msgstr "无匹�"
+
+#: regcomp.c:138
+msgid "Invalid regular expression"
+msgstr "无效的正则表达�"
+
+#: regcomp.c:141
+msgid "Invalid collation character"
+msgstr "无效的收集字符"
+
+#: regcomp.c:144
+msgid "Invalid character class name"
+msgstr "无效的字符类型�"
+
+#: regcomp.c:147
+msgid "Trailing backslash"
+msgstr "尾端的�斜�"
+
+#: regcomp.c:150
+msgid "Invalid back reference"
+msgstr "无效的回引用"
+
+#: regcomp.c:153
+msgid "Unmatched [ or [^"
+msgstr "未匹�的 [ 或 [^"
+
+#: regcomp.c:156
+msgid "Unmatched ( or \\("
+msgstr "未匹�的 ( 或 \\("
+
+#: regcomp.c:159
+msgid "Unmatched \\{"
+msgstr "未匹�的 \\{"
+
+#: regcomp.c:162
+msgid "Invalid content of \\{\\}"
+msgstr "\\{\\} 中内容无效"
+
+#: regcomp.c:165
+msgid "Invalid range end"
+msgstr "无效的范围结�"
+
+#: regcomp.c:168
+msgid "Memory exhausted"
+msgstr "内存耗尽"
+
+#: regcomp.c:171
+msgid "Invalid preceding regular expression"
+msgstr "无效的�置正则表达�"
+
+#: regcomp.c:174
+msgid "Premature end of regular expression"
+msgstr "正则表达��正常结�"
+
+#: regcomp.c:177
+msgid "Regular expression too big"
+msgstr "正则表达�过大"
+
+#: regcomp.c:180
+msgid "Unmatched ) or \\)"
+msgstr "未匹�的 ) 或 \\)"
+
+#: regcomp.c:664
+msgid "No previous regular expression"
+msgstr "��没有正则表达�"
diff --git a/posix/ChangeLog b/posix/ChangeLog
index 54fd5144..6686dc00 100644
--- a/posix/ChangeLog
+++ b/posix/ChangeLog
@@ -1,3 +1,18 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Sun Apr  2 21:43:02 2006  Corinna Vinschen  <vinschen@redhat.com>
+
+	* gawkmisc.c (os_setbinmode): Call `setmode' for Cygwin.
+	(cygwin_premain0, cygwin_premain2): Change type of `myself'
+	parameter to `void *'.
+
+Sun Mar 12 22:45:11 2006  Corinna Vinschen  <vinschen@redhat.com>
+
+	* gawkmisc.c (cygwin_premain2): New function.
+	Fixes CR-LF problem with already open stdin.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c
index 5f9dec82..242d1e02 100644
--- a/posix/gawkmisc.c
+++ b/posix/gawkmisc.c
@@ -207,6 +207,9 @@ int
 os_setbinmode(fd, mode)
 int fd, mode;
 {
+#ifdef __CYGWIN__
+	setmode (fd, mode);
+#endif
 	return 0;
 }
 
@@ -221,11 +224,12 @@ int fd;
 }
 
 #ifdef __CYGWIN__
+#include <stdio.h>
 #include <sys/cygwin.h>
 
 extern int _fmode;
 void
-cygwin_premain0 (int argc, char **argv, struct per_process *myself)
+cygwin_premain0 (int argc, char **argv, void *myself)
 {
   static struct __cygwin_perfile pf[] =
   {
@@ -235,4 +239,10 @@ cygwin_premain0 (int argc, char **argv, struct per_process *myself)
   };
   cygwin_internal (CW_PERFILE, pf);
 }
+
+void
+cygwin_premain2 (int argc, char **argv, void *myself)
+{
+  setmode (fileno (stdin), O_TEXT);
+}
 #endif
diff --git a/profile.c b/profile.c
index 0f96457c..1a8c131d 100644
--- a/profile.c
+++ b/profile.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1999-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1999-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -46,6 +46,7 @@ static void pp_getline P((NODE *tree));
 static void pp_builtin P((NODE *tree));
 static void pp_list P((NODE *tree));
 static void pp_string P((const char *str, size_t len, int delim));
+static void pp_concat P((NODE *tree, int level));
 static int is_scalar P((NODETYPE type));
 static int prec_level P((NODETYPE type));
 #ifdef PROFILING
@@ -427,24 +428,6 @@ pprint(register NODE *volatile tree)
 	}
 }
 
-/* varname --- print a variable name, handling vars done with -v */
-
-/*
- * When `-v x=x' is given, the varname field ends up including the
- * entire text.  This gets printed in the profiled output if we're
- * not careful. Oops.
- *
- * XXX: This is a band-aid; we really should fix the -v code.
- */
-
-static void
-varname(const char *name)
-{
-	for (; *name != '\0' && *name != '='; name++)
-		putc(*name, prof_fp);
-	return;
-}
-
 /* tree_eval --- evaluate a subtree */
 
 static void
@@ -462,7 +445,7 @@ tree_eval(register NODE *tree)
 	case Node_var:
 	case Node_var_array:
 		if (tree->vname != NULL)
-			varname(tree->vname);
+			fprintf(prof_fp, "%s", tree->vname);
 		else
 			fatal(_("internal error: %s with null vname"),
 				nodetype2str(tree->type));
@@ -644,11 +627,7 @@ tree_eval(register NODE *tree)
 		return;
 
 	case Node_concat:
-		fprintf(prof_fp, "(");
-		tree_eval(tree->lnode);
-		fprintf(prof_fp, " ");
-		tree_eval(tree->rnode);
-		fprintf(prof_fp, ")");
+		pp_concat(tree, 0);
 		return;
 
 	/* other assignment types are easier because they are numeric */
@@ -1255,6 +1234,44 @@ pp_func(const char *name, size_t namelen, NODE *f)
 	fprintf(prof_fp, "\t}\n");
 }
 
+/*
+ * pp_concat --- print string concatenations
+ *
+ * Multiple string concatenations grow downwards to the left.
+ * This routine attempts to print multiple concatenations with
+ * the minimal amount of parentheses.
+ */
+
+static void
+pp_concat(NODE *tree, int level)
+{
+	if (tree->lnode->type == Node_concat)
+		pp_concat(tree->lnode, level + 1);	/* recurse down one level */
+	else {
+		fprintf(prof_fp, "(");	/* outermost left paren */
+		if (is_scalar(tree->lnode->type))
+			tree_eval(tree->lnode);
+		else {
+			fprintf(prof_fp, "(");
+			tree_eval(tree->lnode);
+			fprintf(prof_fp, ")");
+		}
+	}
+
+	fprintf(prof_fp, " ");
+
+	if (is_scalar(tree->rnode->type))
+		tree_eval(tree->rnode);
+	else {
+		fprintf(prof_fp, "(");
+		tree_eval(tree->rnode);
+		fprintf(prof_fp, ")");
+	}
+
+	if (level == 0)
+		fprintf(prof_fp, ")");	/* outermost right paren */
+}
+
 /* pp_string --- pretty print a string or regex constant */
 
 static void
diff --git a/profile_p.c b/profile_p.c
index 54e2320c..97edd367 100644
--- a/profile_p.c
+++ b/profile_p.c
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/protos.h b/protos.h
index c7850210..850fb449 100644
--- a/protos.h
+++ b/protos.h
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/random.c b/random.c
index bb56cbc8..cba1b6bc 100644
--- a/random.c
+++ b/random.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,6 +27,22 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Per the statement at http://opensource.org/licenses/bsd-license.php,
+ *
+ *	The advertising clause in the license appearing on BSD Unix files was
+ *	officially rescinded by the Director of the Office of Technology
+ *	Licensing of the University of California on July 22 1999. He states
+ *	that clause 3 is "hereby deleted in its entirety."
+ *
+ * I removed the advertising clause in the above copyright.
+ * The above web site points to
+ * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change.
+ *
+ * Arnold Robbins
+ * 15 September 2007
+ */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)random.c	8.2 (Berkeley) 5/19/95";
 #endif /* LIBC_SCCS and not lint */
diff --git a/random.h b/random.h
index f24d5f71..626cbcdb 100644
--- a/random.h
+++ b/random.h
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/re.c b/re.c
index c0375b98..56db98d5 100644
--- a/re.c
+++ b/re.c
@@ -3,14 +3,14 @@
  */
 
 /* 
- * Copyright (C) 1991-2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1991-2007 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -174,7 +174,7 @@ make_regexp(const char *s, size_t len, int ignorecase, int dfa)
 			rp->pat.translate = NULL;
 		} else {
 			syn &= ~RE_ICASE;
-			rp->pat.translate = (char *) casetable;
+			rp->pat.translate = (RE_TRANSLATE_TYPE) casetable;
 		}
 	} else {
 		rp->pat.translate = NULL;
@@ -225,8 +225,15 @@ research(Regexp *rp, register char *str, int start,
 	 *
 	 * The dfa matcher doesn't have a no_bol flag, so don't bother
 	 * trying it in that case.
+	 *
+	 * 4/2007: Grrrr.  The dfa matcher has bugs in certain multibyte
+	 * cases that are just too deeply buried to ferret out. Don't
+	 * let this kill us if we need_start.  (This may be too narrowly
+	 * focused, perhaps we should relegate the DFA matcher to the
+	 * single byte case all the time. OTOH, the speed difference
+	 * between the matchers in non-trivial... Sigh.)
 	 */
-	if (rp->dfa && ! no_bol) {
+	if (rp->dfa && ! no_bol && (gawk_mb_cur_max == 1 || ! need_start)) {
 		char save;
 		int count = 0;
  		/*
@@ -359,6 +366,9 @@ avoid_dfa(NODE *re, char *str, size_t len)
 {
 	char *end;
 
+	if (re->re_reg->dfareg.broken)
+		return TRUE;
+
 	if (! re->re_reg->has_anchor)
 		return FALSE;
 
diff --git a/regcomp.c b/regcomp.c
index 9692cc30..d61bd1ac 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -19,12 +19,11 @@
    02110-1301 USA.  */
 
 static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
-					  int length, reg_syntax_t syntax);
+					  size_t length, reg_syntax_t syntax);
 static void re_compile_fastmap_iter (regex_t *bufp,
 				     const re_dfastate_t *init_state,
 				     char *fastmap);
-static reg_errcode_t init_dfa (re_dfa_t *dfa, int pat_len);
-static void init_word_char (re_dfa_t *dfa);
+static reg_errcode_t init_dfa (re_dfa_t *dfa, size_t pat_len);
 #ifdef RE_ENABLE_I18N
 static void free_charset (re_charset_t *cset);
 #endif /* RE_ENABLE_I18N */
@@ -34,7 +33,6 @@ static reg_errcode_t create_initial_state (re_dfa_t *dfa);
 static void optimize_utf8 (re_dfa_t *dfa);
 #endif
 static reg_errcode_t analyze (regex_t *preg);
-static reg_errcode_t create_initial_state (re_dfa_t *dfa);
 static reg_errcode_t preorder (bin_tree_t *root,
 			       reg_errcode_t (fn (void *, bin_tree_t *)),
 			       void *extra);
@@ -48,12 +46,8 @@ static bin_tree_t *lower_subexp (reg_errcode_t *err, regex_t *preg,
 static reg_errcode_t calc_first (void *extra, bin_tree_t *node);
 static reg_errcode_t calc_next (void *extra, bin_tree_t *node);
 static reg_errcode_t link_nfa_nodes (void *extra, bin_tree_t *node);
-static reg_errcode_t duplicate_node_closure (re_dfa_t *dfa, int top_org_node,
-					     int top_clone_node, int root_node,
-					     unsigned int constraint);
-static reg_errcode_t duplicate_node (int *new_idx, re_dfa_t *dfa, int org_idx,
-				     unsigned int constraint);
-static int search_duplicated_node (re_dfa_t *dfa, int org_node,
+static int duplicate_node (re_dfa_t *dfa, int org_idx, unsigned int constraint);
+static int search_duplicated_node (const re_dfa_t *dfa, int org_node,
 				   unsigned int constraint);
 static reg_errcode_t calc_eclosure (re_dfa_t *dfa);
 static reg_errcode_t calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa,
@@ -61,12 +55,8 @@ static reg_errcode_t calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa,
 static reg_errcode_t calc_inveclosure (re_dfa_t *dfa);
 static int fetch_number (re_string_t *input, re_token_t *token,
 			 reg_syntax_t syntax);
-static void fetch_token (re_token_t *result, re_string_t *input,
-			 reg_syntax_t syntax);
 static int peek_token (re_token_t *token, re_string_t *input,
-			reg_syntax_t syntax);
-static int peek_token_bracket (re_token_t *token, re_string_t *input,
-			       reg_syntax_t syntax);
+			reg_syntax_t syntax) internal_function;
 static bin_tree_t *parse (re_string_t *regexp, regex_t *preg,
 			  reg_syntax_t syntax, reg_errcode_t *err);
 static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg,
@@ -96,45 +86,27 @@ static reg_errcode_t parse_bracket_element (bracket_elem_t *elem,
 static reg_errcode_t parse_bracket_symbol (bracket_elem_t *elem,
 					  re_string_t *regexp,
 					  re_token_t *token);
-#ifndef _LIBC
-# ifdef RE_ENABLE_I18N
-static reg_errcode_t build_range_exp (re_bitset_ptr_t sbcset,
-				      re_charset_t *mbcset, int *range_alloc,
-				      bracket_elem_t *start_elem,
-				      bracket_elem_t *end_elem);
-static reg_errcode_t build_collating_symbol (re_bitset_ptr_t sbcset,
-					     re_charset_t *mbcset,
-					     int *coll_sym_alloc,
-					     const unsigned char *name);
-# else /* not RE_ENABLE_I18N */
-static reg_errcode_t build_range_exp (re_bitset_ptr_t sbcset,
-				      bracket_elem_t *start_elem,
-				      bracket_elem_t *end_elem);
-static reg_errcode_t build_collating_symbol (re_bitset_ptr_t sbcset,
-					     const unsigned char *name);
-# endif /* not RE_ENABLE_I18N */
-#endif /* not _LIBC */
 #ifdef RE_ENABLE_I18N
-static reg_errcode_t build_equiv_class (re_bitset_ptr_t sbcset,
+static reg_errcode_t build_equiv_class (bitset_t sbcset,
 					re_charset_t *mbcset,
 					int *equiv_class_alloc,
 					const unsigned char *name);
-static reg_errcode_t build_charclass (unsigned RE_TRANSLATE_TYPE trans,
-				      re_bitset_ptr_t sbcset,
+static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
+				      bitset_t sbcset,
 				      re_charset_t *mbcset,
 				      int *char_class_alloc,
 				      const char *class_name,
 				      reg_syntax_t syntax);
 #else  /* not RE_ENABLE_I18N */
-static reg_errcode_t build_equiv_class (re_bitset_ptr_t sbcset,
+static reg_errcode_t build_equiv_class (bitset_t sbcset,
 					const unsigned char *name);
-static reg_errcode_t build_charclass (unsigned RE_TRANSLATE_TYPE trans,
-				      re_bitset_ptr_t sbcset,
+static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
+				      bitset_t sbcset,
 				      const char *class_name,
 				      reg_syntax_t syntax);
 #endif /* not RE_ENABLE_I18N */
 static bin_tree_t *build_charclass_op (re_dfa_t *dfa,
-				       unsigned RE_TRANSLATE_TYPE trans,
+				       RE_TRANSLATE_TYPE trans,
 				       const char *class_name,
 				       const char *extra,
 				       int non_match, reg_errcode_t *err);
@@ -154,59 +126,58 @@ static reg_errcode_t mark_opt_subexp (void *extra, bin_tree_t *node);
    POSIX doesn't require that we do anything for REG_NOERROR,
    but why not be nice?  */
 
-const ERRMSG_TYPE __re_error_msgid[] attribute_hidden =
+const char __re_error_msgid[] attribute_hidden =
   {
 #define REG_NOERROR_IDX	0
     gettext_noop ("Success")	/* REG_NOERROR */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success")
     gettext_noop ("No match")	/* REG_NOMATCH */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_BADPAT_IDX	(REG_NOMATCH_IDX + sizeof "No match")
     gettext_noop ("Invalid regular expression") /* REG_BADPAT */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression")
     gettext_noop ("Invalid collation character") /* REG_ECOLLATE */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_ECTYPE_IDX	(REG_ECOLLATE_IDX + sizeof "Invalid collation character")
     gettext_noop ("Invalid character class name") /* REG_ECTYPE */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_EESCAPE_IDX	(REG_ECTYPE_IDX + sizeof "Invalid character class name")
     gettext_noop ("Trailing backslash") /* REG_EESCAPE */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_ESUBREG_IDX	(REG_EESCAPE_IDX + sizeof "Trailing backslash")
     gettext_noop ("Invalid back reference") /* REG_ESUBREG */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_EBRACK_IDX	(REG_ESUBREG_IDX + sizeof "Invalid back reference")
     gettext_noop ("Unmatched [ or [^")	/* REG_EBRACK */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
     gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_EBRACE_IDX	(REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
     gettext_noop ("Unmatched \\{") /* REG_EBRACE */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_BADBR_IDX	(REG_EBRACE_IDX + sizeof "Unmatched \\{")
     gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_ERANGE_IDX	(REG_BADBR_IDX + sizeof "Invalid content of \\{\\}")
     gettext_noop ("Invalid range end")	/* REG_ERANGE */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_ESPACE_IDX	(REG_ERANGE_IDX + sizeof "Invalid range end")
     gettext_noop ("Memory exhausted") /* REG_ESPACE */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_BADRPT_IDX	(REG_ESPACE_IDX + sizeof "Memory exhausted")
     gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_EEND_IDX	(REG_BADRPT_IDX + sizeof "Invalid preceding regular expression")
     gettext_noop ("Premature end of regular expression") /* REG_EEND */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_ESIZE_IDX	(REG_EEND_IDX + sizeof "Premature end of regular expression")
     gettext_noop ("Regular expression too big") /* REG_ESIZE */
-    ERRMSG_SEPARATOR
+    "\0"
 #define REG_ERPAREN_IDX	(REG_ESIZE_IDX + sizeof "Regular expression too big")
     gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
-    ERRMSG_SEPARATOR
   };
 
 const size_t __re_error_msgid_idx[] attribute_hidden =
@@ -259,7 +230,7 @@ re_compile_pattern (pattern, length, bufp)
 
   if (!ret)
     return NULL;
-  return gettext (RE_ERRMSG(ret));
+  return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
 }
 #ifdef _LIBC
 weak_alias (__re_compile_pattern, re_compile_pattern)
@@ -328,12 +299,10 @@ re_set_fastmap (char *fastmap, int icase, int ch)
    Compile fastmap for the initial_state INIT_STATE.  */
 
 static void
-re_compile_fastmap_iter (bufp, init_state, fastmap)
-     regex_t *bufp;
-     const re_dfastate_t *init_state;
-     char *fastmap;
+re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
+			 char *fastmap)
 {
-  re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
+  volatile re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
   int node_cnt;
   int icase = (dfa->mb_cur_max == 1 && (bufp->syntax & RE_ICASE));
   for (node_cnt = 0; node_cnt < init_state->nodes.nelem; ++node_cnt)
@@ -357,10 +326,11 @@ re_compile_fastmap_iter (bufp, init_state, fastmap)
 		     &&	dfa->nodes[node].type == CHARACTER
 		     && dfa->nodes[node].mb_partial)
 		*p++ = dfa->nodes[node].opr.c;
-	      memset (&state, 0, sizeof (state));
+	      memset (&state, '\0', sizeof (state));
 	      if (mbrtowc (&wc, (const char *) buf, p - buf,
 			   &state) == p - buf
-		  && __wcrtomb ((char *) buf, towlower (wc), &state) > 0)
+		  && (__wcrtomb ((char *) buf, towlower (wc), &state)
+		      != (size_t) -1))
 		re_set_fastmap (fastmap, 0, buf[0]);
 	      re_free (buf);
 	    }
@@ -368,11 +338,15 @@ re_compile_fastmap_iter (bufp, init_state, fastmap)
 	}
       else if (type == SIMPLE_BRACKET)
 	{
-	  int i, j, ch;
-	  for (i = 0, ch = 0; i < BITSET_UINTS; ++i)
-	    for (j = 0; j < UINT_BITS; ++j, ++ch)
-	      if (dfa->nodes[node].opr.sbcset[i] & (1 << j))
-		re_set_fastmap (fastmap, icase, ch);
+	  int i, ch;
+	  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
+	    {
+	      int j;
+	      bitset_word_t w = dfa->nodes[node].opr.sbcset[i];
+	      for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
+		if (w & ((bitset_word_t) 1 << j))
+		  re_set_fastmap (fastmap, icase, ch);
+	    }
 	}
 #ifdef RE_ENABLE_I18N
       else if (type == COMPLEX_BRACKET)
@@ -391,19 +365,21 @@ re_compile_fastmap_iter (bufp, init_state, fastmap)
 			  is a valid collation element, and don't catch
 			  'b' since 'b' is the only collation element
 			  which starts from 'b'.  */
-		  int j, ch;
 		  const int32_t *table = (const int32_t *)
 		    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
-		  for (i = 0, ch = 0; i < BITSET_UINTS; ++i)
-		    for (j = 0; j < UINT_BITS; ++j, ++ch)
-		      if (table[ch] < 0)
-			re_set_fastmap (fastmap, icase, ch);
+		  for (i = 0; i < SBC_MAX; ++i)
+		    if (table[i] < 0)
+		      re_set_fastmap (fastmap, icase, i);
 		}
 # else
 	      if (dfa->mb_cur_max > 1)
-		for (i = 0; i < SBC_MAX; ++i)
-		  if (__btowc (i) == WEOF)
+		for (i = 0; i < SBC_MAX; ++i) {
+		  wint_t wc;
+		  wc = __btowc (i);
+
+		  if (wc == WEOF || wc >= SBC_MAX)
 		    re_set_fastmap (fastmap, icase, i);
+		}
 # endif /* not _LIBC */
 	    }
 	  for (i = 0; i < cset->nmbchars; ++i)
@@ -411,12 +387,13 @@ re_compile_fastmap_iter (bufp, init_state, fastmap)
 	      char buf[256];
 	      mbstate_t state;
 	      memset (&state, '\0', sizeof (state));
-	      __wcrtomb (buf, cset->mbchars[i], &state);
-	      re_set_fastmap (fastmap, icase, *(unsigned char *) buf);
+	      if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1)
+		re_set_fastmap (fastmap, icase, *(unsigned char *) buf);
 	      if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
 		{
-		  __wcrtomb (buf, towlower (cset->mbchars[i]), &state);
-		  re_set_fastmap (fastmap, 0, *(unsigned char *) buf);
+		  if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state)
+		      != (size_t) -1)
+		    re_set_fastmap (fastmap, 0, *(unsigned char *) buf);
 		}
 	    }
 	}
@@ -536,8 +513,8 @@ weak_alias (__regcomp, regcomp)
 size_t
 regerror (errcode, preg, errbuf, errbuf_size)
     int errcode;
-    const regex_t *preg;
-    char *errbuf;
+    const regex_t *__restrict preg;
+    char *__restrict errbuf;
     size_t errbuf_size;
 {
   const char *msg;
@@ -552,7 +529,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
        Dump core so we can fix it.  */
     abort ();
 
-  msg = gettext (RE_ERRMSG(errcode));
+  msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
 
   msg_size = strlen (msg) + 1; /* Includes the null.  */
 
@@ -579,16 +556,15 @@ weak_alias (__regerror, regerror)
    UTF-8 is used.  Otherwise we would allocate memory just to initialize
    it the same all the time.  UTF-8 is the preferred encoding so this is
    a worthwhile optimization.  */
-static const bitset utf8_sb_map =
-{
+#if __GNUC__ >= 3
+static const bitset_t utf8_sb_map = {
   /* Set the first 128 bits.  */
-# if UINT_MAX == 0xffffffff
-  0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
-# else
-#  error "Add case for new unsigned int size"
-# endif
+  [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
 };
-#endif
+#else /* ! (__GNUC__ >= 3) */
+static bitset_t utf8_sb_map;
+#endif /* __GNUC__ >= 3 */
+#endif /* RE_ENABLE_I18N */
 
 
 static void
@@ -702,7 +678,8 @@ re_comp (s)
     {
       re_comp_buf.fastmap = (char *) malloc (SBC_MAX);
       if (re_comp_buf.fastmap == NULL)
-	return (char *) gettext (RE_ERRMSG(REG_ESPACE_IDX));
+	return (char *) gettext (__re_error_msgid
+				 + __re_error_msgid_idx[(int) REG_ESPACE]);
     }
 
   /* Since `re_exec' always passes NULL for the `regs' argument, we
@@ -717,7 +694,7 @@ re_comp (s)
     return NULL;
 
   /* Yes, we're discarding `const' here if !HAVE_LIBINTL.  */
-  return (char *) gettext (RE_ERRMSG(ret));
+  return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
 }
 
 #ifdef _LIBC
@@ -734,11 +711,8 @@ libc_freeres_fn (free_mem)
    SYNTAX indicate regular expression's syntax.  */
 
 static reg_errcode_t
-re_compile_internal (preg, pattern, length, syntax)
-     regex_t *preg;
-     const char * pattern;
-     int length;
-     reg_syntax_t syntax;
+re_compile_internal (regex_t *preg, const char * pattern, size_t length,
+		     reg_syntax_t syntax)
 {
   reg_errcode_t err = REG_NOERROR;
   re_dfa_t *dfa;
@@ -778,10 +752,13 @@ re_compile_internal (preg, pattern, length, syntax)
       return err;
     }
 #ifdef DEBUG
+  /* Note: length+1 will not overflow since it is checked in init_dfa.  */
   dfa->re_str = re_malloc (char, length + 1);
   strncpy (dfa->re_str, pattern, length + 1);
 #endif
 
+  __libc_lock_init (dfa->lock);
+
   err = re_string_construct (&regexp, pattern, length, preg->translate,
 			     syntax & RE_ICASE, dfa);
   if (BE (err != REG_NOERROR, 0))
@@ -833,11 +810,9 @@ re_compile_internal (preg, pattern, length, syntax)
    as the initial length of some arrays.  */
 
 static reg_errcode_t
-init_dfa (dfa, pat_len)
-     re_dfa_t *dfa;
-     int pat_len;
+init_dfa (re_dfa_t *dfa, size_t pat_len)
 {
-  int table_size;
+  unsigned int table_size;
 #ifndef _LIBC
   char *codeset_name;
 #endif
@@ -847,13 +822,15 @@ init_dfa (dfa, pat_len)
   /* Force allocation of str_tree_storage the first time.  */
   dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
 
+  /* Avoid overflows.  */
+  if (pat_len == SIZE_MAX)
+    return REG_ESPACE;
+
   dfa->nodes_alloc = pat_len + 1;
   dfa->nodes = re_malloc (re_token_t, dfa->nodes_alloc);
 
-  dfa->states_alloc = pat_len + 1;
-
   /*  table_size = 2 ^ ceil(log pat_len) */
-  for (table_size = 1; table_size > 0; table_size <<= 1)
+  for (table_size = 1; ; table_size <<= 1)
     if (table_size > pat_len)
       break;
 
@@ -906,27 +883,38 @@ init_dfa (dfa, pat_len)
   if (dfa->mb_cur_max > 1)
     {
       if (dfa->is_utf8)
-	dfa->sb_char = (re_bitset_ptr_t) utf8_sb_map;
+        {
+#if !defined(__GNUC__) || __GNUC__ < 3
+	  static short utf8_sb_map_inited = 0;
+
+	  if (! utf8_sb_map_inited)
+	    {
+		int i;
+
+	  	utf8_sb_map_inited = 0;
+		for (i = 0; i <= 0x80 / BITSET_WORD_BITS - 1; i++)
+		  utf8_sb_map[i] = BITSET_WORD_MAX;
+	    }
+#endif
+	  dfa->sb_char = (re_bitset_ptr_t) utf8_sb_map;
+	}
       else
 	{
 	  int i, j, ch;
 
-	  dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset), 1);
+	  dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
 	  if (BE (dfa->sb_char == NULL, 0))
 	    return REG_ESPACE;
 
-	  /* Clear all bits by, then set those corresponding to single
-	     byte chars.  */
-	  bitset_empty (dfa->sb_char);
-
-	  for (i = 0, ch = 0; i < BITSET_UINTS; ++i)
-	    for (j = 0; j < UINT_BITS; ++j, ++ch)
+	  /* Set the bits corresponding to single byte chars.  */
+	  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
+	    for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
 	      {
-		wchar_t wch = __btowc (ch);
+		wint_t wch = __btowc (ch);
 		if (wch != WEOF)
-		  dfa->sb_char[i] |= 1 << j;
+		  dfa->sb_char[i] |= (bitset_word_t) 1 << j;
 # ifndef _LIBC
-		if (isascii (ch) && wch != (wchar_t) ch)
+		if (isascii (ch) && wch != ch)
 		  dfa->map_notascii = 1;
 # endif
 	      }
@@ -944,22 +932,21 @@ init_dfa (dfa, pat_len)
    character used by some operators like "\<", "\>", etc.  */
 
 static void
-init_word_char (dfa)
-     re_dfa_t *dfa;
+internal_function
+init_word_char (re_dfa_t *dfa)
 {
   int i, j, ch;
   dfa->word_ops_used = 1;
-  for (i = 0, ch = 0; i < BITSET_UINTS; ++i)
-    for (j = 0; j < UINT_BITS; ++j, ++ch)
+  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
+    for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
       if (isalnum (ch) || ch == '_')
-	dfa->word_char[i] |= 1 << j;
+	dfa->word_char[i] |= (bitset_word_t) 1 << j;
 }
 
 /* Free the work area which are only used while compiling.  */
 
 static void
-free_workarea_compile (preg)
-     regex_t *preg;
+free_workarea_compile (regex_t *preg)
 {
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_storage_t *storage, *next;
@@ -978,8 +965,7 @@ free_workarea_compile (preg)
 /* Create initial states for all contexts.  */
 
 static reg_errcode_t
-create_initial_state (dfa)
-     re_dfa_t *dfa;
+create_initial_state (re_dfa_t *dfa)
 {
   int first, i;
   reg_errcode_t err;
@@ -1061,8 +1047,7 @@ create_initial_state (dfa)
    DFA nodes where needed.  */
 
 static void
-optimize_utf8 (dfa)
-     re_dfa_t *dfa;
+optimize_utf8 (re_dfa_t *dfa)
 {
   int node, i, mb_chars = 0, has_period = 0;
 
@@ -1099,8 +1084,9 @@ optimize_utf8 (dfa)
       case COMPLEX_BRACKET:
 	return;
       case SIMPLE_BRACKET:
-	/* Just double check.  */
-        for (i = 0x80 / UINT_BITS; i < BITSET_UINTS; ++i)
+	/* Just double check.  The non-ASCII range starts at 0x80.  */
+	assert (0x80 % BITSET_WORD_BITS == 0);
+        for (i = 0x80 / BITSET_WORD_BITS; i < BITSET_WORDS; ++i)
 	  if (dfa->nodes[node].opr.sbcset[i])
 	    return;
 	break;
@@ -1129,8 +1115,7 @@ optimize_utf8 (dfa)
    "eclosure", and "inveclosure".  */
 
 static reg_errcode_t
-analyze (preg)
-     regex_t *preg;
+analyze (regex_t *preg)
 {
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   reg_errcode_t ret;
@@ -1193,10 +1178,8 @@ analyze (preg)
    implement parse tree visits.  Instead, we use parent pointers and
    some hairy code in these two functions.  */
 static reg_errcode_t
-postorder (root, fn, extra)
-     bin_tree_t *root;
-     reg_errcode_t (fn (void *, bin_tree_t *));
-     void *extra;
+postorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
+	   void *extra)
 {
   bin_tree_t *node, *prev;
 
@@ -1227,10 +1210,8 @@ postorder (root, fn, extra)
 }
 
 static reg_errcode_t
-preorder (root, fn, extra)
-     bin_tree_t *root;
-     reg_errcode_t (fn (void *, bin_tree_t *));
-     void *extra;
+preorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
+	  void *extra)
 {
   bin_tree_t *node;
 
@@ -1262,9 +1243,7 @@ preorder (root, fn, extra)
    re_search_internal to map the inner one's opr.idx to this one's.  Adjust
    backreferences as well.  Requires a preorder visit.  */
 static reg_errcode_t
-optimize_subexps (extra, node)
-     void *extra;
-     bin_tree_t *node;
+optimize_subexps (void *extra, bin_tree_t *node)
 {
   re_dfa_t *dfa = (re_dfa_t *) extra;
 
@@ -1285,8 +1264,8 @@ optimize_subexps (extra, node)
         node->left->parent = node;
 
       dfa->subexp_map[other_idx] = dfa->subexp_map[node->token.opr.idx];
-      if (other_idx < 8 * sizeof (dfa->used_bkref_map))
-	dfa->used_bkref_map &= ~(1 << other_idx);
+      if (other_idx < BITSET_WORD_BITS)
+	  dfa->used_bkref_map &= ~((bitset_word_t) 1 << other_idx);
     }
 
   return REG_NOERROR;
@@ -1295,9 +1274,7 @@ optimize_subexps (extra, node)
 /* Lowering pass: Turn each SUBEXP node into the appropriate concatenation
    of OP_OPEN_SUBEXP, the body of the SUBEXP (if any) and OP_CLOSE_SUBEXP.  */
 static reg_errcode_t
-lower_subexps (extra, node)
-     void *extra;
-     bin_tree_t *node;
+lower_subexps (void *extra, bin_tree_t *node)
 {
   regex_t *preg = (regex_t *) extra;
   reg_errcode_t err = REG_NOERROR;
@@ -1319,18 +1296,21 @@ lower_subexps (extra, node)
 }
 
 static bin_tree_t *
-lower_subexp (err, preg, node)
-     reg_errcode_t *err;
-     regex_t *preg;
-     bin_tree_t *node;
+lower_subexp (reg_errcode_t *err, regex_t *preg, bin_tree_t *node)
 {
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *body = node->left;
   bin_tree_t *op, *cls, *tree1, *tree;
 
   if (preg->no_sub
-      && (node->token.opr.idx >= 8 * sizeof (dfa->used_bkref_map)
-	  || !(dfa->used_bkref_map & (1 << node->token.opr.idx))))
+      /* We do not optimize empty subexpressions, because otherwise we may
+	 have bad CONCAT nodes with NULL children.  This is obviously not
+	 very common, so we do not lose much.  An example that triggers
+	 this case is the sed "script" /\(\)/x.  */
+      && node->left != NULL
+      && (node->token.opr.idx >= BITSET_WORD_BITS
+	  || !(dfa->used_bkref_map
+	       & ((bitset_word_t) 1 << node->token.opr.idx))))
     return node->left;
 
   /* Convert the SUBEXP node to the concatenation of an
@@ -1353,9 +1333,7 @@ lower_subexp (err, preg, node)
 /* Pass 1 in building the NFA: compute FIRST and create unlinked automaton
    nodes.  Requires a postorder visit.  */
 static reg_errcode_t
-calc_first (extra, node)
-     void *extra;
-     bin_tree_t *node;
+calc_first (void *extra, bin_tree_t *node)
 {
   re_dfa_t *dfa = (re_dfa_t *) extra;
   if (node->token.type == CONCAT)
@@ -1375,9 +1353,7 @@ calc_first (extra, node)
 
 /* Pass 2: compute NEXT on the tree.  Preorder visit.  */
 static reg_errcode_t
-calc_next (extra, node)
-     void *extra;
-     bin_tree_t *node;
+calc_next (void *extra, bin_tree_t *node)
 {
   switch (node->token.type)
     {
@@ -1400,9 +1376,7 @@ calc_next (extra, node)
 
 /* Pass 3: link all DFA nodes to their NEXT node (any order will do).  */
 static reg_errcode_t
-link_nfa_nodes (extra, node)
-     void *extra;
-     bin_tree_t *node;
+link_nfa_nodes (void *extra, bin_tree_t *node)
 {
   re_dfa_t *dfa = (re_dfa_t *) extra;
   int idx = node->node_idx;
@@ -1462,13 +1436,10 @@ link_nfa_nodes (extra, node)
    to their own constraint.  */
 
 static reg_errcode_t
-duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
-			init_constraint)
-     re_dfa_t *dfa;
-     int top_org_node, top_clone_node, root_node;
-     unsigned int init_constraint;
+internal_function
+duplicate_node_closure (re_dfa_t *dfa, int top_org_node, int top_clone_node,
+			int root_node, unsigned int init_constraint)
 {
-  reg_errcode_t err;
   int org_node, clone_node, ret;
   unsigned int constraint = init_constraint;
   for (org_node = top_org_node, clone_node = top_clone_node;;)
@@ -1482,9 +1453,9 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
 	     edests of the back reference.  */
 	  org_dest = dfa->nexts[org_node];
 	  re_node_set_empty (dfa->edests + clone_node);
-	  err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
-	  if (BE (err != REG_NOERROR, 0))
-	    return err;
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == -1, 0))
+	    return REG_ESPACE;
 	  dfa->nexts[clone_node] = dfa->nexts[org_node];
 	  ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
 	  if (BE (ret < 0, 0))
@@ -1520,9 +1491,9 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
 		}
 	      constraint |= dfa->nodes[org_node].opr.ctx_type;
 	    }
-	  err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
-	  if (BE (err != REG_NOERROR, 0))
-	    return err;
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == -1, 0))
+	    return REG_ESPACE;
 	  ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
 	  if (BE (ret < 0, 0))
 	    return REG_ESPACE;
@@ -1538,9 +1509,10 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
 	  if (clone_dest == -1)
 	    {
 	      /* There are no such a duplicated node, create a new one.  */
-	      err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
-	      if (BE (err != REG_NOERROR, 0))
-		return err;
+	      reg_errcode_t err;
+	      clone_dest = duplicate_node (dfa, org_dest, constraint);
+	      if (BE (clone_dest == -1, 0))
+		return REG_ESPACE;
 	      ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
 	      if (BE (ret < 0, 0))
 		return REG_ESPACE;
@@ -1559,9 +1531,9 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
 	    }
 
 	  org_dest = dfa->edests[org_node].elems[1];
-	  err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
-	  if (BE (err != REG_NOERROR, 0))
-	    return err;
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == -1, 0))
+	    return REG_ESPACE;
 	  ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
 	  if (BE (ret < 0, 0))
 	    return REG_ESPACE;
@@ -1576,10 +1548,8 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
    satisfies the constraint CONSTRAINT.  */
 
 static int
-search_duplicated_node (dfa, org_node, constraint)
-     re_dfa_t *dfa;
-     int org_node;
-     unsigned int constraint;
+search_duplicated_node (const re_dfa_t *dfa, int org_node,
+			unsigned int constraint)
 {
   int idx;
   for (idx = dfa->nodes_len - 1; dfa->nodes[idx].duplicated && idx > 0; --idx)
@@ -1592,32 +1562,28 @@ search_duplicated_node (dfa, org_node, constraint)
 }
 
 /* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
-   The new index will be stored in NEW_IDX and return REG_NOERROR if succeeded,
-   otherwise return the error code.  */
+   Return the index of the new node, or -1 if insufficient storage is
+   available.  */
 
-static reg_errcode_t
-duplicate_node (new_idx, dfa, org_idx, constraint)
-     re_dfa_t *dfa;
-     int *new_idx, org_idx;
-     unsigned int constraint;
+static int
+duplicate_node (re_dfa_t *dfa, int org_idx, unsigned int constraint)
 {
   int dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
-  if (BE (dup_idx == -1, 0))
-    return REG_ESPACE;
-  dfa->nodes[dup_idx].constraint = constraint;
-  if (dfa->nodes[org_idx].type == ANCHOR)
-    dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].opr.ctx_type;
-  dfa->nodes[dup_idx].duplicated = 1;
-
-  /* Store the index of the original node.  */
-  dfa->org_indices[dup_idx] = org_idx;
-  *new_idx = dup_idx;
-  return REG_NOERROR;
+  if (BE (dup_idx != -1, 1))
+    {
+      dfa->nodes[dup_idx].constraint = constraint;
+      if (dfa->nodes[org_idx].type == ANCHOR)
+	dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].opr.ctx_type;
+      dfa->nodes[dup_idx].duplicated = 1;
+
+      /* Store the index of the original node.  */
+      dfa->org_indices[dup_idx] = org_idx;
+    }
+  return dup_idx;
 }
 
 static reg_errcode_t
-calc_inveclosure (dfa)
-     re_dfa_t *dfa;
+calc_inveclosure (re_dfa_t *dfa)
 {
   int src, idx, ret;
   for (idx = 0; idx < dfa->nodes_len; ++idx)
@@ -1640,8 +1606,7 @@ calc_inveclosure (dfa)
 /* Calculate "eclosure" for all the node in DFA.  */
 
 static reg_errcode_t
-calc_eclosure (dfa)
-     re_dfa_t *dfa;
+calc_eclosure (re_dfa_t *dfa)
 {
   int node_idx, incomplete;
 #ifdef DEBUG
@@ -1685,10 +1650,7 @@ calc_eclosure (dfa)
 /* Calculate epsilon closure of NODE.  */
 
 static reg_errcode_t
-calc_eclosure_iter (new_set, dfa, node, root)
-     re_node_set *new_set;
-     re_dfa_t *dfa;
-     int node, root;
+calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root)
 {
   reg_errcode_t err;
   unsigned int constraint;
@@ -1711,8 +1673,6 @@ calc_eclosure_iter (new_set, dfa, node, root)
       && dfa->edests[node].nelem
       && !dfa->nodes[dfa->edests[node].elems[0]].duplicated)
     {
-      int org_node, cur_node;
-      org_node = cur_node = node;
       err = duplicate_node_closure (dfa, node, node, node, constraint);
       if (BE (err != REG_NOERROR, 0))
 	return err;
@@ -1768,10 +1728,8 @@ calc_eclosure_iter (new_set, dfa, node, root)
    We must not use this function inside bracket expressions.  */
 
 static void
-fetch_token (result, input, syntax)
-     re_token_t *result;
-     re_string_t *input;
-     reg_syntax_t syntax;
+internal_function
+fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax)
 {
   re_string_skip_bytes (input, peek_token (result, input, syntax));
 }
@@ -1780,10 +1738,8 @@ fetch_token (result, input, syntax)
    We must not use this function inside bracket expressions.  */
 
 static int
-peek_token (token, input, syntax)
-     re_token_t *token;
-     re_string_t *input;
-     reg_syntax_t syntax;
+internal_function
+peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
 {
   unsigned char c;
 
@@ -2023,10 +1979,8 @@ peek_token (token, input, syntax)
    We must not use this function out of bracket expressions.  */
 
 static int
-peek_token_bracket (token, input, syntax)
-     re_token_t *token;
-     re_string_t *input;
-     reg_syntax_t syntax;
+internal_function
+peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
 {
   unsigned char c;
   if (re_string_eoi (input))
@@ -2122,11 +2076,8 @@ peek_token_bracket (token, input, syntax)
    EOR means end of regular expression.  */
 
 static bin_tree_t *
-parse (regexp, preg, syntax, err)
-     re_string_t *regexp;
-     regex_t *preg;
-     reg_syntax_t syntax;
-     reg_errcode_t *err;
+parse (re_string_t *regexp, regex_t *preg, reg_syntax_t syntax,
+       reg_errcode_t *err)
 {
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *tree, *eor, *root;
@@ -2159,13 +2110,8 @@ parse (regexp, preg, syntax, err)
    ALT means alternative, which represents the operator `|'.  */
 
 static bin_tree_t *
-parse_reg_exp (regexp, preg, token, syntax, nest, err)
-     re_string_t *regexp;
-     regex_t *preg;
-     re_token_t *token;
-     reg_syntax_t syntax;
-     int nest;
-     reg_errcode_t *err;
+parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	       reg_syntax_t syntax, int nest, reg_errcode_t *err)
 {
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *tree, *branch = NULL;
@@ -2205,13 +2151,8 @@ parse_reg_exp (regexp, preg, token, syntax, nest, err)
    CAT means concatenation.  */
 
 static bin_tree_t *
-parse_branch (regexp, preg, token, syntax, nest, err)
-     re_string_t *regexp;
-     regex_t *preg;
-     re_token_t *token;
-     reg_syntax_t syntax;
-     int nest;
-     reg_errcode_t *err;
+parse_branch (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	      reg_syntax_t syntax, int nest, reg_errcode_t *err)
 {
   bin_tree_t *tree, *exp;
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
@@ -2250,13 +2191,8 @@ parse_branch (regexp, preg, token, syntax, nest, err)
 */
 
 static bin_tree_t *
-parse_expression (regexp, preg, token, syntax, nest, err)
-     re_string_t *regexp;
-     regex_t *preg;
-     re_token_t *token;
-     reg_syntax_t syntax;
-     int nest;
-     reg_errcode_t *err;
+parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
+		  reg_syntax_t syntax, int nest, reg_errcode_t *err)
 {
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *tree;
@@ -2414,8 +2350,8 @@ parse_expression (regexp, preg, token, syntax, nest, err)
     case OP_WORD:
     case OP_NOTWORD:
       tree = build_charclass_op (dfa, regexp->trans,
-				 (const char *) "alnum",
-				 (const char *) "_",
+				 "alnum",
+				 "_",
 				 token->type == OP_NOTWORD, err);
       if (BE (*err != REG_NOERROR && tree == NULL, 0))
 	return NULL;
@@ -2423,8 +2359,8 @@ parse_expression (regexp, preg, token, syntax, nest, err)
     case OP_SPACE:
     case OP_NOTSPACE:
       tree = build_charclass_op (dfa, regexp->trans,
-				 (const char *) "space",
-				 (const char *) "",
+				 "space",
+				 "",
 				 token->type == OP_NOTSPACE, err);
       if (BE (*err != REG_NOERROR && tree == NULL, 0))
 	return NULL;
@@ -2471,13 +2407,8 @@ parse_expression (regexp, preg, token, syntax, nest, err)
 */
 
 static bin_tree_t *
-parse_sub_exp (regexp, preg, token, syntax, nest, err)
-     re_string_t *regexp;
-     regex_t *preg;
-     re_token_t *token;
-     reg_syntax_t syntax;
-     int nest;
-     reg_errcode_t *err;
+parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	       reg_syntax_t syntax, int nest, reg_errcode_t *err)
 {
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
   bin_tree_t *tree;
@@ -2497,7 +2428,9 @@ parse_sub_exp (regexp, preg, token, syntax, nest, err)
       if (BE (*err != REG_NOERROR, 0))
 	return NULL;
     }
-  dfa->completed_bkref_map |= 1 << cur_nsub;
+
+  if (cur_nsub <= '9' - '1')
+    dfa->completed_bkref_map |= 1 << cur_nsub;
 
   tree = create_tree (dfa, tree, NULL, SUBEXP);
   if (BE (tree == NULL, 0))
@@ -2512,13 +2445,8 @@ parse_sub_exp (regexp, preg, token, syntax, nest, err)
 /* This function parse repetition operators like "*", "+", "{1,3}" etc.  */
 
 static bin_tree_t *
-parse_dup_op (elem, regexp, dfa, token, syntax, err)
-     bin_tree_t *elem;
-     re_string_t *regexp;
-     re_dfa_t *dfa;
-     re_token_t *token;
-     reg_syntax_t syntax;
-     reg_errcode_t *err;
+parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
+	      re_token_t *token, reg_syntax_t syntax, reg_errcode_t *err)
 {
   bin_tree_t *tree = NULL, *old_tree = NULL;
   int i, start, end, start_idx = re_string_cur_idx (regexp);
@@ -2663,15 +2591,14 @@ parse_dup_op (elem, regexp, dfa, token, syntax, err)
      update it.  */
 
 static reg_errcode_t
+internal_function
 # ifdef RE_ENABLE_I18N
-build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
-     re_charset_t *mbcset;
-     int *range_alloc;
+build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc,
+		 bracket_elem_t *start_elem, bracket_elem_t *end_elem)
 # else /* not RE_ENABLE_I18N */
-build_range_exp (sbcset, start_elem, end_elem)
+build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,
+		 bracket_elem_t *end_elem)
 # endif /* not RE_ENABLE_I18N */
-     re_bitset_ptr_t sbcset;
-     bracket_elem_t *start_elem, *end_elem;
 {
   unsigned int start_ch, end_ch;
   /* Equivalence Classes and Character Classes can't be a range start/end.  */
@@ -2690,7 +2617,9 @@ build_range_exp (sbcset, start_elem, end_elem)
 
 # ifdef RE_ENABLE_I18N
   {
-    wchar_t wc, start_wc, end_wc;
+    wchar_t wc;
+    wint_t start_wc;
+    wint_t end_wc;
     wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'};
 
     start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch
@@ -2699,10 +2628,22 @@ build_range_exp (sbcset, start_elem, end_elem)
     end_ch = ((end_elem->type == SB_CHAR) ? end_elem->opr.ch
 	      : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
 		 : 0));
+#ifdef GAWK
+    /*
+     * Fedora Core 2, maybe others, have broken `btowc' that returns -1
+     * for any value > 127. Sigh. Note that `start_ch' and `end_ch' are
+     * unsigned, so we don't have sign extension problems.
+     */
+    start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
+		? start_ch : start_elem->opr.wch);
+    end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
+	      ? end_ch : end_elem->opr.wch);
+#else
     start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
 		? __btowc (start_ch) : start_elem->opr.wch);
     end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
 	      ? __btowc (end_ch) : end_elem->opr.wch);
+#endif
     if (start_wc == WEOF || end_wc == WEOF)
       return REG_ECOLLATE;
     cmp_buf[0] = start_wc;
@@ -2783,15 +2724,13 @@ build_range_exp (sbcset, start_elem, end_elem)
    pointer argument since we may update it.  */
 
 static reg_errcode_t
+internal_function
 # ifdef RE_ENABLE_I18N
-build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
-     re_charset_t *mbcset;
-     int *coll_sym_alloc;
+build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
+			int *coll_sym_alloc, const unsigned char *name)
 # else /* not RE_ENABLE_I18N */
-build_collating_symbol (sbcset, name)
+build_collating_symbol (bitset_t sbcset, const unsigned char *name)
 # endif /* not RE_ENABLE_I18N */
-     re_bitset_ptr_t sbcset;
-     const unsigned char *name;
 {
   size_t name_len = strlen ((const char *) name);
   if (BE (name_len != 1, 0))
@@ -2808,12 +2747,8 @@ build_collating_symbol (sbcset, name)
    "[[.a-a.]]" etc.  */
 
 static bin_tree_t *
-parse_bracket_exp (regexp, dfa, token, syntax, err)
-     re_string_t *regexp;
-     re_dfa_t *dfa;
-     re_token_t *token;
-     reg_syntax_t syntax;
-     reg_errcode_t *err;
+parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
+		   reg_syntax_t syntax, reg_errcode_t *err)
 {
 #ifdef _LIBC
   const unsigned char *collseqmb;
@@ -2835,23 +2770,28 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
     {
       int32_t hash = elem_hash ((const char *) name, name_len);
       int32_t elem = hash % table_size;
-      int32_t second = hash % (table_size - 2);
-      while (symb_table[2 * elem] != 0)
-	{
-	  /* First compare the hashing value.  */
-	  if (symb_table[2 * elem] == hash
-	      /* Compare the length of the name.  */
-	      && name_len == extra[symb_table[2 * elem + 1]]
-	      /* Compare the name.  */
-	      && memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
-			 name_len) == 0)
+      if (symb_table[2 * elem] != 0)
+	{
+	  int32_t second = hash % (table_size - 2) + 1;
+
+	  do
 	    {
-	      /* Yep, this is the entry.  */
-	      break;
-	    }
+	      /* First compare the hashing value.  */
+	      if (symb_table[2 * elem] == hash
+		  /* Compare the length of the name.  */
+		  && name_len == extra[symb_table[2 * elem + 1]]
+		  /* Compare the name.  */
+		  && memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
+			     name_len) == 0)
+		{
+		  /* Yep, this is the entry.  */
+		  break;
+		}
 
-	  /* Next entry.  */
-	  elem += second;
+	      /* Next entry.  */
+	      elem += second;
+	    }
+	  while (symb_table[2 * elem] != 0);
 	}
       return elem;
     }
@@ -2933,7 +2873,7 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
   build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
 	 re_charset_t *mbcset;
 	 int *range_alloc;
-	 re_bitset_ptr_t sbcset;
+	 bitset_t sbcset;
 	 bracket_elem_t *start_elem, *end_elem;
     {
       unsigned int ch;
@@ -3016,7 +2956,7 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
   build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
 	 re_charset_t *mbcset;
 	 int *coll_sym_alloc;
-	 re_bitset_ptr_t sbcset;
+	 bitset_t sbcset;
 	 const unsigned char *name;
     {
       int32_t elem, idx;
@@ -3093,7 +3033,7 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
       /*
       if (MB_CUR_MAX > 1)
       */
-	collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
+      collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
       table_size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_SYMB_HASH_SIZEMB);
       symb_table = (const int32_t *) _NL_CURRENT (LC_COLLATE,
 						  _NL_COLLATE_SYMB_TABLEMB);
@@ -3101,7 +3041,7 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
 						   _NL_COLLATE_SYMB_EXTRAMB);
     }
 #endif
-  sbcset = (re_bitset_ptr_t) calloc (sizeof (unsigned int), BITSET_UINTS);
+  sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
 #ifdef RE_ENABLE_I18N
   mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
 #endif /* RE_ENABLE_I18N */
@@ -3311,12 +3251,12 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
       mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
       if (BE (mbc_tree == NULL, 0))
 	goto parse_bracket_exp_espace;
-      for (sbc_idx = 0; sbc_idx < BITSET_UINTS; ++sbc_idx)
+      for (sbc_idx = 0; sbc_idx < BITSET_WORDS; ++sbc_idx)
 	if (sbcset[sbc_idx])
 	  break;
       /* If there are no bits set in sbcset, there is no point
 	 of having both SIMPLE_BRACKET and COMPLEX_BRACKET.  */
-      if (sbc_idx < BITSET_UINTS)
+      if (sbc_idx < BITSET_WORDS)
 	{
           /* Build a tree for simple bracket.  */
           br_token.type = SIMPLE_BRACKET;
@@ -3364,15 +3304,9 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
 /* Parse an element in the bracket expression.  */
 
 static reg_errcode_t
-parse_bracket_element (elem, regexp, token, token_len, dfa, syntax,
-		       accept_hyphen)
-     bracket_elem_t *elem;
-     re_string_t *regexp;
-     re_token_t *token;
-     int token_len;
-     re_dfa_t *dfa;
-     reg_syntax_t syntax;
-     int accept_hyphen;
+parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
+		       re_token_t *token, int token_len, re_dfa_t *dfa,
+		       reg_syntax_t syntax, int accept_hyphen)
 {
 #ifdef RE_ENABLE_I18N
   int cur_char_size;
@@ -3410,10 +3344,8 @@ parse_bracket_element (elem, regexp, token, token_len, dfa, syntax,
    [=<equivalent_class>=].  */
 
 static reg_errcode_t
-parse_bracket_symbol (elem, regexp, token)
-     bracket_elem_t *elem;
-     re_string_t *regexp;
-     re_token_t *token;
+parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
+		      re_token_t *token)
 {
   unsigned char ch, delim = token->opr.c;
   int i = 0;
@@ -3460,16 +3392,13 @@ parse_bracket_symbol (elem, regexp, token)
 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
-build_equiv_class (sbcset, mbcset, equiv_class_alloc, name)
-     re_charset_t *mbcset;
-     int *equiv_class_alloc;
+build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
+		   int *equiv_class_alloc, const unsigned char *name)
 #else /* not RE_ENABLE_I18N */
-build_equiv_class (sbcset, name)
+build_equiv_class (bitset_t sbcset, const unsigned char *name)
 #endif /* not RE_ENABLE_I18N */
-     re_bitset_ptr_t sbcset;
-     const unsigned char *name;
 {
-#if defined _LIBC
+#ifdef _LIBC
   uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
   if (nrules != 0)
     {
@@ -3555,16 +3484,13 @@ build_equiv_class (sbcset, name)
 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
-build_charclass (trans, sbcset, mbcset, char_class_alloc, class_name, syntax)
-     re_charset_t *mbcset;
-     int *char_class_alloc;
+build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
+		 re_charset_t *mbcset, int *char_class_alloc,
+		 const char *class_name, reg_syntax_t syntax)
 #else /* not RE_ENABLE_I18N */
-build_charclass (trans, sbcset, class_name, syntax)
+build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
+		 const char *class_name, reg_syntax_t syntax)
 #endif /* not RE_ENABLE_I18N */
-     unsigned RE_TRANSLATE_TYPE trans;
-     re_bitset_ptr_t sbcset;
-     const char *class_name;
-     reg_syntax_t syntax;
 {
   int i;
 
@@ -3593,45 +3519,50 @@ build_charclass (trans, sbcset, class_name, syntax)
 #endif /* RE_ENABLE_I18N */
 
 #define BUILD_CHARCLASS_LOOP(ctype_func)	\
-    for (i = 0; i < SBC_MAX; ++i)		\
+  do {						\
+    if (BE (trans != NULL, 0))			\
       {						\
-	if (ctype_func (i))			\
-	  {					\
-	    int ch = trans ? trans[i] : i;	\
-	    bitset_set (sbcset, ch);		\
-	  }					\
-      }
+	for (i = 0; i < SBC_MAX; ++i)		\
+  	  if (ctype_func (i))			\
+	    bitset_set (sbcset, trans[i]);	\
+      }						\
+    else					\
+      {						\
+	for (i = 0; i < SBC_MAX; ++i)		\
+  	  if (ctype_func (i))			\
+	    bitset_set (sbcset, i);		\
+      }						\
+  } while (0)
 
   if (strcmp (class_name, "alnum") == 0)
-    BUILD_CHARCLASS_LOOP (isalnum)
+    BUILD_CHARCLASS_LOOP (isalnum);
   else if (strcmp (class_name, "cntrl") == 0)
-    BUILD_CHARCLASS_LOOP (iscntrl)
+    BUILD_CHARCLASS_LOOP (iscntrl);
   else if (strcmp (class_name, "lower") == 0)
-    BUILD_CHARCLASS_LOOP (islower)
+    BUILD_CHARCLASS_LOOP (islower);
   else if (strcmp (class_name, "space") == 0)
-    BUILD_CHARCLASS_LOOP (isspace)
+    BUILD_CHARCLASS_LOOP (isspace);
   else if (strcmp (class_name, "alpha") == 0)
-    BUILD_CHARCLASS_LOOP (isalpha)
+    BUILD_CHARCLASS_LOOP (isalpha);
   else if (strcmp (class_name, "digit") == 0)
-    BUILD_CHARCLASS_LOOP (isdigit)
+    BUILD_CHARCLASS_LOOP (isdigit);
   else if (strcmp (class_name, "print") == 0)
-    BUILD_CHARCLASS_LOOP (isprint)
+    BUILD_CHARCLASS_LOOP (isprint);
   else if (strcmp (class_name, "upper") == 0)
-    BUILD_CHARCLASS_LOOP (isupper)
-#ifndef GAWK
+    BUILD_CHARCLASS_LOOP (isupper);
   else if (strcmp (class_name, "blank") == 0)
-    BUILD_CHARCLASS_LOOP (isblank)
+#ifndef GAWK
+    BUILD_CHARCLASS_LOOP (isblank);
 #else
-  /* see comments above */
-  else if (strcmp (class_name, "blank") == 0)
-    BUILD_CHARCLASS_LOOP (is_blank)
+    /* see comments above */
+    BUILD_CHARCLASS_LOOP (is_blank);
 #endif
   else if (strcmp (class_name, "graph") == 0)
-    BUILD_CHARCLASS_LOOP (isgraph)
+    BUILD_CHARCLASS_LOOP (isgraph);
   else if (strcmp (class_name, "punct") == 0)
-    BUILD_CHARCLASS_LOOP (ispunct)
+    BUILD_CHARCLASS_LOOP (ispunct);
   else if (strcmp (class_name, "xdigit") == 0)
-    BUILD_CHARCLASS_LOOP (isxdigit)
+    BUILD_CHARCLASS_LOOP (isxdigit);
   else
     return REG_ECTYPE;
 
@@ -3639,13 +3570,10 @@ build_charclass (trans, sbcset, class_name, syntax)
 }
 
 static bin_tree_t *
-build_charclass_op (dfa, trans, class_name, extra, non_match, err)
-     re_dfa_t *dfa;
-     unsigned RE_TRANSLATE_TYPE trans;
-     const char *class_name;
-     const char *extra;
-     int non_match;
-     reg_errcode_t *err;
+build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
+		    const char *class_name,
+		    const char *extra, int non_match,
+		    reg_errcode_t *err)
 {
   re_bitset_ptr_t sbcset;
 #ifdef RE_ENABLE_I18N
@@ -3656,7 +3584,7 @@ build_charclass_op (dfa, trans, class_name, extra, non_match, err)
   re_token_t br_token;
   bin_tree_t *tree;
 
-  sbcset = (re_bitset_ptr_t) calloc (sizeof (unsigned int), BITSET_UINTS);
+  sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
 #ifdef RE_ENABLE_I18N
   mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
 #endif /* RE_ENABLE_I18N */
@@ -3759,10 +3687,7 @@ build_charclass_op (dfa, trans, class_name, extra, non_match, err)
    Return -2, If an error is occured.  */
 
 static int
-fetch_number (input, token, syntax)
-     re_string_t *input;
-     re_token_t *token;
-     reg_syntax_t syntax;
+fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
 {
   int num = -1;
   unsigned char c;
@@ -3802,11 +3727,8 @@ free_charset (re_charset_t *cset)
 /* Create a tree node.  */
 
 static bin_tree_t *
-create_tree (dfa, left, right, type)
-     re_dfa_t *dfa;
-     bin_tree_t *left;
-     bin_tree_t *right;
-     re_token_type_t type;
+create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
+	     re_token_type_t type)
 {
   re_token_t t;
   t.type = type;
@@ -3814,11 +3736,8 @@ create_tree (dfa, left, right, type)
 }
 
 static bin_tree_t *
-create_token_tree (dfa, left, right, token)
-     re_dfa_t *dfa;
-     bin_tree_t *left;
-     bin_tree_t *right;
-     const re_token_t *token;
+create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
+		   const re_token_t *token)
 {
   bin_tree_t *tree;
   if (BE (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE, 0))
@@ -3854,9 +3773,7 @@ create_token_tree (dfa, left, right, token)
    To be called from preorder or postorder.  */
 
 static reg_errcode_t
-mark_opt_subexp (extra, node)
-     void *extra;
-     bin_tree_t *node;
+mark_opt_subexp (void *extra, bin_tree_t *node)
 {
   int idx = (int) (long) extra;
   if (node->token.type == SUBEXP && node->token.opr.idx == idx)
@@ -3896,9 +3813,7 @@ free_tree (void *extra, bin_tree_t *node)
    it's easier to duplicate.  */
 
 static bin_tree_t *
-duplicate_tree (root, dfa)
-     const bin_tree_t *root;
-     re_dfa_t *dfa;
+duplicate_tree (const bin_tree_t *root, re_dfa_t *dfa)
 {
   const bin_tree_t *node;
   bin_tree_t *dup_root;
diff --git a/regex.c b/regex.c
index 7ea28deb..6dbb4ee1 100644
--- a/regex.c
+++ b/regex.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -22,6 +22,11 @@
 #include "config.h"
 #endif
 
+/* Make sure noone compiles this code with a C++ compiler.  */
+#ifdef __cplusplus
+# error "This is C code, use a C compiler"
+#endif
+
 #ifdef _LIBC
 /* We have to keep the namespace clean.  */
 # define regfree(preg) __regfree (preg)
@@ -47,12 +52,6 @@
 # include "../locale/localeinfo.h"
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-/* POSIX says that <sys/types.h> must be included (by the caller) before
-   <regex.h>.  */
-#include <sys/types.h>
-#endif
-
 #if defined (_MSC_VER)
 #include <stdio.h> /* for size_t */
 #endif
@@ -62,11 +61,20 @@
    #undefs RE_DUP_MAX and sets it to the right value.  */
 #include <limits.h>
 
+#ifdef GAWK
+#undef alloca
+#define alloca alloca_is_bad_you_should_never_use_it
+#endif
 #include <regex.h>
 #include "regex_internal.h"
 
 #include "regex_internal.c"
 #include "regcomp.c"
+#ifdef GAWK
+#define bool int
+#define true (1)
+#define false (0)
+#endif
 #include "regexec.c"
 
 /* Binary backward compatibility.  */
diff --git a/regex.h b/regex.h
index f05a870b..eac89b1e 100644
--- a/regex.h
+++ b/regex.h
@@ -1,6 +1,6 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003
+   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -22,6 +22,10 @@
 #ifndef _REGEX_H
 #define _REGEX_H 1
 
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -31,15 +35,6 @@
 extern "C" {
 #endif
 
-/* POSIX says that <sys/types.h> must be included (by the caller) before
-   <regex.h>.  */
-
-#if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS
-/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
-   should be there.  */
-# include <stddef.h>
-#endif
-
 /* The following two types have to be signed and unsigned integer type
    wide enough to hold a value of a pointer.  For most ANSI compilers
    ptrdiff_t and size_t should be likely OK.  Still size of these two
@@ -209,7 +204,7 @@ extern reg_syntax_t re_syntax_options;
    & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS		\
        | RE_CONTEXT_INVALID_OPS ))
 
-#define RE_SYNTAX_POSIX_AWK 						\
+#define RE_SYNTAX_POSIX_AWK						\
   (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
    | RE_INTERVALS	    | RE_NO_GNU_OPS)
 
@@ -348,75 +343,71 @@ typedef enum
    private to the regex routines.  */
 
 #ifndef RE_TRANSLATE_TYPE
-# define RE_TRANSLATE_TYPE char *
+# define RE_TRANSLATE_TYPE unsigned char *
 #endif
 
 struct re_pattern_buffer
 {
-/* [[[begin pattern_buffer]]] */
-	/* Space that holds the compiled pattern.  It is declared as
-          `unsigned char *' because its elements are
-           sometimes used as array indexes.  */
+  /* Space that holds the compiled pattern.  It is declared as
+     `unsigned char *' because its elements are sometimes used as
+     array indexes.  */
   unsigned char *buffer;
 
-	/* Number of bytes to which `buffer' points.  */
+  /* Number of bytes to which `buffer' points.  */
   unsigned long int allocated;
 
-	/* Number of bytes actually used in `buffer'.  */
+  /* Number of bytes actually used in `buffer'.  */
   unsigned long int used;
 
-        /* Syntax setting with which the pattern was compiled.  */
+  /* Syntax setting with which the pattern was compiled.  */
   reg_syntax_t syntax;
 
-        /* Pointer to a fastmap, if any, otherwise zero.  re_search uses
-           the fastmap, if there is one, to skip over impossible
-           starting points for matches.  */
+  /* Pointer to a fastmap, if any, otherwise zero.  re_search uses the
+     fastmap, if there is one, to skip over impossible starting points
+     for matches.  */
   char *fastmap;
 
-        /* Either a translate table to apply to all characters before
-           comparing them, or zero for no translation.  The translation
-           is applied to a pattern when it is compiled and to a string
-           when it is matched.  */
+  /* Either a translate table to apply to all characters before
+     comparing them, or zero for no translation.  The translation is
+     applied to a pattern when it is compiled and to a string when it
+     is matched.  */
   RE_TRANSLATE_TYPE translate;
 
-	/* Number of subexpressions found by the compiler.  */
+  /* Number of subexpressions found by the compiler.  */
   size_t re_nsub;
 
-        /* Zero if this pattern cannot match the empty string, one else.
-           Well, in truth it's used only in `re_search_2', to see
-           whether or not we should use the fastmap, so we don't set
-           this absolutely perfectly; see `re_compile_fastmap' (the
-           `duplicate' case).  */
+  /* Zero if this pattern cannot match the empty string, one else.
+     Well, in truth it's used only in `re_search_2', to see whether or
+     not we should use the fastmap, so we don't set this absolutely
+     perfectly; see `re_compile_fastmap' (the `duplicate' case).  */
   unsigned can_be_null : 1;
 
-        /* If REGS_UNALLOCATED, allocate space in the `regs' structure
-             for `max (RE_NREGS, re_nsub + 1)' groups.
-           If REGS_REALLOCATE, reallocate space if necessary.
-           If REGS_FIXED, use what's there.  */
+  /* If REGS_UNALLOCATED, allocate space in the `regs' structure
+     for `max (RE_NREGS, re_nsub + 1)' groups.
+     If REGS_REALLOCATE, reallocate space if necessary.
+     If REGS_FIXED, use what's there.  */
 #define REGS_UNALLOCATED 0
 #define REGS_REALLOCATE 1
 #define REGS_FIXED 2
   unsigned regs_allocated : 2;
 
-        /* Set to zero when `regex_compile' compiles a pattern; set to one
-           by `re_compile_fastmap' if it updates the fastmap.  */
+  /* Set to zero when `regex_compile' compiles a pattern; set to one
+     by `re_compile_fastmap' if it updates the fastmap.  */
   unsigned fastmap_accurate : 1;
 
-        /* If set, `re_match_2' does not return information about
-           subexpressions.  */
+  /* If set, `re_match_2' does not return information about
+     subexpressions.  */
   unsigned no_sub : 1;
 
-        /* If set, a beginning-of-line anchor doesn't match at the
-           beginning of the string.  */
+  /* If set, a beginning-of-line anchor doesn't match at the beginning
+     of the string.  */
   unsigned not_bol : 1;
 
-        /* Similarly for an end-of-line anchor.  */
+  /* Similarly for an end-of-line anchor.  */
   unsigned not_eol : 1;
 
-        /* If true, an anchor at a newline matches.  */
+  /* If true, an anchor at a newline matches.  */
   unsigned newline_anchor : 1;
-
-/* [[[end pattern_buffer]]] */
 };
 
 typedef struct re_pattern_buffer regex_t;
@@ -454,38 +445,21 @@ typedef struct
 
 /* Declarations for routines.  */
 
-/* To avoid duplicating every routine declaration -- once with a
-   prototype (if we are ANSI), and once without (if we aren't) -- we
-   use the following macro to declare argument types.  This
-   unfortunately clutters up the declarations a bit, but I think it's
-   worth it.  */
-
-#if __STDC__
-
-# define _RE_ARGS(args) args
-
-#else /* not __STDC__ */
-
-# define _RE_ARGS(args) ()
-
-#endif /* not __STDC__ */
-
 /* Sets the current default syntax to SYNTAX, and return the old syntax.
    You can also simply assign to the `re_syntax_options' variable.  */
-extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax));
+extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax);
 
 /* Compile the regular expression PATTERN, with length LENGTH
    and syntax given by the global `re_syntax_options', into the buffer
    BUFFER.  Return NULL if successful, and an error string if not.  */
-extern const char *re_compile_pattern
-  _RE_ARGS ((const char *pattern, size_t length,
-             struct re_pattern_buffer *buffer));
+extern const char *re_compile_pattern (const char *__pattern, size_t __length,
+				       struct re_pattern_buffer *__buffer);
 
 
 /* Compile a fastmap for the compiled pattern in BUFFER; used to
    accelerate searches.  Return 0 if successful and -2 if was an
    internal error.  */
-extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
+extern int re_compile_fastmap (struct re_pattern_buffer *__buffer);
 
 
 /* Search in the string STRING (with length LENGTH) for the pattern
@@ -493,31 +467,30 @@ extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
    characters.  Return the starting position of the match, -1 for no
    match, or -2 for an internal error.  Also return register
    information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
-extern int re_search
-  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
-            int length, int start, int range, struct re_registers *regs));
+extern int re_search (struct re_pattern_buffer *__buffer, const char *__string,
+		      int __length, int __start, int __range,
+		      struct re_registers *__regs);
 
 
 /* Like `re_search', but search in the concatenation of STRING1 and
    STRING2.  Also, stop searching at index START + STOP.  */
-extern int re_search_2
-  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
-             int length1, const char *string2, int length2,
-             int start, int range, struct re_registers *regs, int stop));
+extern int re_search_2 (struct re_pattern_buffer *__buffer,
+			const char *__string1, int __length1,
+			const char *__string2, int __length2, int __start,
+			int __range, struct re_registers *__regs, int __stop);
 
 
 /* Like `re_search', but return how many characters in STRING the regexp
    in BUFFER matched, starting at position START.  */
-extern int re_match
-  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
-             int length, int start, struct re_registers *regs));
+extern int re_match (struct re_pattern_buffer *__buffer, const char *__string,
+		     int __length, int __start, struct re_registers *__regs);
 
 
 /* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
-extern int re_match_2
-  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
-             int length1, const char *string2, int length2,
-             int start, struct re_registers *regs, int stop));
+extern int re_match_2 (struct re_pattern_buffer *__buffer,
+		       const char *__string1, int __length1,
+		       const char *__string2, int __length2, int __start,
+		       struct re_registers *__regs, int __stop);
 
 
 /* Set REGS to hold NUM_REGS registers, storing them in STARTS and
@@ -532,15 +505,16 @@ extern int re_match_2
    Unless this function is called, the first search or match using
    PATTERN_BUFFER will allocate its own register data, without
    freeing the old data.  */
-extern void re_set_registers
-  _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
-             unsigned num_regs, regoff_t *starts, regoff_t *ends));
+extern void re_set_registers (struct re_pattern_buffer *__buffer,
+			      struct re_registers *__regs,
+			      unsigned int __num_regs,
+			      regoff_t *__starts, regoff_t *__ends);
 
 #if defined _REGEX_RE_COMP || defined _LIBC
 # ifndef _CRAY
 /* 4.2 bsd compatibility.  */
-extern char *re_comp _RE_ARGS ((const char *));
-extern int re_exec _RE_ARGS ((const char *));
+extern char *re_comp (const char *);
+extern int re_exec (const char *);
 # endif
 #endif
 
@@ -557,7 +531,8 @@ extern int re_exec _RE_ARGS ((const char *));
 #endif
 /* gcc 3.1 and up support the [restrict] syntax.  */
 #ifndef __restrict_arr
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) \
+     && !defined __GNUG__
 #  define __restrict_arr __restrict
 # else
 #  define __restrict_arr
@@ -565,19 +540,19 @@ extern int re_exec _RE_ARGS ((const char *));
 #endif
 
 /* POSIX compatibility.  */
-extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
-			      const char *__restrict __pattern,
-			      int __cflags));
+extern int regcomp (regex_t *__restrict __preg,
+		    const char *__restrict __pattern,
+		    int __cflags);
 
-extern int regexec _RE_ARGS ((const regex_t *__restrict __preg,
-			      const char *__restrict __string, size_t __nmatch,
-			      regmatch_t __pmatch[__restrict_arr],
-			      int __eflags));
+extern int regexec (const regex_t *__restrict __preg,
+		    const char *__restrict __string, size_t __nmatch,
+		    regmatch_t __pmatch[__restrict_arr],
+		    int __eflags);
 
-extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg,
-				  char *__errbuf, size_t __errbuf_size));
+extern size_t regerror (int __errcode, const regex_t *__restrict __preg,
+			char *__restrict __errbuf, size_t __errbuf_size);
 
-extern void regfree _RE_ARGS ((regex_t *__preg));
+extern void regfree (regex_t *__preg);
 
 
 #ifdef __cplusplus
@@ -585,11 +560,3 @@ extern void regfree _RE_ARGS ((regex_t *__preg));
 #endif	/* C++ */
 
 #endif /* regex.h */
-
-/*
-Local variables:
-make-backup-files: t
-version-control: t
-trim-versions-without-asking: nil
-End:
-*/
diff --git a/regex_internal.c b/regex_internal.c
index b849f7b0..849dcd2b 100644
--- a/regex_internal.c
+++ b/regex_internal.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -22,21 +22,13 @@ static void re_string_construct_common (const char *str, int len,
 					re_string_t *pstr,
 					RE_TRANSLATE_TYPE trans, int icase,
 					const re_dfa_t *dfa) internal_function;
-#ifdef RE_ENABLE_I18N
-static int re_string_skip_chars (re_string_t *pstr, int new_raw_idx,
-				 wint_t *last_wc) internal_function;
-#endif /* RE_ENABLE_I18N */
-static reg_errcode_t register_state (re_dfa_t *dfa, re_dfastate_t *newstate,
-				     unsigned int hash) internal_function;
-static re_dfastate_t *create_ci_newstate (re_dfa_t *dfa,
+static re_dfastate_t *create_ci_newstate (const re_dfa_t *dfa,
 					  const re_node_set *nodes,
 					  unsigned int hash) internal_function;
-static re_dfastate_t *create_cd_newstate (re_dfa_t *dfa,
+static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,
 					  const re_node_set *nodes,
 					  unsigned int context,
 					  unsigned int hash) internal_function;
-static unsigned int inline calc_state_hash (const re_node_set *nodes,
-					    unsigned int context) internal_function;
 
 /* Functions for string operation.  */
 
@@ -44,12 +36,9 @@ static unsigned int inline calc_state_hash (const re_node_set *nodes,
    re_string_reconstruct before using the object.  */
 
 static reg_errcode_t
-re_string_allocate (pstr, str, len, init_len, trans, icase, dfa)
-     re_string_t *pstr;
-     const char *str;
-     int len, init_len, icase;
-     RE_TRANSLATE_TYPE trans;
-     const re_dfa_t *dfa;
+internal_function
+re_string_allocate (re_string_t *pstr, const char *str, int len, int init_len,
+		    RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa)
 {
   reg_errcode_t ret;
   int init_buf_len;
@@ -75,12 +64,9 @@ re_string_allocate (pstr, str, len, init_len, trans, icase, dfa)
 /* This function allocate the buffers, and initialize them.  */
 
 static reg_errcode_t
-re_string_construct (pstr, str, len, trans, icase, dfa)
-     re_string_t *pstr;
-     const char *str;
-     int len, icase;
-     RE_TRANSLATE_TYPE trans;
-     const re_dfa_t *dfa;
+internal_function
+re_string_construct (re_string_t *pstr, const char *str, int len,
+		     RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa)
 {
   reg_errcode_t ret;
   memset (pstr, '\0', sizeof (re_string_t));
@@ -141,33 +127,32 @@ re_string_construct (pstr, str, len, trans, icase, dfa)
 /* Helper functions for re_string_allocate, and re_string_construct.  */
 
 static reg_errcode_t
-re_string_realloc_buffers (pstr, new_buf_len)
-     re_string_t *pstr;
-     int new_buf_len;
+internal_function
+re_string_realloc_buffers (re_string_t *pstr, int new_buf_len)
 {
 #ifdef RE_ENABLE_I18N
   if (pstr->mb_cur_max > 1)
     {
-      wint_t *new_array = re_realloc (pstr->wcs, wint_t, new_buf_len);
-      if (BE (new_array == NULL, 0))
+      wint_t *new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len);
+      if (BE (new_wcs == NULL, 0))
 	return REG_ESPACE;
-      pstr->wcs = new_array;
+      pstr->wcs = new_wcs;
       if (pstr->offsets != NULL)
 	{
-	  int *new_array = re_realloc (pstr->offsets, int, new_buf_len);
-	  if (BE (new_array == NULL, 0))
+	  int *new_offsets = re_realloc (pstr->offsets, int, new_buf_len);
+	  if (BE (new_offsets == NULL, 0))
 	    return REG_ESPACE;
-	  pstr->offsets = new_array;
+	  pstr->offsets = new_offsets;
 	}
     }
 #endif /* RE_ENABLE_I18N  */
   if (pstr->mbs_allocated)
     {
-      unsigned char *new_array = re_realloc (pstr->mbs, unsigned char,
-					     new_buf_len);
-      if (BE (new_array == NULL, 0))
+      unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char,
+					   new_buf_len);
+      if (BE (new_mbs == NULL, 0))
 	return REG_ESPACE;
-      pstr->mbs = new_array;
+      pstr->mbs = new_mbs;
     }
   pstr->bufs_len = new_buf_len;
   return REG_NOERROR;
@@ -175,18 +160,15 @@ re_string_realloc_buffers (pstr, new_buf_len)
 
 
 static void
-re_string_construct_common (str, len, pstr, trans, icase, dfa)
-     const char *str;
-     int len;
-     re_string_t *pstr;
-     RE_TRANSLATE_TYPE trans;
-     int icase;
-     const re_dfa_t *dfa;
+internal_function
+re_string_construct_common (const char *str, int len, re_string_t *pstr,
+			    RE_TRANSLATE_TYPE trans, int icase,
+			    const re_dfa_t *dfa)
 {
   pstr->raw_mbs = (const unsigned char *) str;
   pstr->len = len;
   pstr->raw_len = len;
-  pstr->trans = (unsigned RE_TRANSLATE_TYPE) trans;
+  pstr->trans = trans;
   pstr->icase = icase ? 1 : 0;
   pstr->mbs_allocated = (trans != NULL || icase);
   pstr->mb_cur_max = dfa->mb_cur_max;
@@ -210,16 +192,18 @@ re_string_construct_common (str, len, pstr, trans, icase, dfa)
    built and starts from PSTR->VALID_LEN.  */
 
 static void
-build_wcs_buffer (pstr)
-     re_string_t *pstr;
+internal_function
+build_wcs_buffer (re_string_t *pstr)
 {
 #ifdef _LIBC
-  unsigned char buf[pstr->mb_cur_max];
+  unsigned char buf[MB_LEN_MAX];
+  assert (MB_LEN_MAX >= pstr->mb_cur_max);
 #else
   unsigned char buf[64];
 #endif
   mbstate_t prev_st;
-  int byte_idx, end_idx, mbclen, remain_len;
+  int byte_idx, end_idx, remain_len;
+  size_t mbclen;
 
   /* Build the buffers from pstr->valid_len to either pstr->len or
      pstr->bufs_len.  */
@@ -275,16 +259,18 @@ build_wcs_buffer (pstr)
 /* Build wide character buffer PSTR->WCS like build_wcs_buffer,
    but for REG_ICASE.  */
 
-static int
-build_wcs_upper_buffer (pstr)
-     re_string_t *pstr;
+static reg_errcode_t
+internal_function
+build_wcs_upper_buffer (re_string_t *pstr)
 {
   mbstate_t prev_st;
-  int src_idx, byte_idx, end_idx, mbclen, remain_len;
+  int src_idx, byte_idx, end_idx, remain_len;
+  size_t mbclen;
 #ifdef _LIBC
-  unsigned char buf[pstr->mb_cur_max];
+  char buf[MB_LEN_MAX];
+  assert (MB_LEN_MAX >= pstr->mb_cur_max);
 #else
-  unsigned char buf[64];
+  char buf[64];
 #endif
 
   byte_idx = pstr->valid_len;
@@ -316,15 +302,15 @@ build_wcs_upper_buffer (pstr)
 	  mbclen = mbrtowc (&wc,
 			    ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx
 			     + byte_idx), remain_len, &pstr->cur_state);
-	  if (BE (mbclen > 0, 1))
+	  if (BE (mbclen + 2 > 2, 1))
 	    {
 	      wchar_t wcu = wc;
 	      if (iswlower (wc))
 		{
-		  int mbcdlen;
+		  size_t mbcdlen;
 
 		  wcu = towupper (wc);
-		  mbcdlen = wcrtomb ((char *)buf, wcu, &prev_st);
+		  mbcdlen = wcrtomb (buf, wcu, &prev_st);
 		  if (BE (mbclen == mbcdlen, 1))
 		    memcpy (pstr->mbs + byte_idx, buf, mbclen);
 		  else
@@ -367,7 +353,6 @@ build_wcs_upper_buffer (pstr)
       {
 	wchar_t wc;
 	const char *p;
-
       offsets_needed:
 	remain_len = end_idx - byte_idx;
 	prev_st = pstr->cur_state;
@@ -385,20 +370,20 @@ build_wcs_upper_buffer (pstr)
 	else
 	  p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx;
 	mbclen = mbrtowc (&wc, p, remain_len, &pstr->cur_state);
-	if (BE (mbclen > 0, 1))
+	if (BE (mbclen + 2 > 2, 1))
 	  {
 	    wchar_t wcu = wc;
 	    if (iswlower (wc))
 	      {
-		int mbcdlen;
+		size_t mbcdlen;
 
 		wcu = towupper (wc);
 		mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st);
 		if (BE (mbclen == mbcdlen, 1))
 		  memcpy (pstr->mbs + byte_idx, buf, mbclen);
-		else
+		else if (mbcdlen != (size_t) -1)
 		  {
-		    int i;
+		    size_t i;
 
 		    if (byte_idx + mbcdlen > pstr->bufs_len)
 		      {
@@ -415,7 +400,7 @@ build_wcs_upper_buffer (pstr)
 		      }
 		    if (!pstr->offsets_needed)
 		      {
-			for (i = 0; i < byte_idx; ++i)
+			for (i = 0; i < (size_t) byte_idx; ++i)
 			  pstr->offsets[i] = i;
 			pstr->offsets_needed = 1;
 		      }
@@ -438,13 +423,15 @@ build_wcs_upper_buffer (pstr)
 		    src_idx += mbclen;
 		    continue;
 		  }
+                else
+                  memcpy (pstr->mbs + byte_idx, p, mbclen);
 	      }
 	    else
 	      memcpy (pstr->mbs + byte_idx, p, mbclen);
 
 	    if (BE (pstr->offsets_needed != 0, 0))
 	      {
-		int i;
+		size_t i;
 		for (i = 0; i < mbclen; ++i)
 		  pstr->offsets[byte_idx + i] = src_idx + i;
 	      }
@@ -489,14 +476,13 @@ build_wcs_upper_buffer (pstr)
    Return the index.  */
 
 static int
-re_string_skip_chars (pstr, new_raw_idx, last_wc)
-     re_string_t *pstr;
-     int new_raw_idx;
-     wint_t *last_wc;
+internal_function
+re_string_skip_chars (re_string_t *pstr, int new_raw_idx, wint_t *last_wc)
 {
   mbstate_t prev_st;
-  int rawbuf_idx, mbclen;
-  wchar_t wc = 0;
+  int rawbuf_idx;
+  size_t mbclen;
+  wchar_t wc = WEOF;
 
   /* Skip the characters which are not necessary to check.  */
   for (rawbuf_idx = pstr->raw_mbs_idx + pstr->valid_raw_len;
@@ -509,7 +495,11 @@ re_string_skip_chars (pstr, new_raw_idx, last_wc)
 			remain_len, &pstr->cur_state);
       if (BE (mbclen == (size_t) -2 || mbclen == (size_t) -1 || mbclen == 0, 0))
 	{
-	  /* We treat these cases as a singlebyte character.  */
+	  /* We treat these cases as a single byte character.  */
+	  if (mbclen == 0 || remain_len == 0)
+	    wc = L'\0';
+	  else
+	    wc = *(unsigned char *) (pstr->raw_mbs + rawbuf_idx);
 	  mbclen = 1;
 	  pstr->cur_state = prev_st;
 	}
@@ -525,8 +515,8 @@ re_string_skip_chars (pstr, new_raw_idx, last_wc)
    This function is used in case of REG_ICASE.  */
 
 static void
-build_upper_buffer (pstr)
-     re_string_t *pstr;
+internal_function
+build_upper_buffer (re_string_t *pstr)
 {
   int char_idx, end_idx;
   end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
@@ -548,8 +538,8 @@ build_upper_buffer (pstr)
 /* Apply TRANS to the buffer in PSTR.  */
 
 static void
-re_string_translate_buffer (pstr)
-     re_string_t *pstr;
+internal_function
+re_string_translate_buffer (re_string_t *pstr)
 {
   int buf_idx, end_idx;
   end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
@@ -569,9 +559,8 @@ re_string_translate_buffer (pstr)
    convert to upper case in case of REG_ICASE, apply translation.  */
 
 static reg_errcode_t
-re_string_reconstruct (pstr, idx, eflags)
-     re_string_t *pstr;
-     int idx, eflags;
+internal_function
+re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
 {
   int offset = idx - pstr->raw_mbs_idx;
   if (BE (offset < 0, 0))
@@ -596,34 +585,98 @@ re_string_reconstruct (pstr, idx, eflags)
 
   if (BE (offset != 0, 1))
     {
-      /* Are the characters which are already checked remain?  */
-      if (BE (offset < pstr->valid_raw_len, 1)
-#ifdef RE_ENABLE_I18N
-	  /* Handling this would enlarge the code too much.
-	     Accept a slowdown in that case.  */
-	  && pstr->offsets_needed == 0
-#endif
-	 )
+      /* Should the already checked characters be kept?  */
+      if (BE (offset < pstr->valid_raw_len, 1))
 	{
 	  /* Yes, move them to the front of the buffer.  */
-	  pstr->tip_context = re_string_context_at (pstr, offset - 1, eflags);
 #ifdef RE_ENABLE_I18N
-	  if (pstr->mb_cur_max > 1)
-	    memmove (pstr->wcs, pstr->wcs + offset,
-		     (pstr->valid_len - offset) * sizeof (wint_t));
+	  if (BE (pstr->offsets_needed, 0))
+	    {
+	      int low = 0, high = pstr->valid_len, mid;
+	      do
+		{
+		  mid = (high + low) / 2;
+		  if (pstr->offsets[mid] > offset)
+		    high = mid;
+		  else if (pstr->offsets[mid] < offset)
+		    low = mid + 1;
+		  else
+		    break;
+		}
+	      while (low < high);
+	      if (pstr->offsets[mid] < offset)
+		++mid;
+	      pstr->tip_context = re_string_context_at (pstr, mid - 1,
+							eflags);
+	      /* This can be quite complicated, so handle specially
+		 only the common and easy case where the character with
+		 different length representation of lower and upper
+		 case is present at or after offset.  */
+	      if (pstr->valid_len > offset
+		  && mid == offset && pstr->offsets[mid] == offset)
+		{
+		  memmove (pstr->wcs, pstr->wcs + offset,
+			   (pstr->valid_len - offset) * sizeof (wint_t));
+		  memmove (pstr->mbs, pstr->mbs + offset, pstr->valid_len - offset);
+		  pstr->valid_len -= offset;
+		  pstr->valid_raw_len -= offset;
+		  for (low = 0; low < pstr->valid_len; low++)
+		    pstr->offsets[low] = pstr->offsets[low + offset] - offset;
+		}
+	      else
+		{
+		  /* Otherwise, just find out how long the partial multibyte
+		     character at offset is and fill it with WEOF/255.  */
+		  pstr->len = pstr->raw_len - idx + offset;
+		  pstr->stop = pstr->raw_stop - idx + offset;
+		  pstr->offsets_needed = 0;
+		  while (mid > 0 && pstr->offsets[mid - 1] == offset)
+		    --mid;
+		  while (mid < pstr->valid_len)
+		    if (pstr->wcs[mid] != WEOF)
+		      break;
+		    else
+		      ++mid;
+		  if (mid == pstr->valid_len)
+		    pstr->valid_len = 0;
+		  else
+		    {
+		      pstr->valid_len = pstr->offsets[mid] - offset;
+		      if (pstr->valid_len)
+			{
+			  for (low = 0; low < pstr->valid_len; ++low)
+			    pstr->wcs[low] = WEOF;
+			  memset (pstr->mbs, 255, pstr->valid_len);
+			}
+		    }
+		  pstr->valid_raw_len = pstr->valid_len;
+		}
+	    }
+	  else
+#endif
+	    {
+	      pstr->tip_context = re_string_context_at (pstr, offset - 1,
+							eflags);
+#ifdef RE_ENABLE_I18N
+	      if (pstr->mb_cur_max > 1)
+		memmove (pstr->wcs, pstr->wcs + offset,
+			 (pstr->valid_len - offset) * sizeof (wint_t));
 #endif /* RE_ENABLE_I18N */
-	  if (BE (pstr->mbs_allocated, 0))
-	    memmove (pstr->mbs, pstr->mbs + offset,
-		     pstr->valid_len - offset);
-	  pstr->valid_len -= offset;
-	  pstr->valid_raw_len -= offset;
+	      if (BE (pstr->mbs_allocated, 0))
+		memmove (pstr->mbs, pstr->mbs + offset,
+			 pstr->valid_len - offset);
+	      pstr->valid_len -= offset;
+	      pstr->valid_raw_len -= offset;
 #if DEBUG
-	  assert (pstr->valid_len > 0);
+	      assert (pstr->valid_len > 0);
 #endif
+	    }
 	}
       else
 	{
 	  /* No, skip all characters until IDX.  */
+	  int prev_valid_len = pstr->valid_len;
+
 #ifdef RE_ENABLE_I18N
 	  if (BE (pstr->offsets_needed, 0))
 	    {
@@ -633,7 +686,6 @@ re_string_reconstruct (pstr, idx, eflags)
 	    }
 #endif
 	  pstr->valid_len = 0;
-	  pstr->valid_raw_len = 0;
 #ifdef RE_ENABLE_I18N
 	  if (pstr->mb_cur_max > 1)
 	    {
@@ -648,40 +700,66 @@ re_string_reconstruct (pstr, idx, eflags)
 		     byte other than 0x80 - 0xbf.  */
 		  raw = pstr->raw_mbs + pstr->raw_mbs_idx;
 		  end = raw + (offset - pstr->mb_cur_max);
-		  for (p = raw + offset - 1; p >= end; --p)
-		    if ((*p & 0xc0) != 0x80)
-		      {
-			mbstate_t cur_state;
-			wchar_t wc2;
-			int mlen = raw + pstr->len - p;
-			unsigned char buf[6];
-
-			q = p;
-			if (BE (pstr->trans != NULL, 0))
-			  {
-			    int i = mlen < 6 ? mlen : 6;
-			    while (--i >= 0)
-			      buf[i] = pstr->trans[p[i]];
-			    q = buf;
-			  }
-			/* XXX Don't use mbrtowc, we know which conversion
-			   to use (UTF-8 -> UCS4).  */
-			memset (&cur_state, 0, sizeof (cur_state));
-			mlen = mbrtowc (&wc2, p, mlen, &cur_state)
-			       - (raw + offset - p);
-			if (mlen >= 0)
-			  {
-			    memset (&pstr->cur_state, '\0',
-				    sizeof (mbstate_t));
-			    pstr->valid_len = mlen;
-			    wc = wc2;
-			  }
-			break;
-		      }
+		  if (end < pstr->raw_mbs)
+		    end = pstr->raw_mbs;
+		  p = raw + offset - 1;
+#ifdef _LIBC
+		  /* We know the wchar_t encoding is UCS4, so for the simple
+		     case, ASCII characters, skip the conversion step.  */
+		  if (isascii (*p) && BE (pstr->trans == NULL, 1))
+		    {
+		      memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
+		      /* pstr->valid_len = 0; */
+		      wc = (wchar_t) *p;
+		    }
+		  else
+#endif
+		    for (; p >= end; --p)
+		      if ((*p & 0xc0) != 0x80)
+			{
+			  mbstate_t cur_state;
+			  wchar_t wc2;
+			  int mlen = raw + pstr->len - p;
+			  unsigned char buf[6];
+			  size_t mbclen;
+
+			  q = p;
+			  if (BE (pstr->trans != NULL, 0))
+			    {
+			      int i = mlen < 6 ? mlen : 6;
+			      while (--i >= 0)
+				buf[i] = pstr->trans[p[i]];
+			      q = buf;
+			    }
+			  /* XXX Don't use mbrtowc, we know which conversion
+			     to use (UTF-8 -> UCS4).  */
+			  memset (&cur_state, 0, sizeof (cur_state));
+			  mbclen = mbrtowc (&wc2, (const char *) p, mlen,
+					    &cur_state);
+			  if (raw + offset - p <= mbclen
+			      && mbclen < (size_t) -2)
+			    {
+			      memset (&pstr->cur_state, '\0',
+				      sizeof (mbstate_t));
+			      pstr->valid_len = mbclen - (raw + offset - p);
+			      wc = wc2;
+			    }
+			  break;
+			}
 		}
 
 	      if (wc == WEOF)
 		pstr->valid_len = re_string_skip_chars (pstr, idx, &wc) - idx;
+	      if (wc == WEOF)
+		pstr->tip_context
+		  = re_string_context_at (pstr, prev_valid_len - 1, eflags);
+	      else
+		pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0)
+				      && IS_WIDE_WORD_CHAR (wc))
+				     ? CONTEXT_WORD
+				     : ((IS_WIDE_NEWLINE (wc)
+					 && pstr->newline_anchor)
+					? CONTEXT_NEWLINE : 0));
 	      if (BE (pstr->valid_len, 0))
 		{
 		  for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx)
@@ -690,17 +768,12 @@ re_string_reconstruct (pstr, idx, eflags)
 		    memset (pstr->mbs, 255, pstr->valid_len);
 		}
 	      pstr->valid_raw_len = pstr->valid_len;
-	      pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0)
-				    && IS_WIDE_WORD_CHAR (wc))
-				   ? CONTEXT_WORD
-				   : ((IS_WIDE_NEWLINE (wc)
-				       && pstr->newline_anchor)
-				      ? CONTEXT_NEWLINE : 0));
 	    }
 	  else
 #endif /* RE_ENABLE_I18N */
 	    {
 	      int c = pstr->raw_mbs[pstr->raw_mbs_idx + offset - 1];
+	      pstr->valid_raw_len = 0;
 	      if (pstr->trans)
 		c = pstr->trans[c];
 	      pstr->tip_context = (bitset_contain (pstr->word_char, c)
@@ -722,7 +795,7 @@ re_string_reconstruct (pstr, idx, eflags)
     {
       if (pstr->icase)
 	{
-	  int ret = build_wcs_upper_buffer (pstr);
+	  reg_errcode_t ret = build_wcs_upper_buffer (pstr);
 	  if (BE (ret != REG_NOERROR, 0))
 	    return ret;
 	}
@@ -731,24 +804,23 @@ re_string_reconstruct (pstr, idx, eflags)
     }
   else
 #endif /* RE_ENABLE_I18N */
-  if (BE (pstr->mbs_allocated, 0))
-    {
-      if (pstr->icase)
-	build_upper_buffer (pstr);
-      else if (pstr->trans != NULL)
-	re_string_translate_buffer (pstr);
-    }
-  else
-    pstr->valid_len = pstr->len;
+    if (BE (pstr->mbs_allocated, 0))
+      {
+	if (pstr->icase)
+	  build_upper_buffer (pstr);
+	else if (pstr->trans != NULL)
+	  re_string_translate_buffer (pstr);
+      }
+    else
+      pstr->valid_len = pstr->len;
 
   pstr->cur_idx = 0;
   return REG_NOERROR;
 }
 
 static unsigned char
-re_string_peek_byte_case (pstr, idx)
-     const re_string_t *pstr;
-     int idx;
+internal_function __attribute ((pure))
+re_string_peek_byte_case (const re_string_t *pstr, int idx)
 {
   int ch, off;
 
@@ -783,8 +855,8 @@ re_string_peek_byte_case (pstr, idx)
 }
 
 static unsigned char
-re_string_fetch_byte_case (pstr)
-     re_string_t *pstr;
+internal_function __attribute ((pure))
+re_string_fetch_byte_case (re_string_t *pstr)
 {
   if (BE (!pstr->mbs_allocated, 1))
     return re_string_fetch_byte (pstr);
@@ -820,8 +892,8 @@ re_string_fetch_byte_case (pstr)
 }
 
 static void
-re_string_destruct (pstr)
-     re_string_t *pstr;
+internal_function
+re_string_destruct (re_string_t *pstr)
 {
 #ifdef RE_ENABLE_I18N
   re_free (pstr->wcs);
@@ -834,9 +906,8 @@ re_string_destruct (pstr)
 /* Return the context at IDX in INPUT.  */
 
 static unsigned int
-re_string_context_at (input, idx, eflags)
-     const re_string_t *input;
-     int idx, eflags;
+internal_function
+re_string_context_at (const re_string_t *input, int idx, int eflags)
 {
   int c;
   if (BE (idx < 0, 0))
@@ -880,9 +951,8 @@ re_string_context_at (input, idx, eflags)
 /* Functions for set operation.  */
 
 static reg_errcode_t
-re_node_set_alloc (set, size)
-     re_node_set *set;
-     int size;
+internal_function
+re_node_set_alloc (re_node_set *set, int size)
 {
   /*
    * ADR: valgrind says size can be 0, which then doesn't
@@ -903,9 +973,8 @@ re_node_set_alloc (set, size)
 }
 
 static reg_errcode_t
-re_node_set_init_1 (set, elem)
-     re_node_set *set;
-     int elem;
+internal_function
+re_node_set_init_1 (re_node_set *set, int elem)
 {
   set->alloc = 1;
   set->nelem = 1;
@@ -920,9 +989,8 @@ re_node_set_init_1 (set, elem)
 }
 
 static reg_errcode_t
-re_node_set_init_2 (set, elem1, elem2)
-     re_node_set *set;
-     int elem1, elem2;
+internal_function
+re_node_set_init_2 (re_node_set *set, int elem1, int elem2)
 {
   set->alloc = 2;
   set->elems = re_malloc (int, 2);
@@ -951,9 +1019,8 @@ re_node_set_init_2 (set, elem1, elem2)
 }
 
 static reg_errcode_t
-re_node_set_init_copy (dest, src)
-     re_node_set *dest;
-     const re_node_set *src;
+internal_function
+re_node_set_init_copy (re_node_set *dest, const re_node_set *src)
 {
   dest->nelem = src->nelem;
   if (src->nelem > 0)
@@ -977,9 +1044,9 @@ re_node_set_init_copy (dest, src)
    Note: We assume dest->elems is NULL, when dest->alloc is 0.  */
 
 static reg_errcode_t
-re_node_set_add_intersect (dest, src1, src2)
-     re_node_set *dest;
-     const re_node_set *src1, *src2;
+internal_function
+re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
+			   const re_node_set *src2)
 {
   int i1, i2, is, id, delta, sbase;
   if (src1->nelem == 0 || src2->nelem == 0)
@@ -1068,9 +1135,9 @@ re_node_set_add_intersect (dest, src1, src2)
    DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */
 
 static reg_errcode_t
-re_node_set_init_union (dest, src1, src2)
-     re_node_set *dest;
-     const re_node_set *src1, *src2;
+internal_function
+re_node_set_init_union (re_node_set *dest, const re_node_set *src1,
+			const re_node_set *src2)
 {
   int i1, i2, id;
   if (src1 != NULL && src1->nelem > 0 && src2 != NULL && src2->nelem > 0)
@@ -1121,9 +1188,8 @@ re_node_set_init_union (dest, src1, src2)
    DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */
 
 static reg_errcode_t
-re_node_set_merge (dest, src)
-     re_node_set *dest;
-     const re_node_set *src;
+internal_function
+re_node_set_merge (re_node_set *dest, const re_node_set *src)
 {
   int is, id, sbase, delta;
   if (src == NULL || src->nelem == 0)
@@ -1205,9 +1271,8 @@ re_node_set_merge (dest, src)
    return -1 if an error is occured, return 1 otherwise.  */
 
 static int
-re_node_set_insert (set, elem)
-     re_node_set *set;
-     int elem;
+internal_function
+re_node_set_insert (re_node_set *set, int elem)
 {
   int idx;
   /* In case the set is empty.  */
@@ -1230,12 +1295,12 @@ re_node_set_insert (set, elem)
   /* Realloc if we need.  */
   if (set->alloc == set->nelem)
     {
-      int *new_array;
+      int *new_elems;
       set->alloc = set->alloc * 2;
-      new_array = re_realloc (set->elems, int, set->alloc);
-      if (BE (new_array == NULL, 0))
+      new_elems = re_realloc (set->elems, int, set->alloc);
+      if (BE (new_elems == NULL, 0))
 	return -1;
-      set->elems = new_array;
+      set->elems = new_elems;
     }
 
   /* Move the elements which follows the new element.  Test the
@@ -1263,19 +1328,18 @@ re_node_set_insert (set, elem)
    Return -1 if an error is occured, return 1 otherwise.  */
 
 static int
-re_node_set_insert_last (set, elem)
-     re_node_set *set;
-     int elem;
+internal_function
+re_node_set_insert_last (re_node_set *set, int elem)
 {
   /* Realloc if we need.  */
   if (set->alloc == set->nelem)
     {
-      int *new_array;
+      int *new_elems;
       set->alloc = (set->alloc + 1) * 2;
-      new_array = re_realloc (set->elems, int, set->alloc);
-      if (BE (new_array == NULL, 0))
+      new_elems = re_realloc (set->elems, int, set->alloc);
+      if (BE (new_elems == NULL, 0))
 	return -1;
-      set->elems = new_array;
+      set->elems = new_elems;
     }
 
   /* Insert the new element.  */
@@ -1287,8 +1351,8 @@ re_node_set_insert_last (set, elem)
    return 1 if SET1 and SET2 are equivalent, return 0 otherwise.  */
 
 static int
-re_node_set_compare (set1, set2)
-     const re_node_set *set1, *set2;
+internal_function __attribute ((pure))
+re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
 {
   int i;
   if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem)
@@ -1302,9 +1366,8 @@ re_node_set_compare (set1, set2)
 /* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise.  */
 
 static int
-re_node_set_contains (set, elem)
-     const re_node_set *set;
-     int elem;
+internal_function __attribute ((pure))
+re_node_set_contains (const re_node_set *set, int elem)
 {
   unsigned int idx, right, mid;
   if (set->nelem <= 0)
@@ -1325,9 +1388,8 @@ re_node_set_contains (set, elem)
 }
 
 static void
-re_node_set_remove_at (set, idx)
-     re_node_set *set;
-     int idx;
+internal_function
+re_node_set_remove_at (re_node_set *set, int idx)
 {
   if (idx < 0 || idx >= set->nelem)
     return;
@@ -1341,21 +1403,24 @@ re_node_set_remove_at (set, idx)
    Or return -1, if an error will be occured.  */
 
 static int
-re_dfa_add_node (dfa, token)
-     re_dfa_t *dfa;
-     re_token_t token;
+internal_function
+re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
 {
   if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0))
     {
-      int new_nodes_alloc = dfa->nodes_alloc * 2;
+      size_t new_nodes_alloc = dfa->nodes_alloc * 2;
       int *new_nexts, *new_indices;
       re_node_set *new_edests, *new_eclosures;
+      re_token_t *new_nodes;
 
-      re_token_t *new_array = re_realloc (dfa->nodes, re_token_t,
-					  new_nodes_alloc);
-      if (BE (new_array == NULL, 0))
+      /* Avoid overflows.  */
+      if (BE (new_nodes_alloc < dfa->nodes_alloc, 0))
 	return -1;
-      dfa->nodes = new_array;
+
+      new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
+      if (BE (new_nodes == NULL, 0))
+	return -1;
+      dfa->nodes = new_nodes;
       new_nexts = re_realloc (dfa->nexts, int, new_nodes_alloc);
       new_indices = re_realloc (dfa->org_indices, int, new_nodes_alloc);
       new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc);
@@ -1381,10 +1446,9 @@ re_dfa_add_node (dfa, token)
   return dfa->nodes_len++;
 }
 
-static unsigned int inline
-calc_state_hash (nodes, context)
-     const re_node_set *nodes;
-     unsigned int context;
+static inline unsigned int
+internal_function
+calc_state_hash (const re_node_set *nodes, unsigned int context)
 {
   unsigned int hash = nodes->nelem + context;
   int i;
@@ -1402,11 +1466,10 @@ calc_state_hash (nodes, context)
 	 - We never return non-NULL value in case of any errors, it is for
 	   optimization.  */
 
-static re_dfastate_t*
-re_acquire_state (err, dfa, nodes)
-     reg_errcode_t *err;
-     re_dfa_t *dfa;
-     const re_node_set *nodes;
+static re_dfastate_t *
+internal_function
+re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
+		  const re_node_set *nodes)
 {
   unsigned int hash;
   re_dfastate_t *new_state;
@@ -1431,13 +1494,10 @@ re_acquire_state (err, dfa, nodes)
 
   /* There are no appropriate state in the dfa, create the new one.  */
   new_state = create_ci_newstate (dfa, nodes, hash);
-  if (BE (new_state != NULL, 1))
-    return new_state;
-  else
-    {
-      *err = REG_ESPACE;
-      return NULL;
-    }
+  if (BE (new_state == NULL, 0))
+    *err = REG_ESPACE;
+
+  return new_state;
 }
 
 /* Search for the state whose node_set is equivalent to NODES and
@@ -1450,12 +1510,10 @@ re_acquire_state (err, dfa, nodes)
 	 - We never return non-NULL value in case of any errors, it is for
 	   optimization.  */
 
-static re_dfastate_t*
-re_acquire_state_context (err, dfa, nodes, context)
-     reg_errcode_t *err;
-     re_dfa_t *dfa;
-     const re_node_set *nodes;
-     unsigned int context;
+static re_dfastate_t *
+internal_function
+re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa,
+			  const re_node_set *nodes, unsigned int context)
 {
   unsigned int hash;
   re_dfastate_t *new_state;
@@ -1479,13 +1537,10 @@ re_acquire_state_context (err, dfa, nodes, context)
     }
   /* There are no appropriate state in `dfa', create the new one.  */
   new_state = create_cd_newstate (dfa, nodes, context, hash);
-  if (BE (new_state != NULL, 1))
-    return new_state;
-  else
-    {
-      *err = REG_ESPACE;
-      return NULL;
-    }
+  if (BE (new_state == NULL, 0))
+    *err = REG_ESPACE;
+
+  return new_state;
 }
 
 /* Finish initialization of the new state NEWSTATE, and using its hash value
@@ -1493,10 +1548,8 @@ re_acquire_state_context (err, dfa, nodes, context)
    indicates the error code if failed.  */
 
 static reg_errcode_t
-register_state (dfa, newstate, hash)
-     re_dfa_t *dfa;
-     re_dfastate_t *newstate;
-     unsigned int hash;
+register_state (const re_dfa_t *dfa, re_dfastate_t *newstate,
+		unsigned int hash)
 {
   struct re_state_table_entry *spot;
   reg_errcode_t err;
@@ -1528,14 +1581,29 @@ register_state (dfa, newstate, hash)
   return REG_NOERROR;
 }
 
+static void
+free_state (re_dfastate_t *state)
+{
+  re_node_set_free (&state->non_eps_nodes);
+  re_node_set_free (&state->inveclosure);
+  if (state->entrance_nodes != &state->nodes)
+    {
+      re_node_set_free (state->entrance_nodes);
+      re_free (state->entrance_nodes);
+    }
+  re_node_set_free (&state->nodes);
+  re_free (state->word_trtable);
+  re_free (state->trtable);
+  re_free (state);
+}
+
 /* Create the new state which is independ of contexts.
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
-create_ci_newstate (dfa, nodes, hash)
-     re_dfa_t *dfa;
-     const re_node_set *nodes;
-     unsigned int hash;
+internal_function
+create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
+		    unsigned int hash)
 {
   int i;
   reg_errcode_t err;
@@ -1583,10 +1651,9 @@ create_ci_newstate (dfa, nodes, hash)
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
-create_cd_newstate (dfa, nodes, context, hash)
-     re_dfa_t *dfa;
-     const re_node_set *nodes;
-     unsigned int context, hash;
+internal_function
+create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
+		    unsigned int context, unsigned int hash)
 {
   int i, nctx_nodes = 0;
   reg_errcode_t err;
@@ -1657,20 +1724,3 @@ create_cd_newstate (dfa, nodes, context, hash)
     }
   return  newstate;
 }
-
-static void
-free_state (state)
-     re_dfastate_t *state;
-{
-  re_node_set_free (&state->non_eps_nodes);
-  re_node_set_free (&state->inveclosure);
-  if (state->entrance_nodes != &state->nodes)
-    {
-      re_node_set_free (state->entrance_nodes);
-      re_free (state->entrance_nodes);
-    }
-  re_node_set_free (&state->nodes);
-  re_free (state->word_trtable);
-  re_free (state->trtable);
-  re_free (state);
-}
diff --git a/regex_internal.h b/regex_internal.h
index 2e7b451c..0bd2ffc2 100644
--- a/regex_internal.h
+++ b/regex_internal.h
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.  */
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #ifndef _REGEX_INTERNAL_H
 #define _REGEX_INTERNAL_H 1
@@ -39,6 +39,20 @@
 #if defined HAVE_WCTYPE_H || defined _LIBC
 # include <wctype.h>
 #endif /* HAVE_WCTYPE_H || _LIBC */
+#if defined HAVE_STDBOOL_H || defined _LIBC
+# include <stdbool.h>
+#endif /* HAVE_STDBOOL_H || _LIBC */
+#if defined HAVE_STDINT_H || defined _LIBC
+# include <stdint.h>
+#endif /* HAVE_STDINT_H || _LIBC */
+#if defined _LIBC
+# include <bits/libc-lock.h>
+#else
+# define __libc_lock_define(CLASS,NAME)
+# define __libc_lock_init(NAME) do { } while (0)
+# define __libc_lock_lock(NAME) do { } while (0)
+# define __libc_lock_unlock(NAME) do { } while (0)
+#endif
 
 #ifndef GAWK
 /* In case that the system doesn't have isblank().  */
@@ -49,7 +63,7 @@
 /*
  * This is a freaking mess. On glibc systems you have to define
  * a magic constant to get isblank() out of <ctype.h>, since it's
- * a C99 function.  To heck wiht all that and borrow a page from
+ * a C99 function.  To heck with all that and borrow a page from
  * dfa.c's book.
  */
 
@@ -75,7 +89,7 @@ is_blank (int c)
 # ifdef _LIBC
 #  undef gettext
 #  define gettext(msgid) \
-  INTUSE(__dcgettext) (INTUSE(_libc_intl_domainname), msgid, LC_MESSAGES)
+  INTUSE(__dcgettext) (_libc_intl_domainname, msgid, LC_MESSAGES)
 # endif
 #else
 # define gettext(msgid) (msgid)
@@ -87,6 +101,11 @@ is_blank (int c)
 # define gettext_noop(String) String
 #endif
 
+/* For loser systems without the definition.  */
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+
 #ifndef NO_MBSUPPORT
 #include "mbsupport.h" /* gawk */
 #endif
@@ -105,8 +124,6 @@ is_blank (int c)
 # define inline
 #endif
 
-/* Number of bits in a byte.  */
-#define BYTE_BITS 8
 /* Number of single byte character.  */
 #define SBC_MAX 256
 
@@ -121,6 +138,7 @@ is_blank (int c)
 # define __wctype wctype
 # define __iswctype iswctype
 # define __btowc btowc
+#undef __mempcpy	/* GAWK */
 # define __mempcpy mempcpy
 # define __wcrtomb wcrtomb
 # define __regfree regfree
@@ -133,42 +151,31 @@ is_blank (int c)
 # define __attribute(arg)
 #endif
 
-/* Error messages (regcomp.c), with hackery to support very old compilers.  */
-#ifdef NO_TOKEN_PASTING
-#define RE_ERRMSG(idx)  __re_error_msgid[(int) (idx)]
-#define ERRMSG_TYPE                 char * const        /* pointers */
-#define ERRMSG_OFFSET(base,offset)  ((base)+1)          /* array index */
-#define ERRMSG_SEPARATOR            ,               
-#else                                               
-#define RE_ERRMSG(idx)  (__re_error_msgid + __re_error_msgid_idx[(int) (idx)])
-#define ERRMSG_TYPE                 char                /* one string */
-#define ERRMSG_OFFSET(base,offset)  ((base)+(offset))   /* substring index */
-#define ERRMSG_SEPARATOR            "\0"
-#endif
-
-extern const ERRMSG_TYPE __re_error_msgid[] attribute_hidden;
+extern const char __re_error_msgid[] attribute_hidden;
 extern const size_t __re_error_msgid_idx[] attribute_hidden;
 
-/* Number of bits in an unsinged int.  */
-#define UINT_BITS (sizeof (unsigned int) * BYTE_BITS)
-/* Number of unsigned int in an bit_set.  */
-#define BITSET_UINTS ((SBC_MAX + UINT_BITS - 1) / UINT_BITS)
-typedef unsigned int bitset[BITSET_UINTS];
-typedef unsigned int *re_bitset_ptr_t;
-typedef const unsigned int *re_const_bitset_ptr_t;
-
-#define bitset_set(set,i) (set[i / UINT_BITS] |= 1 << i % UINT_BITS)
-#define bitset_clear(set,i) (set[i / UINT_BITS] &= ~(1 << i % UINT_BITS))
-#define bitset_contain(set,i) (set[i / UINT_BITS] & (1 << i % UINT_BITS))
-#define bitset_empty(set) memset (set, 0, sizeof (unsigned int) * BITSET_UINTS)
-#define bitset_set_all(set) \
-  memset (set, 255, sizeof (unsigned int) * BITSET_UINTS)
-#define bitset_copy(dest,src) \
-  memcpy (dest, src, sizeof (unsigned int) * BITSET_UINTS)
-static inline void bitset_not (bitset set);
-static inline void bitset_merge (bitset dest, const bitset src);
-static inline void bitset_not_merge (bitset dest, const bitset src);
-static inline void bitset_mask (bitset dest, const bitset src);
+/* An integer used to represent a set of bits.  It must be unsigned,
+   and must be at least as wide as unsigned int.  */
+typedef unsigned long int bitset_word_t;
+/* All bits set in a bitset_word_t.  */
+#define BITSET_WORD_MAX ULONG_MAX
+/* Number of bits in a bitset_word_t.  */
+#define BITSET_WORD_BITS (sizeof (bitset_word_t) * CHAR_BIT)
+/* Number of bitset_word_t in a bit_set.  */
+#define BITSET_WORDS (SBC_MAX / BITSET_WORD_BITS)
+typedef bitset_word_t bitset_t[BITSET_WORDS];
+typedef bitset_word_t *re_bitset_ptr_t;
+typedef const bitset_word_t *re_const_bitset_ptr_t;
+
+#define bitset_set(set,i) \
+  (set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS)
+#define bitset_clear(set,i) \
+  (set[i / BITSET_WORD_BITS] &= ~((bitset_word_t) 1 << i % BITSET_WORD_BITS))
+#define bitset_contain(set,i) \
+  (set[i / BITSET_WORD_BITS] & ((bitset_word_t) 1 << i % BITSET_WORD_BITS))
+#define bitset_empty(set) memset (set, '\0', sizeof (bitset_t))
+#define bitset_set_all(set) memset (set, '\xff', sizeof (bitset_t))
+#define bitset_copy(dest,src) memcpy (dest, src, sizeof (bitset_t))
 
 #define PREV_WORD_CONSTRAINT 0x0001
 #define PREV_NOTWORD_CONSTRAINT 0x0002
@@ -374,7 +381,7 @@ struct re_string_t
      the beginning of the input string.  */
   unsigned int tip_context;
   /* The translation passed as a part of an argument of re_compile_pattern.  */
-  unsigned RE_TRANSLATE_TYPE trans;
+  RE_TRANSLATE_TYPE trans;
   /* Copy of re_dfa_t's word_char.  */
   re_const_bitset_ptr_t word_char;
   /* 1 if REG_ICASE.  */
@@ -401,45 +408,18 @@ typedef struct re_dfa_t re_dfa_t;
 # endif
 #endif
 
-#ifndef RE_NO_INTERNAL_PROTOTYPES
-static reg_errcode_t re_string_allocate (re_string_t *pstr, const char *str,
-					 int len, int init_len,
-					 RE_TRANSLATE_TYPE trans, int icase,
-					 const re_dfa_t *dfa)
-     internal_function;
-static reg_errcode_t re_string_construct (re_string_t *pstr, const char *str,
-					  int len, RE_TRANSLATE_TYPE trans,
-					  int icase, const re_dfa_t *dfa)
-     internal_function;
-static reg_errcode_t re_string_reconstruct (re_string_t *pstr, int idx,
-					    int eflags) internal_function;
 static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
 						int new_buf_len)
      internal_function;
-# ifdef RE_ENABLE_I18N
+#ifdef RE_ENABLE_I18N
 static void build_wcs_buffer (re_string_t *pstr) internal_function;
-static int build_wcs_upper_buffer (re_string_t *pstr) internal_function;
-# endif /* RE_ENABLE_I18N */
+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr) internal_function;
+#endif /* RE_ENABLE_I18N */
 static void build_upper_buffer (re_string_t *pstr) internal_function;
 static void re_string_translate_buffer (re_string_t *pstr) internal_function;
-static void re_string_destruct (re_string_t *pstr) internal_function;
-# ifdef RE_ENABLE_I18N
-static int re_string_elem_size_at (const re_string_t *pstr, int idx)
-     internal_function __attribute ((pure));
-static inline int re_string_char_size_at (const re_string_t *pstr, int idx)
-     internal_function __attribute ((pure));
-static inline wint_t re_string_wchar_at (const re_string_t *pstr, int idx)
-     internal_function __attribute ((pure));
-# endif /* RE_ENABLE_I18N */
 static unsigned int re_string_context_at (const re_string_t *input, int idx,
 					  int eflags)
      internal_function __attribute ((pure));
-static unsigned char re_string_peek_byte_case (const re_string_t *pstr,
-					       int idx)
-     internal_function __attribute ((pure));
-static unsigned char re_string_fetch_byte_case (re_string_t *pstr)
-     internal_function __attribute ((pure));
-#endif
 #define re_string_peek_byte(pstr, offset) \
   ((pstr)->mbs[(pstr)->cur_idx + offset])
 #define re_string_fetch_byte(pstr) \
@@ -457,6 +437,25 @@ static unsigned char re_string_fetch_byte_case (re_string_t *pstr)
 #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
 #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
 
+#ifndef _LIBC
+# if HAVE_ALLOCA
+#  if (_MSC_VER)
+#   include <malloc.h>
+#   define __libc_use_alloca(n) 0
+#  else
+#   include <alloca.h>
+/* The OS usually guarantees only one guard page at the bottom of the stack,
+   and a page size can be as small as 4096 bytes.  So we cannot safely
+   allocate anything larger than 4096 bytes.  Also care for the possibility
+   of a few compiler-allocated temporary stack slots.  */
+#  define __libc_use_alloca(n) ((n) < 4032)
+#  endif
+# else
+/* alloca is implemented with malloc, so just use malloc.  */
+#  define __libc_use_alloca(n) 0
+# endif
+#endif
+
 #define re_malloc(t,n) ((t *) malloc ((n) * sizeof (t)))
 /* SunOS 4.1.x realloc doesn't accept null pointers: pre-Standard C. Sigh. */
 #define re_realloc(p,t,n) ((p != NULL) ? (t *) realloc (p,(n)*sizeof(t)) : (t *) calloc(n,sizeof(t)))
@@ -569,7 +568,6 @@ typedef struct
 {
   int str_idx;
   int node;
-  int next_last_offset;
   state_array_t *path;
   int alasts; /* Allocation size of LASTS.  */
   int nlasts; /* The number of LASTS.  */
@@ -592,9 +590,9 @@ typedef struct
   /* The string object corresponding to the input string.  */
   re_string_t input;
 #if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-  re_dfa_t *const dfa;
+  const re_dfa_t *const dfa;
 #else
-  re_dfa_t *dfa;
+  const re_dfa_t *dfa;
 #endif
   /* EFLAGS of the argument of regexec.  */
   int eflags;
@@ -641,8 +639,8 @@ struct re_fail_stack_t
 struct re_dfa_t
 {
   re_token_t *nodes;
-  int nodes_alloc;
-  int nodes_len;
+  size_t nodes_alloc;
+  size_t nodes_len;
   int *nexts;
   int *org_indices;
   re_node_set *edests;
@@ -660,13 +658,12 @@ struct re_dfa_t
 
   /* number of subexpressions `re_nsub' is in regex_t.  */
   unsigned int state_hash_mask;
-  int states_alloc;
   int init_node;
   int nbackref; /* The number of backreference in this dfa.  */
 
   /* Bitmap expressing which backreference is used.  */
-  unsigned int used_bkref_map;
-  unsigned int completed_bkref_map;
+  bitset_word_t used_bkref_map;
+  bitset_word_t completed_bkref_map;
 
   unsigned int has_plural_match : 1;
   /* If this dfa has "multibyte node", which is a backreference or
@@ -677,52 +674,22 @@ struct re_dfa_t
   unsigned int map_notascii : 1;
   unsigned int word_ops_used : 1;
   int mb_cur_max;
-  bitset word_char;
+  bitset_t word_char;
   reg_syntax_t syntax;
   int *subexp_map;
 #ifdef DEBUG
   char* re_str;
 #endif
+#if defined _LIBC
+  __libc_lock_define (, lock)
+#endif
 };
 
-#ifndef RE_NO_INTERNAL_PROTOTYPES
-static reg_errcode_t re_node_set_alloc (re_node_set *set, int size) internal_function;
-static reg_errcode_t re_node_set_init_1 (re_node_set *set, int elem) internal_function;
-static reg_errcode_t re_node_set_init_2 (re_node_set *set, int elem1,
-					 int elem2) internal_function;
 #define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set))
-static reg_errcode_t re_node_set_init_copy (re_node_set *dest,
-					    const re_node_set *src) internal_function;
-static reg_errcode_t re_node_set_add_intersect (re_node_set *dest,
-						const re_node_set *src1,
-						const re_node_set *src2) internal_function;
-static reg_errcode_t re_node_set_init_union (re_node_set *dest,
-					     const re_node_set *src1,
-					     const re_node_set *src2) internal_function;
-static reg_errcode_t re_node_set_merge (re_node_set *dest,
-					const re_node_set *src) internal_function;
-static int re_node_set_insert (re_node_set *set, int elem) internal_function;
-static int re_node_set_insert_last (re_node_set *set,
-				    int elem) internal_function;
-static int re_node_set_compare (const re_node_set *set1,
-				const re_node_set *set2)
-     internal_function __attribute ((pure));
-static int re_node_set_contains (const re_node_set *set, int elem)
-     internal_function __attribute ((pure));
-static void re_node_set_remove_at (re_node_set *set, int idx) internal_function;
 #define re_node_set_remove(set,id) \
   (re_node_set_remove_at (set, re_node_set_contains (set, id) - 1))
 #define re_node_set_empty(p) ((p)->nelem = 0)
 #define re_node_set_free(set) re_free ((set)->elems)
-static int re_dfa_add_node (re_dfa_t *dfa, re_token_t token) internal_function;
-static re_dfastate_t *re_acquire_state (reg_errcode_t *err, re_dfa_t *dfa,
-					const re_node_set *nodes) internal_function;
-static re_dfastate_t *re_acquire_state_context (reg_errcode_t *err,
-						re_dfa_t *dfa,
-						const re_node_set *nodes,
-						unsigned int context) internal_function;
-static void free_state (re_dfastate_t *state) internal_function;
-#endif
 
 
 typedef enum
@@ -748,41 +715,33 @@ typedef struct
 
 /* Inline functions for bitset operation.  */
 static inline void
-bitset_not (bitset set)
+bitset_not (bitset_t set)
 {
   int bitset_i;
-  for (bitset_i = 0; bitset_i < BITSET_UINTS; ++bitset_i)
+  for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i)
     set[bitset_i] = ~set[bitset_i];
 }
 
 static inline void
-bitset_merge (bitset dest, const bitset src)
+bitset_merge (bitset_t dest, const bitset_t src)
 {
   int bitset_i;
-  for (bitset_i = 0; bitset_i < BITSET_UINTS; ++bitset_i)
+  for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i)
     dest[bitset_i] |= src[bitset_i];
 }
 
 static inline void
-bitset_not_merge (bitset dest, const bitset src)
-{
-  int i;
-  for (i = 0; i < BITSET_UINTS; ++i)
-    dest[i] |= ~src[i];
-}
-
-static inline void
-bitset_mask (bitset dest, const bitset src)
+bitset_mask (bitset_t dest, const bitset_t src)
 {
   int bitset_i;
-  for (bitset_i = 0; bitset_i < BITSET_UINTS; ++bitset_i)
+  for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i)
     dest[bitset_i] &= src[bitset_i];
 }
 
-#if defined RE_ENABLE_I18N && !defined RE_NO_INTERNAL_PROTOTYPES
+#ifdef RE_ENABLE_I18N
 /* Inline functions for re_string.  */
 static inline int
-internal_function
+internal_function __attribute ((pure))
 re_string_char_size_at (const re_string_t *pstr, int idx)
 {
   int byte_idx;
@@ -795,7 +754,7 @@ re_string_char_size_at (const re_string_t *pstr, int idx)
 }
 
 static inline wint_t
-internal_function
+internal_function __attribute ((pure))
 re_string_wchar_at (const re_string_t *pstr, int idx)
 {
   if (pstr->mb_cur_max == 1)
@@ -804,14 +763,14 @@ re_string_wchar_at (const re_string_t *pstr, int idx)
 }
 
 static int
-internal_function
+internal_function __attribute ((pure))
 re_string_elem_size_at (const re_string_t *pstr, int idx)
 {
-#ifdef _LIBC
+# ifdef _LIBC
   const unsigned char *p, *extra;
   const int32_t *table, *indirect;
   int32_t tmp;
-# include <locale/weight.h>
+#  include <locale/weight.h>
   uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
 
   if (nrules != 0)
@@ -826,7 +785,7 @@ re_string_elem_size_at (const re_string_t *pstr, int idx)
       return p - pstr->mbs - idx;
     }
   else
-#endif /* _LIBC */
+# endif /* _LIBC */
     return 1;
 }
 #endif /* RE_ENABLE_I18N */
diff --git a/regexec.c b/regexec.c
index 560cc4c2..9502aec2 100644
--- a/regexec.c
+++ b/regexec.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -25,7 +25,7 @@ static void match_ctx_free (re_match_context_t *cache) internal_function;
 static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, int node,
 					  int str_idx, int from, int to)
      internal_function;
-static int search_cur_bkref_entry (re_match_context_t *mctx, int str_idx)
+static int search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx)
      internal_function;
 static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, int node,
 					   int str_idx) internal_function;
@@ -52,81 +52,76 @@ static int re_search_stub (struct re_pattern_buffer *bufp,
 			   int ret_len) internal_function;
 static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch,
 			      int nregs, int regs_allocated) internal_function;
-static inline re_dfastate_t *acquire_init_state_context
-     (reg_errcode_t *err, const re_match_context_t *mctx, int idx)
-     __attribute ((always_inline)) internal_function;
 static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx)
      internal_function;
 static int check_matching (re_match_context_t *mctx, int fl_longest_match,
-			   int *p_match_first)
-     internal_function;
-static int check_halt_node_context (const re_dfa_t *dfa, int node,
-				    unsigned int context) internal_function;
+			   int *p_match_first) internal_function;
 static int check_halt_state_context (const re_match_context_t *mctx,
 				     const re_dfastate_t *state, int idx)
      internal_function;
-static void update_regs (re_dfa_t *dfa, regmatch_t *pmatch,
+static void update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
 			 regmatch_t *prev_idx_match, int cur_node,
 			 int cur_idx, int nmatch) internal_function;
-static int proceed_next_node (const re_match_context_t *mctx,
-			      int nregs, regmatch_t *regs,
-			      int *pidx, int node, re_node_set *eps_via_nodes,
-			      struct re_fail_stack_t *fs) internal_function;
 static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs,
 				      int str_idx, int dest_node, int nregs,
 				      regmatch_t *regs,
-				      re_node_set *eps_via_nodes) internal_function;
-static int pop_fail_stack (struct re_fail_stack_t *fs, int *pidx, int nregs,
-			   regmatch_t *regs, re_node_set *eps_via_nodes) internal_function;
+				      re_node_set *eps_via_nodes)
+     internal_function;
 static reg_errcode_t set_regs (const regex_t *preg,
 			       const re_match_context_t *mctx,
 			       size_t nmatch, regmatch_t *pmatch,
 			       int fl_backtrack) internal_function;
-static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs) internal_function;
+static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs)
+     internal_function;
 
 #ifdef RE_ENABLE_I18N
 static int sift_states_iter_mb (const re_match_context_t *mctx,
 				re_sift_context_t *sctx,
-				int node_idx, int str_idx, int max_str_idx) internal_function;
+				int node_idx, int str_idx, int max_str_idx)
+     internal_function;
 #endif /* RE_ENABLE_I18N */
-static reg_errcode_t sift_states_backward (re_match_context_t *mctx,
-					   re_sift_context_t *sctx) internal_function;
-static reg_errcode_t build_sifted_states (re_match_context_t *mctx,
+static reg_errcode_t sift_states_backward (const re_match_context_t *mctx,
+					   re_sift_context_t *sctx)
+     internal_function;
+static reg_errcode_t build_sifted_states (const re_match_context_t *mctx,
 					  re_sift_context_t *sctx, int str_idx,
-					  re_node_set *cur_dest) internal_function;
-static reg_errcode_t update_cur_sifted_state (re_match_context_t *mctx,
+					  re_node_set *cur_dest)
+     internal_function;
+static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx,
 					      re_sift_context_t *sctx,
 					      int str_idx,
-					      re_node_set *dest_nodes) internal_function;
-static reg_errcode_t add_epsilon_src_nodes (re_dfa_t *dfa,
-					    re_node_set *dest_nodes,
-					    const re_node_set *candidates) internal_function;
-static reg_errcode_t sub_epsilon_src_nodes (re_dfa_t *dfa, int node,
+					      re_node_set *dest_nodes)
+     internal_function;
+static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa,
 					    re_node_set *dest_nodes,
-					    const re_node_set *and_nodes) internal_function;
-static int check_dst_limits (re_match_context_t *mctx, re_node_set *limits,
+					    const re_node_set *candidates)
+     internal_function;
+static int check_dst_limits (const re_match_context_t *mctx,
+			     re_node_set *limits,
 			     int dst_node, int dst_idx, int src_node,
 			     int src_idx) internal_function;
-static int check_dst_limits_calc_pos_1 (re_match_context_t *mctx,
+static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx,
 					int boundaries, int subexp_idx,
-					int from_node, int bkref_idx) internal_function;
-static int check_dst_limits_calc_pos (re_match_context_t *mctx,
+					int from_node, int bkref_idx)
+     internal_function;
+static int check_dst_limits_calc_pos (const re_match_context_t *mctx,
 				      int limit, int subexp_idx,
 				      int node, int str_idx,
 				      int bkref_idx) internal_function;
-static reg_errcode_t check_subexp_limits (re_dfa_t *dfa,
+static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa,
 					  re_node_set *dest_nodes,
 					  const re_node_set *candidates,
 					  re_node_set *limits,
 					  struct re_backref_cache_entry *bkref_ents,
 					  int str_idx) internal_function;
-static reg_errcode_t sift_states_bkref (re_match_context_t *mctx,
+static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx,
 					re_sift_context_t *sctx,
-					int str_idx, const re_node_set *candidates) internal_function;
-static reg_errcode_t clean_state_log_if_needed (re_match_context_t *mctx,
-					        int next_state_log_idx) internal_function;
-static reg_errcode_t merge_state_array (re_dfa_t *dfa, re_dfastate_t **dst,
-					re_dfastate_t **src, int num) internal_function;
+					int str_idx, const re_node_set *candidates)
+     internal_function;
+static reg_errcode_t merge_state_array (const re_dfa_t *dfa,
+					re_dfastate_t **dst,
+					re_dfastate_t **src, int num)
+     internal_function;
 static re_dfastate_t *find_recover_state (reg_errcode_t *err,
 					 re_match_context_t *mctx) internal_function;
 static re_dfastate_t *transit_state (reg_errcode_t *err,
@@ -134,27 +129,33 @@ static re_dfastate_t *transit_state (reg_errcode_t *err,
 				     re_dfastate_t *state) internal_function;
 static re_dfastate_t *merge_state_with_log (reg_errcode_t *err,
 					    re_match_context_t *mctx,
-					    re_dfastate_t *next_state) internal_function;
+					    re_dfastate_t *next_state)
+     internal_function;
 static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx,
 						re_node_set *cur_nodes,
 						int str_idx) internal_function;
 #if 0
 static re_dfastate_t *transit_state_sb (reg_errcode_t *err,
 					re_match_context_t *mctx,
-					re_dfastate_t *pstate) internal_function;
+					re_dfastate_t *pstate)
+     internal_function;
 #endif
 #ifdef RE_ENABLE_I18N
 static reg_errcode_t transit_state_mb (re_match_context_t *mctx,
-				       re_dfastate_t *pstate) internal_function;
+				       re_dfastate_t *pstate)
+     internal_function;
 #endif /* RE_ENABLE_I18N */
 static reg_errcode_t transit_state_bkref (re_match_context_t *mctx,
-					  const re_node_set *nodes) internal_function;
+					  const re_node_set *nodes)
+     internal_function;
 static reg_errcode_t get_subexp (re_match_context_t *mctx,
-				 int bkref_node, int bkref_str_idx) internal_function;
+				 int bkref_node, int bkref_str_idx)
+     internal_function;
 static reg_errcode_t get_subexp_sub (re_match_context_t *mctx,
 				     const re_sub_match_top_t *sub_top,
 				     re_sub_match_last_t *sub_last,
-				     int bkref_node, int bkref_str) internal_function;
+				     int bkref_node, int bkref_str)
+     internal_function;
 static int find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
 			     int subexp_idx, int type) internal_function;
 static reg_errcode_t check_arrival (re_match_context_t *mctx,
@@ -164,34 +165,41 @@ static reg_errcode_t check_arrival (re_match_context_t *mctx,
 static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx,
 						   int str_idx,
 						   re_node_set *cur_nodes,
-						   re_node_set *next_nodes) internal_function;
-static reg_errcode_t check_arrival_expand_ecl (re_dfa_t *dfa,
+						   re_node_set *next_nodes)
+     internal_function;
+static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa,
 					       re_node_set *cur_nodes,
-					       int ex_subexp, int type) internal_function;
-static reg_errcode_t check_arrival_expand_ecl_sub (re_dfa_t *dfa,
+					       int ex_subexp, int type)
+     internal_function;
+static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa,
 						   re_node_set *dst_nodes,
 						   int target, int ex_subexp,
 						   int type) internal_function;
 static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx,
 					 re_node_set *cur_nodes, int cur_str,
-					 int subexp_num, int type) internal_function;
-static int build_trtable (re_dfa_t *dfa,
+					 int subexp_num, int type)
+     internal_function;
+static int build_trtable (const re_dfa_t *dfa,
 			  re_dfastate_t *state) internal_function;
 #ifdef RE_ENABLE_I18N
-static int check_node_accept_bytes (re_dfa_t *dfa, int node_idx,
-				    const re_string_t *input, int idx) internal_function;
+static int check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,
+				    const re_string_t *input, int idx)
+     internal_function;
 # ifdef _LIBC
 static unsigned int find_collation_sequence_value (const unsigned char *mbs,
-						   size_t name_len) internal_function;
+						   size_t name_len)
+     internal_function;
 # endif /* _LIBC */
 #endif /* RE_ENABLE_I18N */
-static int group_nodes_into_DFAstates (re_dfa_t *dfa,
+static int group_nodes_into_DFAstates (const re_dfa_t *dfa,
 				       const re_dfastate_t *state,
 				       re_node_set *states_node,
-				       bitset *states_ch) internal_function;
+				       bitset_t *states_ch) internal_function;
 static int check_node_accept (const re_match_context_t *mctx,
-			      const re_token_t *node, int idx) internal_function;
-static reg_errcode_t extend_buffers (re_match_context_t *mctx) internal_function;
+			      const re_token_t *node, int idx)
+     internal_function;
+static reg_errcode_t extend_buffers (re_match_context_t *mctx)
+     internal_function;
 
 /* Entry point for POSIX code.  */
 
@@ -233,12 +241,15 @@ regexec (preg, string, nmatch, pmatch, eflags)
       start = 0;
       length = strlen (string);
     }
+
+  __libc_lock_lock (dfa->lock);
   if (preg->no_sub)
     err = re_search_internal (preg, string, length, start, length - start,
 			      length, 0, NULL, eflags);
   else
     err = re_search_internal (preg, string, length, start, length - start,
 			      length, nmatch, pmatch, eflags);
+  __libc_lock_unlock (dfa->lock);
   return err != REG_NOERROR;
 }
 
@@ -411,6 +422,8 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len)
   else if (BE (start + range < 0, 0))
     range = -start;
 
+  __libc_lock_lock (dfa->lock);
+
   eflags |= (bufp->not_bol) ? REG_NOTBOL : 0;
   eflags |= (bufp->not_eol) ? REG_NOTEOL : 0;
 
@@ -439,7 +452,10 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len)
     nregs = bufp->re_nsub + 1;
   pmatch = re_malloc (regmatch_t, nregs);
   if (BE (pmatch == NULL, 0))
-    return -2;
+    {
+      rval = -2;
+      goto out;
+    }
 
   result = re_search_internal (bufp, string, length, start, range, stop,
 			       nregs, pmatch, eflags);
@@ -469,6 +485,8 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len)
 	rval = pmatch[0].rm_so;
     }
   re_free (pmatch);
+ out:
+  __libc_lock_unlock (dfa->lock);
   return rval;
 }
 
@@ -602,7 +620,7 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch,
     regmatch_t pmatch[];
 {
   reg_errcode_t err;
-  re_dfa_t *dfa = (re_dfa_t *)preg->buffer;
+  const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer;
   int left_lim, right_lim, incr;
   int fl_longest_match, match_first, match_kind, match_last = -1;
   int extra_nmatch;
@@ -614,7 +632,7 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch,
 #endif
   char *fastmap = (preg->fastmap != NULL && preg->fastmap_accurate
 		   && range && !preg->can_be_null) ? preg->fastmap : NULL;
-  unsigned RE_TRANSLATE_TYPE t = (unsigned RE_TRANSLATE_TYPE) preg->translate;
+  RE_TRANSLATE_TYPE t = preg->translate;
 
 #if !(defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
   memset (&mctx, '\0', sizeof (re_match_context_t));
@@ -871,14 +889,14 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch,
 #ifdef RE_ENABLE_I18N
 	    if (BE (mctx.input.offsets_needed != 0, 0))
 	      {
-		if (pmatch[reg_idx].rm_so == mctx.input.valid_len)
-		  pmatch[reg_idx].rm_so += mctx.input.valid_raw_len - mctx.input.valid_len;
-		else
-		  pmatch[reg_idx].rm_so = mctx.input.offsets[pmatch[reg_idx].rm_so];
-		if (pmatch[reg_idx].rm_eo == mctx.input.valid_len)
-		  pmatch[reg_idx].rm_eo += mctx.input.valid_raw_len - mctx.input.valid_len;
-		else
-		  pmatch[reg_idx].rm_eo = mctx.input.offsets[pmatch[reg_idx].rm_eo];
+		pmatch[reg_idx].rm_so =
+		  (pmatch[reg_idx].rm_so == mctx.input.valid_len
+		   ? mctx.input.valid_raw_len
+		   : mctx.input.offsets[pmatch[reg_idx].rm_so]);
+		pmatch[reg_idx].rm_eo =
+		  (pmatch[reg_idx].rm_eo == mctx.input.valid_len
+		   ? mctx.input.valid_raw_len
+		   : mctx.input.offsets[pmatch[reg_idx].rm_eo]);
 	      }
 #else
 	    assert (mctx.input.offsets_needed == 0);
@@ -915,7 +933,7 @@ static reg_errcode_t
 prune_impossible_nodes (mctx)
      re_match_context_t *mctx;
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   int halt_node, match_last;
   reg_errcode_t ret;
   re_dfastate_t **sifted_states;
@@ -998,12 +1016,11 @@ prune_impossible_nodes (mctx)
    since initial states may have constraints like "\<", "^", etc..  */
 
 static inline re_dfastate_t *
-acquire_init_state_context (err, mctx, idx)
-     reg_errcode_t *err;
-     const re_match_context_t *mctx;
-     int idx;
+__attribute ((always_inline)) internal_function
+acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
+			    int idx)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   if (dfa->init_state->has_constraint)
     {
       unsigned int context;
@@ -1041,12 +1058,11 @@ acquire_init_state_context (err, mctx, idx)
    index of the buffer.  */
 
 static int
-check_matching (mctx, fl_longest_match, p_match_first)
-    re_match_context_t *mctx;
-    int fl_longest_match;
-    int *p_match_first;
+internal_function
+check_matching (re_match_context_t *mctx, int fl_longest_match,
+		int *p_match_first)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   reg_errcode_t err;
   int match = 0;
   int match_last = -1;
@@ -1173,10 +1189,9 @@ check_matching (mctx, fl_longest_match, p_match_first)
 
 /* Check NODE match the current context.  */
 
-static int check_halt_node_context (dfa, node, context)
-    const re_dfa_t *dfa;
-    int node;
-    unsigned int context;
+static int
+internal_function
+check_halt_node_context (const re_dfa_t *dfa, int node, unsigned int context)
 {
   re_token_type_t type = dfa->nodes[node].type;
   unsigned int constraint = dfa->nodes[node].constraint;
@@ -1194,10 +1209,9 @@ static int check_halt_node_context (dfa, node, context)
    match the context, return the node.  */
 
 static int
-check_halt_state_context (mctx, state, idx)
-    const re_match_context_t *mctx;
-    const re_dfastate_t *state;
-    int idx;
+internal_function
+check_halt_state_context (const re_match_context_t *mctx,
+			  const re_dfastate_t *state, int idx)
 {
   int i;
   unsigned int context;
@@ -1217,21 +1231,22 @@ check_halt_state_context (mctx, state, idx)
    of errors.  */
 
 static int
-proceed_next_node (mctx, nregs, regs, pidx, node, eps_via_nodes, fs)
-    const re_match_context_t *mctx;
-    regmatch_t *regs;
-    int nregs, *pidx, node;
-    re_node_set *eps_via_nodes;
-    struct re_fail_stack_t *fs;
+internal_function
+proceed_next_node (const re_match_context_t *mctx, int nregs, regmatch_t *regs,
+		   int *pidx, int node, re_node_set *eps_via_nodes,
+		   struct re_fail_stack_t *fs)
 {
-  re_dfa_t *const dfa = mctx->dfa;
-  int i, err, dest_node;
-  dest_node = -1;
+  const re_dfa_t *const dfa = mctx->dfa;
+  int i, err;
   if (IS_EPSILON_NODE (dfa->nodes[node].type))
     {
-      re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes;
+      re_node_set *cur_nodes;
       re_node_set *edests = &dfa->edests[node];
       int dest_node;
+
+      if (mctx->state_log[*pidx] == NULL)
+	return -1;
+      cur_nodes = &mctx->state_log[*pidx]->nodes;
       err = re_node_set_insert (eps_via_nodes, node);
       if (BE (err < 0, 0))
 	return -2;
@@ -1292,6 +1307,7 @@ proceed_next_node (mctx, nregs, regs, pidx, node, eps_via_nodes, fs)
 
 	  if (naccepted == 0)
 	    {
+	      int dest_node;
 	      err = re_node_set_insert (eps_via_nodes, node);
 	      if (BE (err < 0, 0))
 		return -2;
@@ -1305,7 +1321,7 @@ proceed_next_node (mctx, nregs, regs, pidx, node, eps_via_nodes, fs)
       if (naccepted != 0
 	  || check_node_accept (mctx, dfa->nodes + node, *pidx))
 	{
-	  dest_node = dfa->nexts[node];
+	  int dest_node = dfa->nexts[node];
 	  *pidx = (naccepted == 0) ? *pidx + 1 : *pidx + naccepted;
 	  if (fs && (*pidx > mctx->match_last || mctx->state_log[*pidx] == NULL
 		     || !re_node_set_contains (&mctx->state_log[*pidx]->nodes,
@@ -1319,11 +1335,9 @@ proceed_next_node (mctx, nregs, regs, pidx, node, eps_via_nodes, fs)
 }
 
 static reg_errcode_t
-push_fail_stack (fs, str_idx, dest_node, nregs, regs, eps_via_nodes)
-     struct re_fail_stack_t *fs;
-     int str_idx, dest_node, nregs;
-     regmatch_t *regs;
-     re_node_set *eps_via_nodes;
+internal_function
+push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node,
+		 int nregs, regmatch_t *regs, re_node_set *eps_via_nodes)
 {
   reg_errcode_t err;
   int num = fs->num++;
@@ -1348,11 +1362,9 @@ push_fail_stack (fs, str_idx, dest_node, nregs, regs, eps_via_nodes)
 }
 
 static int
-pop_fail_stack (fs, pidx, nregs, regs, eps_via_nodes)
-     struct re_fail_stack_t *fs;
-     int *pidx, nregs;
-     regmatch_t *regs;
-     re_node_set *eps_via_nodes;
+internal_function
+pop_fail_stack (struct re_fail_stack_t *fs, int *pidx, int nregs,
+		regmatch_t *regs, re_node_set *eps_via_nodes)
 {
   int num = --fs->num;
   assert (num >= 0);
@@ -1370,19 +1382,17 @@ pop_fail_stack (fs, pidx, nregs, regs, eps_via_nodes)
    pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch.  */
 
 static reg_errcode_t
-set_regs (preg, mctx, nmatch, pmatch, fl_backtrack)
-     const regex_t *preg;
-     const re_match_context_t *mctx;
-     size_t nmatch;
-     regmatch_t *pmatch;
-     int fl_backtrack;
+internal_function
+set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
+	  regmatch_t *pmatch, int fl_backtrack)
 {
-  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer;
   int idx, cur_node;
   re_node_set eps_via_nodes;
   struct re_fail_stack_t *fs;
   struct re_fail_stack_t fs_body = { 0, 2, NULL };
   regmatch_t *prev_idx_match;
+  int prev_idx_match_malloced = 0;
 
 #ifdef DEBUG
   assert (nmatch > 1);
@@ -1401,7 +1411,20 @@ set_regs (preg, mctx, nmatch, pmatch, fl_backtrack)
   cur_node = dfa->init_node;
   re_node_set_init_empty (&eps_via_nodes);
 
-  prev_idx_match = re_malloc (regmatch_t, nmatch);
+#ifdef HAVE_ALLOCA
+  if (__libc_use_alloca (nmatch * sizeof (regmatch_t)))
+    prev_idx_match = (regmatch_t *) alloca (nmatch * sizeof (regmatch_t));
+  else
+#endif
+    {
+      prev_idx_match = re_malloc (regmatch_t, nmatch);
+      if (prev_idx_match == NULL)
+	{
+	  free_fail_stack_return (fs);
+	  return REG_ESPACE;
+	}
+      prev_idx_match_malloced = 1;
+    }
   memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch);
 
   for (idx = pmatch[0].rm_so; idx <= pmatch[0].rm_eo ;)
@@ -1419,7 +1442,8 @@ set_regs (preg, mctx, nmatch, pmatch, fl_backtrack)
 	      if (reg_idx == nmatch)
 		{
 		  re_node_set_free (&eps_via_nodes);
-		  re_free (prev_idx_match);
+		  if (prev_idx_match_malloced)
+		    re_free (prev_idx_match);
 		  return free_fail_stack_return (fs);
 		}
 	      cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch,
@@ -1428,7 +1452,8 @@ set_regs (preg, mctx, nmatch, pmatch, fl_backtrack)
 	  else
 	    {
 	      re_node_set_free (&eps_via_nodes);
-	      re_free (prev_idx_match);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
 	      return REG_NOERROR;
 	    }
 	}
@@ -1442,8 +1467,9 @@ set_regs (preg, mctx, nmatch, pmatch, fl_backtrack)
 	  if (BE (cur_node == -2, 0))
 	    {
 	      re_node_set_free (&eps_via_nodes);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
 	      free_fail_stack_return (fs);
-	      re_free (prev_idx_match);
 	      return REG_ESPACE;
 	    }
 	  if (fs)
@@ -1452,19 +1478,21 @@ set_regs (preg, mctx, nmatch, pmatch, fl_backtrack)
 	  else
 	    {
 	      re_node_set_free (&eps_via_nodes);
-	      re_free (prev_idx_match);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
 	      return REG_NOMATCH;
 	    }
 	}
     }
   re_node_set_free (&eps_via_nodes);
-  re_free (prev_idx_match);
+  if (prev_idx_match_malloced)
+    re_free (prev_idx_match);
   return free_fail_stack_return (fs);
 }
 
 static reg_errcode_t
-free_fail_stack_return (fs)
-     struct re_fail_stack_t *fs;
+internal_function
+free_fail_stack_return (struct re_fail_stack_t *fs)
 {
   if (fs)
     {
@@ -1480,10 +1508,9 @@ free_fail_stack_return (fs)
 }
 
 static void
-update_regs (dfa, pmatch, prev_idx_match, cur_node, cur_idx, nmatch)
-     re_dfa_t *dfa;
-     regmatch_t *pmatch, *prev_idx_match;
-     int cur_node, cur_idx, nmatch;
+internal_function
+update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
+	     regmatch_t *prev_idx_match, int cur_node, int cur_idx, int nmatch)
 {
   int type = dfa->nodes[cur_node].type;
   if (type == OP_OPEN_SUBEXP)
@@ -1553,9 +1580,8 @@ update_regs (dfa, pmatch, prev_idx_match, cur_node, cur_idx, nmatch)
   ((state) != NULL && re_node_set_contains (&(state)->nodes, node))
 
 static reg_errcode_t
-sift_states_backward (mctx, sctx)
-     re_match_context_t *mctx;
-     re_sift_context_t *sctx;
+internal_function
+sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
 {
   reg_errcode_t err;
   int null_cnt = 0;
@@ -1612,14 +1638,12 @@ sift_states_backward (mctx, sctx)
 }
 
 static reg_errcode_t
-build_sifted_states (mctx, sctx, str_idx, cur_dest)
-     re_match_context_t *mctx;
-     re_sift_context_t *sctx;
-     int str_idx;
-     re_node_set *cur_dest;
+internal_function
+build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		     int str_idx, re_node_set *cur_dest)
 {
-  re_dfa_t *const dfa = mctx->dfa;
-  re_node_set *cur_src = &mctx->state_log[str_idx]->non_eps_nodes;
+  const re_dfa_t *const dfa = mctx->dfa;
+  const re_node_set *cur_src = &mctx->state_log[str_idx]->non_eps_nodes;
   int i;
 
   /* Then build the next sifted state.
@@ -1676,9 +1700,8 @@ build_sifted_states (mctx, sctx, str_idx, cur_dest)
 /* Helper functions.  */
 
 static reg_errcode_t
-clean_state_log_if_needed (mctx, next_state_log_idx)
-    re_match_context_t *mctx;
-    int next_state_log_idx;
+internal_function
+clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx)
 {
   int top = mctx->state_log_top;
 
@@ -1702,11 +1725,9 @@ clean_state_log_if_needed (mctx, next_state_log_idx)
 }
 
 static reg_errcode_t
-merge_state_array (dfa, dst, src, num)
-     re_dfa_t *dfa;
-     re_dfastate_t **dst;
-     re_dfastate_t **src;
-     int num;
+internal_function
+merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst,
+		   re_dfastate_t **src, int num)
 {
   int st_idx;
   reg_errcode_t err;
@@ -1731,14 +1752,13 @@ merge_state_array (dfa, dst, src, num)
 }
 
 static reg_errcode_t
-update_cur_sifted_state (mctx, sctx, str_idx, dest_nodes)
-     re_match_context_t *mctx;
-     re_sift_context_t *sctx;
-     int str_idx;
-     re_node_set *dest_nodes;
+internal_function
+update_cur_sifted_state (const re_match_context_t *mctx,
+			 re_sift_context_t *sctx, int str_idx,
+			 re_node_set *dest_nodes)
 {
-  re_dfa_t *const dfa = mctx->dfa;
-  reg_errcode_t err;
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err = REG_NOERROR;
   const re_node_set *candidates;
   candidates = ((mctx->state_log[str_idx] == NULL) ? NULL
 		: &mctx->state_log[str_idx]->nodes);
@@ -1780,10 +1800,9 @@ update_cur_sifted_state (mctx, sctx, str_idx, dest_nodes)
 }
 
 static reg_errcode_t
-add_epsilon_src_nodes (dfa, dest_nodes, candidates)
-     re_dfa_t *dfa;
-     re_node_set *dest_nodes;
-     const re_node_set *candidates;
+internal_function
+add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,
+		       const re_node_set *candidates)
 {
   reg_errcode_t err = REG_NOERROR;
   int i;
@@ -1806,11 +1825,9 @@ add_epsilon_src_nodes (dfa, dest_nodes, candidates)
 }
 
 static reg_errcode_t
-sub_epsilon_src_nodes (dfa, node, dest_nodes, candidates)
-     re_dfa_t *dfa;
-     int node;
-     re_node_set *dest_nodes;
-     const re_node_set *candidates;
+internal_function
+sub_epsilon_src_nodes (const re_dfa_t *dfa, int node, re_node_set *dest_nodes,
+		       const re_node_set *candidates)
 {
     int ecl_idx;
     reg_errcode_t err;
@@ -1857,12 +1874,11 @@ sub_epsilon_src_nodes (dfa, node, dest_nodes, candidates)
 }
 
 static int
-check_dst_limits (mctx, limits, dst_node, dst_idx, src_node, src_idx)
-     re_match_context_t *mctx;
-     re_node_set *limits;
-     int dst_node, dst_idx, src_node, src_idx;
+internal_function
+check_dst_limits (const re_match_context_t *mctx, re_node_set *limits,
+		  int dst_node, int dst_idx, int src_node, int src_idx)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   int lim_idx, src_pos, dst_pos;
 
   int dst_bkref_idx = search_cur_bkref_entry (mctx, dst_idx);
@@ -1894,12 +1910,12 @@ check_dst_limits (mctx, limits, dst_node, dst_idx, src_node, src_idx)
 }
 
 static int
-check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx, from_node, bkref_idx)
-     re_match_context_t *mctx;
-     int boundaries, subexp_idx, from_node, bkref_idx;
+internal_function
+check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
+			     int subexp_idx, int from_node, int bkref_idx)
 {
-  re_dfa_t *const dfa = mctx->dfa;
-  re_node_set *eclosures = dfa->eclosures + from_node;
+  const re_dfa_t *const dfa = mctx->dfa;
+  const re_node_set *eclosures = dfa->eclosures + from_node;
   int node_idx;
 
   /* Else, we are on the boundary: examine the nodes on the epsilon
@@ -1920,8 +1936,9 @@ check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx, from_node, bkref_idx)
 		  if (ent->node != node)
 		    continue;
 
-		  if (subexp_idx <= 8 * sizeof (ent->eps_reachable_subexps_map)
-		      && !(ent->eps_reachable_subexps_map & (1 << subexp_idx)))
+		  if (subexp_idx < BITSET_WORD_BITS
+		      && !(ent->eps_reachable_subexps_map
+			   & ((bitset_word_t) 1 << subexp_idx)))
 		    continue;
 
 		  /* Recurse trying to reach the OP_OPEN_SUBEXP and
@@ -1947,7 +1964,9 @@ check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx, from_node, bkref_idx)
 		  if (cpos == 0 && (boundaries & 2))
 		    return 0;
 
-		  ent->eps_reachable_subexps_map &= ~(1 << subexp_idx);
+		  if (subexp_idx < BITSET_WORD_BITS)
+		    ent->eps_reachable_subexps_map
+		      &= ~((bitset_word_t) 1 << subexp_idx);
 	        }
 	      while (ent++->more);
 	    }
@@ -1972,9 +1991,10 @@ check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx, from_node, bkref_idx)
 }
 
 static int
-check_dst_limits_calc_pos (mctx, limit, subexp_idx, from_node, str_idx, bkref_idx)
-     re_match_context_t *mctx;
-     int limit, subexp_idx, from_node, str_idx, bkref_idx;
+internal_function
+check_dst_limits_calc_pos (const re_match_context_t *mctx, int limit,
+			   int subexp_idx, int from_node, int str_idx,
+			   int bkref_idx)
 {
   struct re_backref_cache_entry *lim = mctx->bkref_ents + limit;
   int boundaries;
@@ -2001,13 +2021,10 @@ check_dst_limits_calc_pos (mctx, limit, subexp_idx, from_node, str_idx, bkref_id
    which are against limitations from DEST_NODES. */
 
 static reg_errcode_t
-check_subexp_limits (dfa, dest_nodes, candidates, limits, bkref_ents, str_idx)
-     re_dfa_t *dfa;
-     re_node_set *dest_nodes;
-     const re_node_set *candidates;
-     re_node_set *limits;
-     struct re_backref_cache_entry *bkref_ents;
-     int str_idx;
+internal_function
+check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
+		     const re_node_set *candidates, re_node_set *limits,
+		     struct re_backref_cache_entry *bkref_ents, int str_idx)
 {
   reg_errcode_t err;
   int node_idx, lim_idx;
@@ -2092,13 +2109,11 @@ check_subexp_limits (dfa, dest_nodes, candidates, limits, bkref_ents, str_idx)
 }
 
 static reg_errcode_t
-sift_states_bkref (mctx, sctx, str_idx, candidates)
-     re_match_context_t *mctx;
-     re_sift_context_t *sctx;
-     int str_idx;
-     const re_node_set *candidates;
+internal_function
+sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		   int str_idx, const re_node_set *candidates)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   reg_errcode_t err;
   int node_idx, node;
   re_sift_context_t local_sctx;
@@ -2126,7 +2141,10 @@ sift_states_bkref (mctx, sctx, str_idx, candidates)
       enabled_idx = first_idx;
       do
 	{
-	  int subexp_len, to_idx, dst_node;
+	  int subexp_len;
+	  int to_idx;
+	  int dst_node;
+	  int ret;
 	  re_dfastate_t *cur_state;
 
 	  if (entry->node != node)
@@ -2152,8 +2170,8 @@ sift_states_bkref (mctx, sctx, str_idx, candidates)
 	    }
 	  local_sctx.last_node = node;
 	  local_sctx.last_str_idx = str_idx;
-	  err = re_node_set_insert (&local_sctx.limits, enabled_idx);
-	  if (BE (err < 0, 0))
+	  ret = re_node_set_insert (&local_sctx.limits, enabled_idx);
+	  if (BE (ret < 0, 0))
 	    {
 	      err = REG_ESPACE;
 	      goto free_return;
@@ -2191,12 +2209,11 @@ sift_states_bkref (mctx, sctx, str_idx, candidates)
 
 #ifdef RE_ENABLE_I18N
 static int
-sift_states_iter_mb (mctx, sctx, node_idx, str_idx, max_str_idx)
-    const re_match_context_t *mctx;
-    re_sift_context_t *sctx;
-    int node_idx, str_idx, max_str_idx;
+internal_function
+sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		     int node_idx, int str_idx, int max_str_idx)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   int naccepted;
   /* Check the node can accept `multi byte'.  */
   naccepted = check_node_accept_bytes (dfa, node_idx, &mctx->input, str_idx);
@@ -2222,10 +2239,9 @@ sift_states_iter_mb (mctx, sctx, node_idx, str_idx, max_str_idx)
    update the destination of STATE_LOG.  */
 
 static re_dfastate_t *
-transit_state (err, mctx, state)
-     reg_errcode_t *err;
-     re_match_context_t *mctx;
-     re_dfastate_t *state;
+internal_function
+transit_state (reg_errcode_t *err, re_match_context_t *mctx,
+	       re_dfastate_t *state)
 {
   re_dfastate_t **trtable;
   unsigned char ch;
@@ -2281,12 +2297,11 @@ transit_state (err, mctx, state)
 
 /* Update the state_log if we need */
 re_dfastate_t *
-merge_state_with_log (err, mctx, next_state)
-     reg_errcode_t *err;
-     re_match_context_t *mctx;
-     re_dfastate_t *next_state;
+internal_function
+merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
+		      re_dfastate_t *next_state)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   int cur_idx = re_string_cur_idx (&mctx->input);
 
   if (cur_idx > mctx->state_log_top)
@@ -2361,11 +2376,10 @@ merge_state_with_log (err, mctx, next_state)
    multi-byte match, then look in the log for a state
    from which to restart matching.  */
 re_dfastate_t *
-find_recover_state (err, mctx)
-     reg_errcode_t *err;
-     re_match_context_t *mctx;
+internal_function
+find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
 {
-  re_dfastate_t *cur_state = NULL;
+  re_dfastate_t *cur_state;
   do
     {
       int max = mctx->state_log_top;
@@ -2381,7 +2395,7 @@ find_recover_state (err, mctx)
 
       cur_state = merge_state_with_log (err, mctx, NULL);
     }
-  while (err == REG_NOERROR && cur_state == NULL);
+  while (*err == REG_NOERROR && cur_state == NULL);
   return cur_state;
 }
 
@@ -2393,12 +2407,11 @@ find_recover_state (err, mctx)
    correspoding back references.  */
 
 static reg_errcode_t
-check_subexp_matching_top (mctx, cur_nodes, str_idx)
-     re_match_context_t *mctx;
-     re_node_set *cur_nodes;
-     int str_idx;
+internal_function
+check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes,
+			   int str_idx)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   int node_idx;
   reg_errcode_t err;
 
@@ -2411,8 +2424,9 @@ check_subexp_matching_top (mctx, cur_nodes, str_idx)
     {
       int node = cur_nodes->elems[node_idx];
       if (dfa->nodes[node].type == OP_OPEN_SUBEXP
-	  && dfa->nodes[node].opr.idx < (8 * sizeof (dfa->used_bkref_map))
-	  && dfa->used_bkref_map & (1 << dfa->nodes[node].opr.idx))
+	  && dfa->nodes[node].opr.idx < BITSET_WORD_BITS
+	  && (dfa->used_bkref_map
+	      & ((bitset_word_t) 1 << dfa->nodes[node].opr.idx)))
 	{
 	  err = match_ctx_add_subtop (mctx, node, str_idx);
 	  if (BE (err != REG_NOERROR, 0))
@@ -2427,12 +2441,10 @@ check_subexp_matching_top (mctx, cur_nodes, str_idx)
    accepting the current input byte.  */
 
 static re_dfastate_t *
-transit_state_sb (err, mctx, state)
-     reg_errcode_t *err;
-     re_match_context_t *mctx;
-     re_dfastate_t *state;
+transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,
+		  re_dfastate_t *state)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   re_node_set next_nodes;
   re_dfastate_t *next_state;
   int node_cnt, cur_str_idx = re_string_cur_idx (&mctx->input);
@@ -2468,11 +2480,10 @@ transit_state_sb (err, mctx, state)
 
 #ifdef RE_ENABLE_I18N
 static reg_errcode_t
-transit_state_mb (mctx, pstate)
-    re_match_context_t *mctx;
-    re_dfastate_t *pstate;
+internal_function
+transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   reg_errcode_t err;
   int i;
 
@@ -2525,7 +2536,8 @@ transit_state_mb (mctx, pstate)
 	  if (BE (err != REG_NOERROR, 0))
 	    return err;
 	}
-      context = re_string_context_at (&mctx->input, dest_idx - 1, mctx->eflags);
+      context = re_string_context_at (&mctx->input, dest_idx - 1,
+				      mctx->eflags);
       mctx->state_log[dest_idx]
 	= re_acquire_state_context (&err, dfa, &dest_nodes, context);
       if (dest_state != NULL)
@@ -2538,11 +2550,10 @@ transit_state_mb (mctx, pstate)
 #endif /* RE_ENABLE_I18N */
 
 static reg_errcode_t
-transit_state_bkref (mctx, nodes)
-    re_match_context_t *mctx;
-    const re_node_set *nodes;
+internal_function
+transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   reg_errcode_t err;
   int i;
   int cur_str_idx = re_string_cur_idx (&mctx->input);
@@ -2653,18 +2664,18 @@ transit_state_bkref (mctx, nodes)
    delay these checking for prune_impossible_nodes().  */
 
 static reg_errcode_t
-get_subexp (mctx, bkref_node, bkref_str_idx)
-     re_match_context_t *mctx;
-     int bkref_node, bkref_str_idx;
+internal_function
+get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   int subexp_num, sub_top_idx;
   const char *buf = (const char *) re_string_get_buffer (&mctx->input);
   /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX.  */
   int cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx);
   if (cache_idx != -1)
     {
-      const struct re_backref_cache_entry *entry = mctx->bkref_ents + cache_idx;
+      const struct re_backref_cache_entry *entry
+	= mctx->bkref_ents + cache_idx;
       do
         if (entry->node == bkref_node)
 	  return REG_NOERROR; /* We already checked it.  */
@@ -2711,7 +2722,8 @@ get_subexp (mctx, bkref_node, bkref_str_idx)
 		  buf = (const char *) re_string_get_buffer (&mctx->input);
 		}
 	      if (memcmp (buf + bkref_str_off, buf + sl_str, sl_str_diff) != 0)
-		break; /* We don't need to search this sub expression any more.  */
+		/* We don't need to search this sub expression any more.  */
+		break;
 	    }
 	  bkref_str_off += sl_str_diff;
 	  sl_str += sl_str_diff;
@@ -2762,7 +2774,8 @@ get_subexp (mctx, bkref_node, bkref_str_idx)
 	    continue;
 	  /* Does this state have a ')' of the sub expression?  */
 	  nodes = &mctx->state_log[sl_str]->nodes;
-	  cls_node = find_subexp_node (dfa, nodes, subexp_num, OP_CLOSE_SUBEXP);
+	  cls_node = find_subexp_node (dfa, nodes, subexp_num,
+				       OP_CLOSE_SUBEXP);
 	  if (cls_node == -1)
 	    continue; /* No.  */
 	  if (sub_top->path == NULL)
@@ -2775,7 +2788,8 @@ get_subexp (mctx, bkref_node, bkref_str_idx)
 	  /* Can the OP_OPEN_SUBEXP node arrive the OP_CLOSE_SUBEXP node
 	     in the current context?  */
 	  err = check_arrival (mctx, sub_top->path, sub_top->node,
-			       sub_top->str_idx, cls_node, sl_str, OP_CLOSE_SUBEXP);
+			       sub_top->str_idx, cls_node, sl_str,
+			       OP_CLOSE_SUBEXP);
 	  if (err == REG_NOMATCH)
 	      continue;
 	  if (BE (err != REG_NOERROR, 0))
@@ -2799,17 +2813,16 @@ get_subexp (mctx, bkref_node, bkref_str_idx)
    and SUB_LAST.  */
 
 static reg_errcode_t
-get_subexp_sub (mctx, sub_top, sub_last, bkref_node, bkref_str)
-     re_match_context_t *mctx;
-     const re_sub_match_top_t *sub_top;
-     re_sub_match_last_t *sub_last;
-     int bkref_node, bkref_str;
+internal_function
+get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top,
+		re_sub_match_last_t *sub_last, int bkref_node, int bkref_str)
 {
   reg_errcode_t err;
   int to_idx;
   /* Can the subexpression arrive the back reference?  */
   err = check_arrival (mctx, &sub_last->path, sub_last->node,
-		       sub_last->str_idx, bkref_node, bkref_str, OP_OPEN_SUBEXP);
+		       sub_last->str_idx, bkref_node, bkref_str,
+		       OP_OPEN_SUBEXP);
   if (err != REG_NOERROR)
     return err;
   err = match_ctx_add_entry (mctx, bkref_node, bkref_str, sub_top->str_idx,
@@ -2829,10 +2842,9 @@ get_subexp_sub (mctx, sub_top, sub_last, bkref_node, bkref_str)
 	 E.g. RE: (a){2}  */
 
 static int
-find_subexp_node (dfa, nodes, subexp_idx, type)
-     const re_dfa_t *dfa;
-     const re_node_set *nodes;
-     int subexp_idx, type;
+internal_function
+find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
+		  int subexp_idx, int type)
 {
   int cls_idx;
   for (cls_idx = 0; cls_idx < nodes->nelem; ++cls_idx)
@@ -2852,14 +2864,12 @@ find_subexp_node (dfa, nodes, subexp_idx, type)
    Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise.  */
 
 static reg_errcode_t
-check_arrival (mctx, path, top_node, top_str, last_node, last_str,
-	       type)
-     re_match_context_t *mctx;
-     state_array_t *path;
-     int top_node, top_str, last_node, last_str, type;
+internal_function
+check_arrival (re_match_context_t *mctx, state_array_t *path, int top_node,
+	       int top_str, int last_node, int last_str, int type)
 {
-  re_dfa_t *const dfa = mctx->dfa;
-  reg_errcode_t err;
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err = REG_NOERROR;
   int subexp_num, backup_cur_idx, str_idx, null_cnt;
   re_dfastate_t *cur_state = NULL;
   re_node_set *cur_nodes, next_nodes;
@@ -2874,7 +2884,7 @@ check_arrival (mctx, path, top_node, top_str, last_node, last_str,
       int old_alloc = path->alloc;
       path->alloc += last_str + mctx->max_mb_elem_len + 1;
       new_array = re_realloc (path->array, re_dfastate_t *, path->alloc);
-      if (new_array == NULL)
+      if (BE (new_array == NULL, 0))
 	{
 	  path->alloc = old_alloc;
 	  return REG_ESPACE;
@@ -2884,7 +2894,7 @@ check_arrival (mctx, path, top_node, top_str, last_node, last_str,
 	      sizeof (re_dfastate_t *) * (path->alloc - old_alloc));
     }
 
-  str_idx = path->next_idx == 0 ? top_str : path->next_idx;
+  str_idx = path->next_idx ? path->next_idx : top_str;
 
   /* Temporary modify MCTX.  */
   backup_state_log = mctx->state_log;
@@ -2912,7 +2922,7 @@ check_arrival (mctx, path, top_node, top_str, last_node, last_str,
       if (cur_state && cur_state->has_backref)
 	{
 	  err = re_node_set_init_copy (&next_nodes, &cur_state->nodes);
-	  if (BE ( err != REG_NOERROR, 0))
+	  if (BE (err != REG_NOERROR, 0))
 	    return err;
 	}
       else
@@ -2924,7 +2934,7 @@ check_arrival (mctx, path, top_node, top_str, last_node, last_str,
 	{
 	  err = expand_bkref_cache (mctx, &next_nodes, str_idx,
 				    subexp_num, type);
-	  if (BE ( err != REG_NOERROR, 0))
+	  if (BE (err != REG_NOERROR, 0))
 	    {
 	      re_node_set_free (&next_nodes);
 	      return err;
@@ -2955,7 +2965,8 @@ check_arrival (mctx, path, top_node, top_str, last_node, last_str,
       if (cur_state)
 	{
 	  err = check_arrival_add_next_nodes (mctx, str_idx,
-					      &cur_state->non_eps_nodes, &next_nodes);
+					      &cur_state->non_eps_nodes,
+					      &next_nodes);
 	  if (BE (err != REG_NOERROR, 0))
 	    {
 	      re_node_set_free (&next_nodes);
@@ -2973,7 +2984,7 @@ check_arrival (mctx, path, top_node, top_str, last_node, last_str,
 	    }
 	  err = expand_bkref_cache (mctx, &next_nodes, str_idx,
 				    subexp_num, type);
-	  if (BE ( err != REG_NOERROR, 0))
+	  if (BE (err != REG_NOERROR, 0))
 	    {
 	      re_node_set_free (&next_nodes);
 	      return err;
@@ -3014,12 +3025,11 @@ check_arrival (mctx, path, top_node, top_str, last_node, last_str,
 	 Can't we unify them?  */
 
 static reg_errcode_t
-check_arrival_add_next_nodes (mctx, str_idx, cur_nodes, next_nodes)
-     re_match_context_t *mctx;
-     int str_idx;
-     re_node_set *cur_nodes, *next_nodes;
+internal_function
+check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx,
+			      re_node_set *cur_nodes, re_node_set *next_nodes)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   int result;
   int cur_idx;
   re_node_set union_set;
@@ -3036,8 +3046,7 @@ check_arrival_add_next_nodes (mctx, str_idx, cur_nodes, next_nodes)
       /* If the node may accept `multi byte'.  */
       if (dfa->nodes[cur_node].accept_mb)
 	{
-	  reg_errcode_t err;
-
+	  reg_errcode_t err = REG_NOERROR;
 	  naccepted = check_node_accept_bytes (dfa, cur_node, &mctx->input,
 					       str_idx);
 	  if (naccepted > 1)
@@ -3095,10 +3104,9 @@ check_arrival_add_next_nodes (mctx, str_idx, cur_nodes, next_nodes)
 */
 
 static reg_errcode_t
-check_arrival_expand_ecl (dfa, cur_nodes, ex_subexp, type)
-     re_dfa_t *dfa;
-     re_node_set *cur_nodes;
-     int ex_subexp, type;
+internal_function
+check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
+			  int ex_subexp, int type)
 {
   reg_errcode_t err;
   int idx, outside_node;
@@ -3115,7 +3123,7 @@ check_arrival_expand_ecl (dfa, cur_nodes, ex_subexp, type)
   for (idx = 0; idx < cur_nodes->nelem; ++idx)
     {
       int cur_node = cur_nodes->elems[idx];
-      re_node_set *eclosure = dfa->eclosures + cur_node;
+      const re_node_set *eclosure = dfa->eclosures + cur_node;
       outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type);
       if (outside_node == -1)
 	{
@@ -3149,10 +3157,9 @@ check_arrival_expand_ecl (dfa, cur_nodes, ex_subexp, type)
    problematic append it to DST_NODES.  */
 
 static reg_errcode_t
-check_arrival_expand_ecl_sub (dfa, dst_nodes, target, ex_subexp, type)
-     re_dfa_t *dfa;
-     int target, ex_subexp, type;
-     re_node_set *dst_nodes;
+internal_function
+check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
+			      int target, int ex_subexp, int type)
 {
   int cur_node;
   for (cur_node = target; !re_node_set_contains (dst_nodes, cur_node);)
@@ -3194,13 +3201,11 @@ check_arrival_expand_ecl_sub (dfa, dst_nodes, target, ex_subexp, type)
    in MCTX->BKREF_ENTS.  */
 
 static reg_errcode_t
-expand_bkref_cache (mctx, cur_nodes, cur_str, subexp_num,
-		    type)
-     re_match_context_t *mctx;
-     int cur_str, subexp_num, type;
-     re_node_set *cur_nodes;
+internal_function
+expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
+		    int cur_str, int subexp_num, int type)
 {
-  re_dfa_t *const dfa = mctx->dfa;
+  const re_dfa_t *const dfa = mctx->dfa;
   reg_errcode_t err;
   int cache_idx_start = search_cur_bkref_entry (mctx, cur_str);
   struct re_backref_cache_entry *ent;
@@ -3285,39 +3290,44 @@ expand_bkref_cache (mctx, cur_nodes, cur_str, subexp_num,
    Return 1 if succeeded, otherwise return NULL.  */
 
 static int
-build_trtable (dfa, state)
-    re_dfa_t *dfa;
-    re_dfastate_t *state;
+internal_function
+build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
 {
   reg_errcode_t err;
   int i, j, ch, need_word_trtable = 0;
-  unsigned int elem, mask;
-  int dests_node_malloced = 0, dest_states_malloced = 0;
+  bitset_word_t elem, mask;
+  bool dests_node_malloced = false;
+  bool dest_states_malloced = false;
   int ndests; /* Number of the destination states from `state'.  */
   re_dfastate_t **trtable;
   re_dfastate_t **dest_states = NULL, **dest_states_word, **dest_states_nl;
   re_node_set follows, *dests_node;
-  bitset *dests_ch;
-  bitset acceptable;
+  bitset_t *dests_ch;
+  bitset_t acceptable;
+
+  struct dests_alloc
+  {
+    re_node_set dests_node[SBC_MAX];
+    bitset_t dests_ch[SBC_MAX];
+  } *dests_alloc;
 
   /* We build DFA states which corresponds to the destination nodes
      from `state'.  `dests_node[i]' represents the nodes which i-th
      destination state contains, and `dests_ch[i]' represents the
      characters which i-th destination state accepts.  */
-#ifdef _LIBC
-  if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset)) * SBC_MAX))
-    dests_node = (re_node_set *)
-      alloca ((sizeof (re_node_set) + sizeof (bitset)) * SBC_MAX);
+#ifdef HAVE_ALLOCA
+  if (__libc_use_alloca (sizeof (struct dests_alloc)))
+    dests_alloc = (struct dests_alloc *) alloca (sizeof (struct dests_alloc));
   else
 #endif
     {
-      dests_node = (re_node_set *)
-	malloc ((sizeof (re_node_set) + sizeof (bitset)) * SBC_MAX);
-      if (BE (dests_node == NULL, 0))
+      dests_alloc = re_malloc (struct dests_alloc, 1);
+      if (BE (dests_alloc == NULL, 0))
 	return 0;
-      dests_node_malloced = 1;
+      dests_node_malloced = true;
     }
-  dests_ch = (bitset *) (dests_node + SBC_MAX);
+  dests_node = dests_alloc->dests_node;
+  dests_ch = dests_alloc->dests_ch;
 
   /* Initialize transiton table.  */
   state->word_trtable = state->trtable = NULL;
@@ -3328,7 +3338,7 @@ build_trtable (dfa, state)
   if (BE (ndests <= 0, 0))
     {
       if (dests_node_malloced)
-	free (dests_node);
+	free (dests_alloc);
       /* Return 0 in case of an error, 1 otherwise.  */
       if (ndests == 0)
 	{
@@ -3343,8 +3353,8 @@ build_trtable (dfa, state)
   if (BE (err != REG_NOERROR, 0))
     goto out_free;
 
-#ifdef _LIBC
-  if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset)) * SBC_MAX
+#ifdef HAVE_ALLOCA
+  if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX
 			 + ndests * 3 * sizeof (re_dfastate_t *)))
     dest_states = (re_dfastate_t **)
       alloca (ndests * 3 * sizeof (re_dfastate_t *));
@@ -3362,10 +3372,10 @@ out_free:
 	  for (i = 0; i < ndests; ++i)
 	    re_node_set_free (dests_node + i);
 	  if (dests_node_malloced)
-	    free (dests_node);
+	    free (dests_alloc);
 	  return 0;
 	}
-      dest_states_malloced = 1;
+      dest_states_malloced = true;
     }
   dest_states_word = dest_states + ndests;
   dest_states_nl = dest_states_word + ndests;
@@ -3427,8 +3437,8 @@ out_free:
 	goto out_free;
 
       /* For all characters ch...:  */
-      for (i = 0; i < BITSET_UINTS; ++i)
-	for (ch = i * UINT_BITS, elem = acceptable[i], mask = 1;
+      for (i = 0; i < BITSET_WORDS; ++i)
+	for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
 	     elem;
 	     mask <<= 1, elem >>= 1, ++ch)
 	  if (BE (elem & 1, 0))
@@ -3458,8 +3468,8 @@ out_free:
 	goto out_free;
 
       /* For all characters ch...:  */
-      for (i = 0; i < BITSET_UINTS; ++i)
-	for (ch = i * UINT_BITS, elem = acceptable[i], mask = 1;
+      for (i = 0; i < BITSET_WORDS; ++i)
+	for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
 	     elem;
 	     mask <<= 1, elem >>= 1, ++ch)
 	  if (BE (elem & 1, 0))
@@ -3500,7 +3510,7 @@ out_free:
     re_node_set_free (dests_node + i);
 
   if (dests_node_malloced)
-    free (dests_node);
+    free (dests_alloc);
 
   return 1;
 }
@@ -3511,17 +3521,15 @@ out_free:
    to DEST_CH[i].  This function return the number of destinations.  */
 
 static int
-group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
-    re_dfa_t *dfa;
-    const re_dfastate_t *state;
-    re_node_set *dests_node;
-    bitset *dests_ch;
+internal_function
+group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
+			    re_node_set *dests_node, bitset_t *dests_ch)
 {
   reg_errcode_t err;
   int result;
   int i, j, k;
   int ndests; /* Number of the destinations from `state'.  */
-  bitset accepts; /* Characters a node can accept.  */
+  bitset_t accepts; /* Characters a node can accept.  */
   const re_node_set *cur_nodes = &state->nodes;
   bitset_empty (accepts);
   ndests = 0;
@@ -3556,7 +3564,7 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
 #ifdef RE_ENABLE_I18N
       else if (type == OP_UTF8_PERIOD)
         {
-	  memset (accepts, 255, sizeof (unsigned int) * BITSET_UINTS / 2);
+	  memset (accepts, '\xff', sizeof (bitset_t) / 2);
 	  if (!(dfa->syntax & RE_DOT_NEWLINE))
 	    bitset_clear (accepts, '\n');
 	  if (dfa->syntax & RE_DOT_NOT_NULL)
@@ -3572,7 +3580,7 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
 	{
 	  if (constraint & NEXT_NEWLINE_CONSTRAINT)
 	    {
-	      int accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
+	      bool accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
 	      bitset_empty (accepts);
 	      if (accepts_newline)
 		bitset_set (accepts, NEWLINE_CHAR);
@@ -3587,7 +3595,7 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
 
 	  if (constraint & NEXT_WORD_CONSTRAINT)
 	    {
-	      unsigned int any_set = 0;
+	      bitset_word_t any_set = 0;
 	      if (type == CHARACTER && !node->word_char)
 		{
 		  bitset_empty (accepts);
@@ -3595,18 +3603,18 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
 		}
 #ifdef RE_ENABLE_I18N
 	      if (dfa->mb_cur_max > 1)
-		for (j = 0; j < BITSET_UINTS; ++j)
+		for (j = 0; j < BITSET_WORDS; ++j)
 		  any_set |= (accepts[j] &= (dfa->word_char[j] | ~dfa->sb_char[j]));
 	      else
 #endif
-		for (j = 0; j < BITSET_UINTS; ++j)
+		for (j = 0; j < BITSET_WORDS; ++j)
 		  any_set |= (accepts[j] &= dfa->word_char[j]);
 	      if (!any_set)
 		continue;
 	    }
 	  if (constraint & NEXT_NOTWORD_CONSTRAINT)
 	    {
-	      unsigned int any_set = 0;
+	      bitset_word_t any_set = 0;
 	      if (type == CHARACTER && node->word_char)
 		{
 		  bitset_empty (accepts);
@@ -3614,11 +3622,11 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
 		}
 #ifdef RE_ENABLE_I18N
 	      if (dfa->mb_cur_max > 1)
-		for (j = 0; j < BITSET_UINTS; ++j)
+		for (j = 0; j < BITSET_WORDS; ++j)
 		  any_set |= (accepts[j] &= ~(dfa->word_char[j] & dfa->sb_char[j]));
 	      else
 #endif
-		for (j = 0; j < BITSET_UINTS; ++j)
+		for (j = 0; j < BITSET_WORDS; ++j)
 		  any_set |= (accepts[j] &= ~dfa->word_char[j]);
 	      if (!any_set)
 		continue;
@@ -3629,10 +3637,10 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
 	 state.  Above, we make sure that accepts is not empty.  */
       for (j = 0; j < ndests; ++j)
 	{
-	  bitset intersec; /* Intersection sets, see below.  */
-	  bitset remains;
+	  bitset_t intersec; /* Intersection sets, see below.  */
+	  bitset_t remains;
 	  /* Flags, see below.  */
-	  int has_intersec, not_subset, not_consumed;
+	  bitset_word_t has_intersec, not_subset, not_consumed;
 
 	  /* Optimization, skip if this state doesn't accept the character.  */
 	  if (type == CHARACTER && !bitset_contain (dests_ch[j], node->opr.c))
@@ -3640,7 +3648,7 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
 
 	  /* Enumerate the intersection set of this state and `accepts'.  */
 	  has_intersec = 0;
-	  for (k = 0; k < BITSET_UINTS; ++k)
+	  for (k = 0; k < BITSET_WORDS; ++k)
 	    has_intersec |= intersec[k] = accepts[k] & dests_ch[j][k];
 	  /* And skip if the intersection set is empty.  */
 	  if (!has_intersec)
@@ -3648,7 +3656,7 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
 
 	  /* Then check if this state is a subset of `accepts'.  */
 	  not_subset = not_consumed = 0;
-	  for (k = 0; k < BITSET_UINTS; ++k)
+	  for (k = 0; k < BITSET_WORDS; ++k)
 	    {
 	      not_subset |= remains[k] = ~accepts[k] & dests_ch[j][k];
 	      not_consumed |= accepts[k] = accepts[k] & ~dests_ch[j][k];
@@ -3703,14 +3711,14 @@ group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch)
    can only accept one byte.  */
 
 static int
-check_node_accept_bytes (dfa, node_idx, input, str_idx)
-    re_dfa_t *dfa;
-    int node_idx, str_idx;
-    const re_string_t *input;
+internal_function
+check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,
+			 const re_string_t *input, int str_idx)
 {
   const re_token_t *node = dfa->nodes + node_idx;
   int char_len, elem_len;
   int i;
+  wint_t wc;
 
   if (BE (node->type == OP_UTF8_PERIOD, 0))
     {
@@ -3780,15 +3788,16 @@ check_node_accept_bytes (dfa, node_idx, input, str_idx)
     }
 
   elem_len = re_string_elem_size_at (input, str_idx);
-  if ((elem_len <= 1 && char_len <= 1) || char_len == 0)
+  wc = __btowc(*(input->mbs+str_idx));
+  if (((elem_len <= 1 && char_len <= 1) || char_len == 0) && (wc != WEOF && wc < SBC_MAX))
     return 0;
 
   if (node->type == COMPLEX_BRACKET)
     {
       const re_charset_t *cset = node->opr.mbcset;
 # ifdef _LIBC
-      const unsigned char *pin = ((char *) re_string_get_buffer (input)
-				  + str_idx);
+      const unsigned char *pin
+	= ((const unsigned char *) re_string_get_buffer (input) + str_idx);
       int j;
       uint32_t nrules;
 # endif /* _LIBC */
@@ -3940,9 +3949,8 @@ check_node_accept_bytes (dfa, node_idx, input, str_idx)
 
 # ifdef _LIBC
 static unsigned int
-find_collation_sequence_value (mbs, mbs_len)
-    const unsigned char *mbs;
-    size_t mbs_len;
+internal_function
+find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
 {
   uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
   if (nrules == 0)
@@ -4004,10 +4012,9 @@ find_collation_sequence_value (mbs, mbs_len)
    byte of the INPUT.  */
 
 static int
-check_node_accept (mctx, node, idx)
-    const re_match_context_t *mctx;
-    const re_token_t *node;
-    int idx;
+internal_function
+check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
+		   int idx)
 {
   unsigned char ch;
   ch = re_string_byte_at (&mctx->input, idx);
@@ -4055,8 +4062,8 @@ check_node_accept (mctx, node, idx)
 /* Extend the buffers, if the buffers have run out.  */
 
 static reg_errcode_t
-extend_buffers (mctx)
-     re_match_context_t *mctx;
+internal_function
+extend_buffers (re_match_context_t *mctx)
 {
   reg_errcode_t ret;
   re_string_t *pstr = &mctx->input;
@@ -4114,9 +4121,8 @@ extend_buffers (mctx)
 /* Initialize MCTX.  */
 
 static reg_errcode_t
-match_ctx_init (mctx, eflags, n)
-    re_match_context_t *mctx;
-    int eflags, n;
+internal_function
+match_ctx_init (re_match_context_t *mctx, int eflags, int n)
 {
   mctx->eflags = eflags;
   mctx->match_last = -1;
@@ -4143,8 +4149,8 @@ match_ctx_init (mctx, eflags, n)
    of the input, or changes the input string.  */
 
 static void
-match_ctx_clean (mctx)
-    re_match_context_t *mctx;
+internal_function
+match_ctx_clean (re_match_context_t *mctx)
 {
   int st_idx;
   for (st_idx = 0; st_idx < mctx->nsub_tops; ++st_idx)
@@ -4173,8 +4179,8 @@ match_ctx_clean (mctx)
 /* Free all the memory associated with MCTX.  */
 
 static void
-match_ctx_free (mctx)
-    re_match_context_t *mctx;
+internal_function
+match_ctx_free (re_match_context_t *mctx)
 {
   /* First, free all the memory associated with MCTX->SUB_TOPS.  */
   match_ctx_clean (mctx);
@@ -4188,9 +4194,9 @@ match_ctx_free (mctx)
 */
 
 static reg_errcode_t
-match_ctx_add_entry (mctx, node, str_idx, from, to)
-     re_match_context_t *mctx;
-     int node, str_idx, from, to;
+internal_function
+match_ctx_add_entry (re_match_context_t *mctx, int node, int str_idx, int from,
+		     int to)
 {
   if (mctx->nbkref_ents >= mctx->abkref_ents)
     {
@@ -4237,9 +4243,8 @@ match_ctx_add_entry (mctx, node, str_idx, from, to)
    found.  Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX.  */
 
 static int
-search_cur_bkref_entry (mctx, str_idx)
-     re_match_context_t *mctx;
-     int str_idx;
+internal_function
+search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx)
 {
   int left, right, mid, last;
   last = right = mctx->nbkref_ents;
@@ -4261,9 +4266,8 @@ search_cur_bkref_entry (mctx, str_idx)
    at STR_IDX.  */
 
 static reg_errcode_t
-match_ctx_add_subtop (mctx, node, str_idx)
-     re_match_context_t *mctx;
-     int node, str_idx;
+internal_function
+match_ctx_add_subtop (re_match_context_t *mctx, int node, int str_idx)
 {
 #ifdef DEBUG
   assert (mctx->sub_tops != NULL);
@@ -4292,9 +4296,8 @@ match_ctx_add_subtop (mctx, node, str_idx)
    at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP.  */
 
 static re_sub_match_last_t *
-match_ctx_add_sublast (subtop, node, str_idx)
-     re_sub_match_top_t *subtop;
-     int node, str_idx;
+internal_function
+match_ctx_add_sublast (re_sub_match_top_t *subtop, int node, int str_idx)
 {
   re_sub_match_last_t *new_entry;
   if (BE (subtop->nlasts == subtop->alasts, 0))
@@ -4320,10 +4323,9 @@ match_ctx_add_sublast (subtop, node, str_idx)
 }
 
 static void
-sift_ctx_init (sctx, sifted_sts, limited_sts, last_node, last_str_idx)
-    re_sift_context_t *sctx;
-    re_dfastate_t **sifted_sts, **limited_sts;
-    int last_node, last_str_idx;
+internal_function
+sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,
+	       re_dfastate_t **limited_sts, int last_node, int last_str_idx)
 {
   sctx->sifted_states = sifted_sts;
   sctx->limited_states = limited_sts;
diff --git a/replace.c b/replace.c
index f43f9c35..8a5e689b 100644
--- a/replace.c
+++ b/replace.c
@@ -55,7 +55,7 @@
 #include "missing_d/strchr.c"
 #endif	/* HAVE_STRCHR */
 
-#if !defined(HAVE_STRTOD) || defined(STRTOD_NOT_C89)
+#if !defined(HAVE_STRTOD)
 #include "missing_d/strtod.c"
 #endif	/* HAVE_STRTOD */
 
@@ -78,3 +78,11 @@
 #undef DEBUG
 #include "missing_d/mktime.c"
 #endif /* HAVE_MKTIME */
+
+#ifndef HAVE_SNPRINTF
+#include "missing_d/snprintf.c"
+#endif
+
+#if defined(HAVE_SOCKETS) && ! defined(HAVE_GETADDRINFO)
+#include "missing_d/getaddrinfo.c"
+#endif
diff --git a/test/ChangeLog b/test/ChangeLog
index 2ce66aee..0284ac23 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,211 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Wed Sep 26 14:32:28 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (localenl): New test.
+	(regtest): Fixed invocation of shell script.
+	* localenl.sh, localenl.ok: New files.
+	* reg/func2.good: Revised to match current gawk output.
+
+Wed Sep 26 14:49:04 2007 Eli Zaretskii  <eliz@gnu.org>
+
+	* exitval2.w32: New file, a Windows version for exitval2.awk.
+
+Tue May 29 13:22:33 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* badargs.ok: Updated.
+
+Thu May 17 21:10:51 2007  Pat Rankin  <rankin@pactechdata.com>
+
+	* icasers.awk: Modify pattern to work on VMS too, doesn't
+	break Unix/Linux.
+
+Tue May 15 22:05:24 2007  Pat Rankin  <rankin@pactechdata.com>
+
+	Steps towards generating VMS .mms file to run test suite.
+
+	* Makefile.am (FAIL_CODE1): New macro, list of programs
+	that exit 1.
+	* Gentests: Add VMS code.
+	* Gentests.vms: New file.
+
+Wed May  2 19:30:54 2007  Stepan Kasal  <kasal@ucw.cz>
+
+	Revert precedence of concatenation and | getline.
+	From mail dated 2005-10-31.
+
+	* parsefld.awk, parsefld.in, parsefld.ok: New files.
+	* Makefile.am (parsefld): New basic test, check for $/regex/ and
+	  for /re1/+/re2/.
+	* getline.awk, getline.ok: Add precedence check "echo " "date"|getline
+
+Sun Apr 29 22:43:28 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* hsprint.awk: Add extra "%" to format string. Thanks to Nelson Beebe.
+	* hsprint.ok: Revised.
+
+Tue Apr 24 23:15:01 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* fmtspcl.tok: Provide correct version.
+
+Tue Apr 17 22:23:41 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* double2.awk, double2.ok: Limit to 2^63 for portability across
+	different platforms. Sigh.
+
+Thu Apr 12 20:00:27 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* Makefile.am, Makefile.in (fmtspcl): Use fmtspcl.tok to build
+	a fmtspcl.ok file suitable for the given platform.
+	(diffout): Handle case where the .ok file is in the build directory.
+
+Mon Mar 26 08:24:04 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (fmtspcl.ok): Don't remove for cleaning, add
+	to EXTRA_DIST.
+
+Fri Mar  9 11:38:34 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (fmtspcl.tok): Removed use of and reference
+	to this file.
+
+Tue Feb  6 08:21:02 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (double1, double2, zero2): New tests.
+	* double1.awk, double1.ok, double2.awk, double2.ok,
+	zero2.awk, zero2.ok: New files.
+
+Sun Feb  4 16:32:45 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (parse1): New test.
+	* parse1.awk, parse1.in, parse1.ok: New files.
+
+Thu Feb  1 17:41:48 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* Makefile.am (fmtspcl): New test.
+	(CLEANFILES): Add fmtpspcl.ok to list.
+	* fmtspcl.awk, fmtspcl.tok: New files.
+
+Mon Jan 29 15:31:35 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* Makefile.am (diffout): Make it work if no problems.
+	(valgrind-scan): New target to show problems.
+
+Mon Jan 29 12:51:16 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (reint2): New test.
+	* reint2.awk, reint2.in, reint2.ok: New files.
+
+Fri Jan 26 20:01:38 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* Makefile.am (intformat): New test.
+	* intformat.awk, intformat.ok: New files.
+
+Tue Jan 23 08:10:48 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (fwtest2): New test.
+	* fwtest2.awk, fwtest2.in, fwtest2.ok: New files.
+
+Sun Jan 21 13:09:33 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (synerr2, wideidx2): New test.
+	* synerr2.awk, synerr2.ok, wideidx2.awk, wideidx2.ok: New files.
+
+Fri Jan 19 15:11:12 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (strnum1, widesub4): New test.
+	* strnum1.awk, strnum1.ok, widesub4.awk, widesub4.ok: New files.
+
+Thu Jan 18 13:37:00 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* Makeilfe.am (devfd, wideidx, widesub, widesub2, widesub3): New
+	tests.
+	* devfd.in4, devfd.in5, devfd.ok, wideidx.awk, wideidx.in, wideidx.ok,
+	widesub.awk, widesub.ok, widesub2.awk, widesub2.ok, widesub3.awk,
+	widesub3.in, widesub3.ok: New files.
+
+Tue Jan 16 12:16:39 2007  Andrew J. Schorr <ajschorr@users.sourceforge.net>
+
+	* Makefile.am: In pid test, no further need to remove _pid.in,
+	since the test no longer creates that file.
+	* pid.awk: Do not read correct values from stdin (they are now passed
+	as command-line variables with -v).  Make sure to produce output
+	if the comparisons are successful.
+	* pid.ok: No longer empty, should contain 3 lines if all goes well.
+	* pid.sh: Do not create _pid.in; instead, pass values in with -v.
+
+Sun Jan 14 18:03:12 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* fnarray.ok: Updated.
+
+2007-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+	* pipeio2.awk: Don't use empty lines, because Windows ECHO does
+	something different when invoked without arguments.
+
+	* pipeio2.ok: Update.
+
+	* Makefile.am (EXTRA_DIST): Add exitval2.w32.
+
+	* exitval2.w32: New file.
+
+Sat Jan 13 21:25:11 2007  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de> 
+
+	* lintold.awk, lintold.in, lintold.ok: New `--lint-old' test.
+	* Gentests, Makefile.am: Adjust. 
+
+Sat Jan 13 21:17:51 2007  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (Maketests): Allow rebuilding from a VPATH build.
+
+Fri Jan 12 14:04:24 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (mtchi18n): new test.
+	* mtchi18n.awk, mtchi18n.in, mtchi18n.ok: new files.
+
+Wed Sep  6 02:09:26 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (mixed1): new test.
+	* mixed1.ok: new file.
+
+Tue Jun 20 05:37:53 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (devfd1, devfd2): new tests.
+	* devfd.in1, devfd.in2, devfd1.awk, devfd1.ok, devfd2.ok: new files.
+
+Sun Mar 12 23:48:31 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (concat4): new test.
+	* concat4.awk, concat4.in, concat4.ok: new files.
+
+Sun Mar 12 23:33:26 2006  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (subi18n): new test (from
+	  KIMURA Koichi <kimura.koichi@canon.co.jp>).
+	* subi18n.awk, subi18n.ok: New files.
+
+Mon Dec 19 05:41:56 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (ovrflow1): new test.
+	* ovrflow1.awk, ovrflow1.ok: new files.
+
+Wed Dec 14 19:01:08 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (binmode1): new test.
+	* binmode1.ok: new file.
+
+Fri Oct  7 12:28:41 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (fwtest): new test.
+	* fwtest.awk, fwtest.in, fwtest.ok: new files.
+
+Fri Aug 12 14:40:47 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Makefile.am (nofile): New test.
+	* nofile.ok: New file.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/test/Gentests b/test/Gentests
index 10401ddf..58416e42 100755
--- a/test/Gentests
+++ b/test/Gentests
@@ -3,6 +3,8 @@
 # This program should generate Maketests
 
 BEGIN {
+	if (VMSTESTS) vmsargvfixup()
+
 	# read the list of files
 	for (i = 2; i < ARGC; i++)
 		files[ARGV[i]]
@@ -29,6 +31,13 @@ BEGIN {
 	next
 }
 
+/^NEED_LINT_OLD *=/,/[^\\]$/ {
+	gsub(/(^NEED_LINT_OLD *=|\\$)/,"")
+	for (i = 1; i <= NF; i++)
+		lint_old[$i]
+	next
+}
+
 /^GENTESTS_UNUSED *=/,/[^\\]$/ {
 	gsub(/(^GENTESTS_UNUSED *=|\\$)/,"")
 	for (i = 1; i <= NF; i++)
@@ -63,7 +72,9 @@ function generate(x,	s)
 		printf "WARNING: file `%s.awk' not found.\n", x > "/dev/stderr"
 	else
 		delete files[x".awk"]
-		
+
+	if (VMSTESTS) return vmsgenerate(x)
+
 	print x ":"
 
 	s = ""
@@ -71,6 +82,10 @@ function generate(x,	s)
 		s = s " --lint"
 		delete lint[x]
 	}
+	if (x in lint_old) {
+		s = s " --lint-old"
+		delete lint_old[x]
+	}
 	if (x".in" in files) {
 		s = s " < $(srcdir)/$@.in"
 		delete files[x".in"]
@@ -85,8 +100,14 @@ END {
 	for (x in lint)
 		if (!(x in targets))
 			printf "WARNING: --lint target `%s' is missing.\n", x > "/dev/stderr"
+	for (x in lint_old)
+		if (!(x in targets))
+			printf "WARNING: --lint-old target `%s' is missing.\n", x > "/dev/stderr"
 	for (x in files)
 		if (!(x in unused) && \
 		    !(gensub(/\.(awk|in)$/,"","",x) in targets))
 			printf "WARNING: unused file `%s'.\n", x > "/dev/stderr"
 }
+
+# VMSTESTS: generate test template in vms format
+# gawk -v "VMSTESTS=1" -f Gentests -f Gentests.vms Makefile.am *.awk *.in >Maketests.vms
diff --git a/test/Makefile.am b/test/Makefile.am
index ada5d393..9b4137de 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,14 +1,14 @@
 #
 # test/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 1988-2005 the Free Software Foundation, Inc.
+# Copyright (C) 1988-2006 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 #
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GAWK is distributed in the hope that it will be useful,
@@ -99,6 +99,7 @@ EXTRA_DIST = \
 	backw.in \
 	backw.ok \
 	badargs.ok \
+	binmode1.ok \
 	childin.awk \
 	childin.in \
 	childin.ok \
@@ -121,6 +122,9 @@ EXTRA_DIST = \
 	concat2.ok \
 	concat3.awk \
 	concat3.ok \
+	concat4.awk \
+	concat4.in \
+	concat4.ok \
 	convfmt.awk \
 	convfmt.ok \
 	datanonl.awk \
@@ -134,6 +138,18 @@ EXTRA_DIST = \
 	delarpm2.ok \
 	delfunc.awk \
 	delfunc.ok \
+	devfd.in1 \
+	devfd.in2 \
+	devfd.in4 \
+	devfd.in5 \
+	devfd.ok \
+	devfd1.awk \
+	devfd1.ok \
+	devfd2.ok \
+	double1.awk \
+	double1.ok \
+	double2.awk \
+	double2.ok \
 	dynlj.awk \
 	dynlj.ok \
 	eofsplit.awk \
@@ -142,6 +158,7 @@ EXTRA_DIST = \
 	exitval1.ok \
 	exitval2.awk \
 	exitval2.ok \
+	exitval2.w32 \
 	fflush.ok \
 	fflush.sh \
 	fieldwdth.awk \
@@ -153,6 +170,8 @@ EXTRA_DIST = \
 	fldchgnf.awk \
 	fldchgnf.in \
 	fldchgnf.ok \
+	fmtspcl.awk \
+	fmtspcl.tok \
 	fmttest.awk \
 	fmttest.ok \
 	fnamedat.awk \
@@ -199,6 +218,12 @@ EXTRA_DIST = \
 	funstack.awk \
 	funstack.in \
 	funstack.ok \
+	fwtest.awk \
+	fwtest.in \
+	fwtest.ok \
+	fwtest2.awk \
+	fwtest2.in \
+	fwtest2.ok \
 	gensub.awk \
 	gensub.in \
 	gensub.ok \
@@ -269,6 +294,8 @@ EXTRA_DIST = \
 	inputred.ok \
 	intest.awk \
 	intest.ok \
+	intformat.awk \
+	intformat.ok \
 	intprec.awk \
 	intprec.ok \
 	iobug1.awk \
@@ -280,8 +307,13 @@ EXTRA_DIST = \
 	leadnl.ok \
 	lint.awk \
 	lint.ok \
+	lintold.awk \
+	lintold.in \
+	lintold.ok \
 	litoct.awk \
 	litoct.ok \
+	localenl.ok \
+	localenl.sh \
 	longdbl.awk \
 	longdbl.in \
 	longdbl.ok \
@@ -308,7 +340,11 @@ EXTRA_DIST = \
 	messages.awk \
 	minusstr.awk \
 	minusstr.ok \
+	mixed1.ok \
 	mmap8k.in \
+	mtchi18n.awk \
+	mtchi18n.in \
+	mtchi18n.ok \
 	nasty.awk \
 	nasty.ok \
 	nasty2.awk \
@@ -336,6 +372,7 @@ EXTRA_DIST = \
 	nlstrina.ok \
 	noeffect.awk \
 	noeffect.ok \
+	nofile.ok \
 	nofmtch.awk \
 	nofmtch.ok \
 	noloop1.awk \
@@ -387,10 +424,18 @@ EXTRA_DIST = \
 	out1.ok \
 	out2.ok \
 	out3.ok \
+	ovrflow1.awk \
+	ovrflow1.ok \
 	paramdup.awk \
 	paramdup.ok \
 	paramtyp.awk \
 	paramtyp.ok \
+	parse1.awk \
+	parse1.in \
+	parse1.ok \
+	parsefld.awk \
+	parsefld.in \
+	parsefld.ok \
 	parseme.awk \
 	parseme.ok \
 	pcntplus.awk \
@@ -456,6 +501,9 @@ EXTRA_DIST = \
 	reint.awk \
 	reint.in \
 	reint.ok \
+	reint2.awk \
+	reint2.in \
+	reint2.ok \
 	reparse.awk \
 	reparse.in \
 	reparse.ok \
@@ -525,6 +573,8 @@ EXTRA_DIST = \
 	strtod.awk \
 	strtod.in \
 	strtod.ok \
+	strnum1.awk \
+	strnum1.ok \
 	strtonum.awk \
 	strtonum.ok \
 	strftime.awk \
@@ -533,6 +583,8 @@ EXTRA_DIST = \
 	subamp.awk \
 	subamp.in \
 	subamp.ok \
+	subi18n.awk \
+	subi18n.ok \
 	subsepnm.awk \
 	subsepnm.ok \
 	subslash.awk \
@@ -545,6 +597,8 @@ EXTRA_DIST = \
 	switch2.awk \
 	synerr1.awk \
 	synerr1.ok \
+	synerr2.awk \
+	synerr2.ok \
 	tradanch.awk \
 	tradanch.in \
 	tradanch.ok \
@@ -564,9 +618,25 @@ EXTRA_DIST = \
 	whiny.awk \
 	whiny.in \
 	whiny.ok \
+	wideidx.awk \
+	wideidx.in \
+	wideidx.ok \
+	wideidx2.awk \
+	wideidx2.ok \
+	widesub.awk \
+	widesub.ok \
+	widesub2.awk \
+	widesub2.ok \
+	widesub3.awk \
+	widesub3.in \
+	widesub3.ok \
+	widesub4.awk \
+	widesub4.ok \
 	wjposer1.awk \
 	wjposer1.in \
 	wjposer1.ok \
+	zero2.awk \
+	zero2.ok \
 	zeroe0.awk \
 	zeroe0.ok \
 	zeroflag.awk \
@@ -574,48 +644,55 @@ EXTRA_DIST = \
 
 TESTS_WE_ARE_NOT_DOING_YET_FIXME_ONE_DAY = longdbl
 
-# Get rid of core files when cleaning
-CLEANFILES = core core.*
+# Get rid of core files when cleaning and generated .ok file
+CLEANFILES = core core.* fmtspcl.ok
 
 # try to keep these sorted
 BASIC_TESTS = addcomma anchgsub argarray arrayparm arrayref arrymem1 \
 	arrayprm2 arrayprm3 arryref2 arryref3 arryref4 arryref5 arynasty \
 	arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
 	aryprm8 arysubnm asgext awkpath back89 backgsub childin clobber \
-	clsflnam compare compare2 concat1 concat2 concat3 convfmt datanonl defref \
-	delarprm delarpm2 delfunc dynlj eofsplit exitval1 exitval2 fldchg fldchgnf fmttest fnamedat \
+	clsflnam compare compare2 concat1 concat2 concat3 concat4 convfmt datanonl defref \
+	delarprm delarpm2 delfunc dynlj eofsplit exitval1 exitval2 fldchg fldchgnf fmtspcl fmttest fnamedat \
 	fnarray fnarray2 fnarydel fnaryscl fnasgnm fnmisc fnparydl \
 	fordel forsimp fsbs fsspcoln fsrs fstabplus funsemnl funsmnam funstack getline \
 	getline2 getline3 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest \
-	gsubtst2 gsubtst3 gsubtst4 gsubtst5 hex hsprint inputred intest \
+	gsubtst2 gsubtst3 gsubtst4 gsubtst5 hex hsprint inputred intest intformat \
 	intprec iobug1 leaddig leadnl litoct longsub longwrds manglprm math membug1 \
-	messages minusstr mmap8k nasty nasty2 negexp nested nfldstr \
-	nfneg nfset nlfldsep nlinstr nlstrina noeffect nofmtch noloop1 \
+	messages minusstr mmap8k mtchi18n nasty nasty2 negexp nested nfldstr \
+	nfneg nfset nlfldsep nlinstr nlstrina noeffect nofile nofmtch noloop1 \
 	noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt \
-	ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf paramdup paramtyp \
-	parseme pcntplus prdupval prec printf0 printf1 prmarscl prmreuse \
+	ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf ovrflow1 paramdup paramtyp \
+	parse1 parsefld parseme pcntplus prdupval prec printf0 printf1 prmarscl prmreuse \
 	prt1eval prtoeval psx96sub rand rebt8b1 rebt8b2 redfilnm regeq \
 	reindops reparse resplit rs rsnul1nl rsnulbig rsnulbig2 rstest1 \
 	rstest2 rstest3 rstest4 rstest5 rswhite scalar sclforin sclifin \
 	sortempty splitargv splitarr splitdef splitvar splitwht sprintfc \
-	strcat1 strtod subamp subsepnm subslash substr swaplns synerr1 tradanch \
-	tweakfld uninit2 uninit3 uninit4 uninitialized unterm wjposer1 \
-	zeroe0 zeroflag
+	strcat1 strtod strnum1 subamp subi18n subsepnm subslash substr swaplns \
+	synerr1 synerr2 tradanch \
+	tweakfld uninit2 uninit3 uninit4 uninitialized unterm wideidx wideidx2 \
+	widesub widesub2 widesub3 widesub4 wjposer1 zeroe0 zeroflag zero2
 
-UNIX_TESTS = fflush getlnhd pid pipeio1 pipeio2 poundbang space strftlng
+UNIX_TESTS = fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
 
-GAWK_EXT_TESTS = argtest asort asorti backw badargs clos1way fieldwdth fsfwfs \
-	gensub gensub2 gnuops2 gnuops3 gnureops icasefs icasers igncdym igncfs ignrcase \
-	ignrcas2 lint match1 match2 manyfiles nondec nondec2 posix procinfs \
-	printfbad1 regx8bit rebuf reint rsstart1 rsstart2 rsstart3 \
-	rstest6 shadow sort1 strtonum strftime whiny
+GAWK_EXT_TESTS = argtest asort asorti backw badargs binmode1 clos1way devfd devfd1 devfd2 double1 double2 \
+	fieldwdth fsfwfs fwtest fwtest2 gensub gensub2 gnuops2 gnuops3 gnureops icasefs \
+	icasers igncdym igncfs ignrcase ignrcas2 lint lintold match1 match2 manyfiles \
+	nondec nondec2 posix procinfs printfbad1 regx8bit rebuf reint reint2 rsstart1 \
+	rsstart2 rsstart3 rstest6 shadow sort1 strtonum strftime whiny
 
 EXTRA_TESTS = regtest inftest
 
 INET_TESTS = inetechu inetecht inetdayu inetdayt
 
 # List of the tests which should be run with --lint option:
-NEED_LINT = defref noeffect nofmtch shadow uninit2 uninit3 uninit4 uninitialized
+NEED_LINT = defref fmtspcl noeffect nofmtch shadow uninit2 uninit3 uninit4 uninitialized
+
+# List of the tests which should be run with --lint-old option:
+NEED_LINT_OLD = lintold
+
+# List of the tests which fail with EXIT CODE 1
+FAIL_CODE1 = fnarray2 fnmisc gsubasgn mixed1 noparms paramdup synerr1 synerr2 unterm
 
 # List of the files that appear in manual tests or are for reserve testing:
 GENTESTS_UNUSED = Makefile.in gtlnbufv.awk printfloat.awk switch2.awk
@@ -719,7 +796,7 @@ regtest::
 	@echo 'Some of the output from regtest is very system specific, do not'
 	@echo 'be distressed if your output differs from that distributed.'
 	@echo 'Manual inspection is called for.'
-	AWK=`pwd`/$(AWK) $(srcdir)/regtest.sh
+	AWK=$(AWKPROG) $(srcdir)/regtest.sh
 
 manyfiles::
 	@echo manyfiles
@@ -780,6 +857,11 @@ litoct::
 	@echo ab | $(AWK) --traditional -f $(srcdir)/litoct.awk >_$@
 	@-$(CMP) $(srcdir)/litoct.ok _$@ && rm -f _$@
 
+devfd::
+	@echo $@
+	@$(AWK) 1 /dev/fd/4 /dev/fd/5 4<$(srcdir)/devfd.in4 5<$(srcdir)/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 fflush::
 	@echo $@
 	@$(srcdir)/fflush.sh >_$@
@@ -806,7 +888,7 @@ tradanch::
 pid::
 	@echo pid
 	@AWKPATH=$(srcdir) AWK=$(AWKPROG) $(SHELL) $(srcdir)/pid.sh $$$$ > _`basename $@` ; :
-	@-$(CMP) $(srcdir)/pid.ok _`basename $@` && rm -f _`basename $@` _`basename $@`.in
+	@-$(CMP) $(srcdir)/pid.ok _`basename $@` && rm -f _`basename $@`
 
 strftlng::
 	@echo $@
@@ -821,6 +903,14 @@ nors::
 	@echo A B C D E | tr -d '\12\15' | $(AWK) '{ print $$NF }' - $(srcdir)/nors.in > _$@
 	@-$(CMP) $(srcdir)/nors.ok _$@ && rm -f _$@
 
+fmtspcl.ok: fmtspcl.tok Makefile
+	@$(AWK) -v "sd=$(srcdir)" 'BEGIN {pnan = sprintf("%g",sqrt(-1)); nnan = sprintf("%g",-sqrt(-1)); pinf = sprintf("%g",-log(0)); ninf = sprintf("%g",log(0))} {sub(/positive_nan/,pnan); sub(/negative_nan/,nnan); sub(/positive_infinity/,pinf); sub(/negative_infinity/,ninf); sub(/fmtspcl/,(sd"/fmtspcl")); print}' < $(srcdir)/fmtspcl.tok > $@ 2>/dev/null
+
+fmtspcl: fmtspcl.ok
+	@echo fmtspcl
+	@$(AWK) -f $(srcdir)/fmtspcl.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $@.ok _$@ && rm -f _$@
+
 reint::
 	@echo $@
 	@$(AWK) --re-interval -f $(srcdir)/reint.awk $(srcdir)/reint.in >_$@
@@ -923,6 +1013,42 @@ whiny::
 	@WHINY_USERS=1 $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+wideidx::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+wideidx2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub3::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub4::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 ignrcas2::
 	@echo $@
 	@GAWKLOCALE=en_US ; export GAWKLOCALE ; \
@@ -967,14 +1093,70 @@ nondec2::
 	@$(AWK) --non-decimal-data -v a=0x1 -f $(srcdir)/$@.awk >_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+nofile::
+	@echo $@
+	@$(AWK) '{}' no/such/file >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+binmode1::
+	@echo $@
+	@$(AWK) -v BINMODE=3 'BEGIN { print BINMODE }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+subi18n::
+	@echo $@
+	@GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f $(srcdir)/$@.awk > _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+concat4::
+	@echo $@
+	@GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in > _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+devfd1::
+	@echo $@
+	@$(AWK) -f $(srcdir)/$@.awk 4< $(srcdir)/devfd.in1 5< $(srcdir)/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+# The program text is the '1' which will print each record. How compact can you get?
+devfd2::
+	@echo $@
+	@$(AWK) 1 /dev/fd/4 /dev/fd/5 4< $(srcdir)/devfd.in1 5< $(srcdir)/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+mixed1::
+	@echo $@
+	@$(AWK) -f /dev/null --source 'BEGIN {return junk}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+mtchi18n::
+	@echo $@
+	@GAWKLOCALE=ru_RU.UTF-8 ; export GAWKLOCALE ; \
+	$(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+reint2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) --re-interval -f $@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+localenl::
+	@echo $@
+	@$(srcdir)/$@.sh >_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+
+
 # Targets generated for other tests:
 include Maketests
 
 $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
-	$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" *.awk *.in > $(srcdir)/Maketests
+	files=`cd "$(srcdir)" && echo *.awk *.in`; \
+	$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests
 
 clean:
-	rm -fr _* core core.* junk out1 out2 out3 strftime.ok test1 test2 seq *~
+	rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~
 
 # An attempt to print something that can be grepped for in build logs
 pass-fail:
@@ -988,10 +1170,31 @@ pass-fail:
 diffout:
 	for i in _* ; \
 	do  \
+		if [ "$$i" != "_*" ]; then \
 		echo ============== $$i ============= ; \
+		if [ -r $${i#_}.ok ]; then \
+		diff -c $${i#_}.ok $$i ; \
+		else \
 		diff -c $(srcdir)/$${i#_}.ok  $$i ; \
+		fi ; \
+		fi ; \
 	done | more
 
+# convenient way to scan valgrind results for errors
+valgrind-scan:
+	@echo "Scanning valgrind log files for problems:"
+	@$(AWK) '\
+	function show() {if (cmd) {printf "%s: %s\n",FILENAME,cmd; cmd = ""}; \
+	  printf "\t%s\n",$$0}; \
+	{$$1 = ""}; \
+	/Prog and args are:/ {incmd = 1; cmd = ""; next}; \
+	incmd {if (NF == 1) incmd = 0; else {cmd = (cmd $$0); next}}; \
+	/ERROR SUMMARY:/ && !/: 0 errors from 0 contexts/ {show()}; \
+	/definitely lost:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	/possibly lost:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	/ suppressed:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	' log.[0-9]*
+
 # This target is for testing with electric fence.
 efence:
 	for i in $$(ls _* | sed 's;_\(.*\);\1;') ; \
diff --git a/test/Makefile.in b/test/Makefile.in
index 0ce9b099..0f273e65 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,14 +17,14 @@
 #
 # test/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 1988-2005 the Free Software Foundation, Inc.
+# Copyright (C) 1988-2006 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 #
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GAWK is distributed in the hope that it will be useful,
@@ -36,15 +36,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -63,13 +59,14 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/socket.m4 \
-	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intmax_t.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/stdint_h.m4 \
 	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -81,8 +78,6 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -108,6 +103,9 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -124,8 +122,9 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -145,12 +144,14 @@ U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -162,28 +163,39 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 EXTRA_DIST = \
 	reg \
 	lib \
@@ -260,6 +272,7 @@ EXTRA_DIST = \
 	backw.in \
 	backw.ok \
 	badargs.ok \
+	binmode1.ok \
 	childin.awk \
 	childin.in \
 	childin.ok \
@@ -282,6 +295,9 @@ EXTRA_DIST = \
 	concat2.ok \
 	concat3.awk \
 	concat3.ok \
+	concat4.awk \
+	concat4.in \
+	concat4.ok \
 	convfmt.awk \
 	convfmt.ok \
 	datanonl.awk \
@@ -295,6 +311,18 @@ EXTRA_DIST = \
 	delarpm2.ok \
 	delfunc.awk \
 	delfunc.ok \
+	devfd.in1 \
+	devfd.in2 \
+	devfd.in4 \
+	devfd.in5 \
+	devfd.ok \
+	devfd1.awk \
+	devfd1.ok \
+	devfd2.ok \
+	double1.awk \
+	double1.ok \
+	double2.awk \
+	double2.ok \
 	dynlj.awk \
 	dynlj.ok \
 	eofsplit.awk \
@@ -303,6 +331,7 @@ EXTRA_DIST = \
 	exitval1.ok \
 	exitval2.awk \
 	exitval2.ok \
+	exitval2.w32 \
 	fflush.ok \
 	fflush.sh \
 	fieldwdth.awk \
@@ -314,6 +343,8 @@ EXTRA_DIST = \
 	fldchgnf.awk \
 	fldchgnf.in \
 	fldchgnf.ok \
+	fmtspcl.awk \
+	fmtspcl.tok \
 	fmttest.awk \
 	fmttest.ok \
 	fnamedat.awk \
@@ -360,6 +391,12 @@ EXTRA_DIST = \
 	funstack.awk \
 	funstack.in \
 	funstack.ok \
+	fwtest.awk \
+	fwtest.in \
+	fwtest.ok \
+	fwtest2.awk \
+	fwtest2.in \
+	fwtest2.ok \
 	gensub.awk \
 	gensub.in \
 	gensub.ok \
@@ -430,6 +467,8 @@ EXTRA_DIST = \
 	inputred.ok \
 	intest.awk \
 	intest.ok \
+	intformat.awk \
+	intformat.ok \
 	intprec.awk \
 	intprec.ok \
 	iobug1.awk \
@@ -441,8 +480,13 @@ EXTRA_DIST = \
 	leadnl.ok \
 	lint.awk \
 	lint.ok \
+	lintold.awk \
+	lintold.in \
+	lintold.ok \
 	litoct.awk \
 	litoct.ok \
+	localenl.ok \
+	localenl.sh \
 	longdbl.awk \
 	longdbl.in \
 	longdbl.ok \
@@ -469,7 +513,11 @@ EXTRA_DIST = \
 	messages.awk \
 	minusstr.awk \
 	minusstr.ok \
+	mixed1.ok \
 	mmap8k.in \
+	mtchi18n.awk \
+	mtchi18n.in \
+	mtchi18n.ok \
 	nasty.awk \
 	nasty.ok \
 	nasty2.awk \
@@ -497,6 +545,7 @@ EXTRA_DIST = \
 	nlstrina.ok \
 	noeffect.awk \
 	noeffect.ok \
+	nofile.ok \
 	nofmtch.awk \
 	nofmtch.ok \
 	noloop1.awk \
@@ -548,10 +597,18 @@ EXTRA_DIST = \
 	out1.ok \
 	out2.ok \
 	out3.ok \
+	ovrflow1.awk \
+	ovrflow1.ok \
 	paramdup.awk \
 	paramdup.ok \
 	paramtyp.awk \
 	paramtyp.ok \
+	parse1.awk \
+	parse1.in \
+	parse1.ok \
+	parsefld.awk \
+	parsefld.in \
+	parsefld.ok \
 	parseme.awk \
 	parseme.ok \
 	pcntplus.awk \
@@ -617,6 +674,9 @@ EXTRA_DIST = \
 	reint.awk \
 	reint.in \
 	reint.ok \
+	reint2.awk \
+	reint2.in \
+	reint2.ok \
 	reparse.awk \
 	reparse.in \
 	reparse.ok \
@@ -686,6 +746,8 @@ EXTRA_DIST = \
 	strtod.awk \
 	strtod.in \
 	strtod.ok \
+	strnum1.awk \
+	strnum1.ok \
 	strtonum.awk \
 	strtonum.ok \
 	strftime.awk \
@@ -694,6 +756,8 @@ EXTRA_DIST = \
 	subamp.awk \
 	subamp.in \
 	subamp.ok \
+	subi18n.awk \
+	subi18n.ok \
 	subsepnm.awk \
 	subsepnm.ok \
 	subslash.awk \
@@ -706,6 +770,8 @@ EXTRA_DIST = \
 	switch2.awk \
 	synerr1.awk \
 	synerr1.ok \
+	synerr2.awk \
+	synerr2.ok \
 	tradanch.awk \
 	tradanch.in \
 	tradanch.ok \
@@ -725,9 +791,25 @@ EXTRA_DIST = \
 	whiny.awk \
 	whiny.in \
 	whiny.ok \
+	wideidx.awk \
+	wideidx.in \
+	wideidx.ok \
+	wideidx2.awk \
+	wideidx2.ok \
+	widesub.awk \
+	widesub.ok \
+	widesub2.awk \
+	widesub2.ok \
+	widesub3.awk \
+	widesub3.in \
+	widesub3.ok \
+	widesub4.awk \
+	widesub4.ok \
 	wjposer1.awk \
 	wjposer1.in \
 	wjposer1.ok \
+	zero2.awk \
+	zero2.ok \
 	zeroe0.awk \
 	zeroe0.ok \
 	zeroflag.awk \
@@ -735,46 +817,53 @@ EXTRA_DIST = \
 
 TESTS_WE_ARE_NOT_DOING_YET_FIXME_ONE_DAY = longdbl
 
-# Get rid of core files when cleaning
-CLEANFILES = core core.*
+# Get rid of core files when cleaning and generated .ok file
+CLEANFILES = core core.* fmtspcl.ok
 
 # try to keep these sorted
 BASIC_TESTS = addcomma anchgsub argarray arrayparm arrayref arrymem1 \
 	arrayprm2 arrayprm3 arryref2 arryref3 arryref4 arryref5 arynasty \
 	arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
 	aryprm8 arysubnm asgext awkpath back89 backgsub childin clobber \
-	clsflnam compare compare2 concat1 concat2 concat3 convfmt datanonl defref \
-	delarprm delarpm2 delfunc dynlj eofsplit exitval1 exitval2 fldchg fldchgnf fmttest fnamedat \
+	clsflnam compare compare2 concat1 concat2 concat3 concat4 convfmt datanonl defref \
+	delarprm delarpm2 delfunc dynlj eofsplit exitval1 exitval2 fldchg fldchgnf fmtspcl fmttest fnamedat \
 	fnarray fnarray2 fnarydel fnaryscl fnasgnm fnmisc fnparydl \
 	fordel forsimp fsbs fsspcoln fsrs fstabplus funsemnl funsmnam funstack getline \
 	getline2 getline3 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest \
-	gsubtst2 gsubtst3 gsubtst4 gsubtst5 hex hsprint inputred intest \
+	gsubtst2 gsubtst3 gsubtst4 gsubtst5 hex hsprint inputred intest intformat \
 	intprec iobug1 leaddig leadnl litoct longsub longwrds manglprm math membug1 \
-	messages minusstr mmap8k nasty nasty2 negexp nested nfldstr \
-	nfneg nfset nlfldsep nlinstr nlstrina noeffect nofmtch noloop1 \
+	messages minusstr mmap8k mtchi18n nasty nasty2 negexp nested nfldstr \
+	nfneg nfset nlfldsep nlinstr nlstrina noeffect nofile nofmtch noloop1 \
 	noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt \
-	ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf paramdup paramtyp \
-	parseme pcntplus prdupval prec printf0 printf1 prmarscl prmreuse \
+	ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf ovrflow1 paramdup paramtyp \
+	parse1 parsefld parseme pcntplus prdupval prec printf0 printf1 prmarscl prmreuse \
 	prt1eval prtoeval psx96sub rand rebt8b1 rebt8b2 redfilnm regeq \
 	reindops reparse resplit rs rsnul1nl rsnulbig rsnulbig2 rstest1 \
 	rstest2 rstest3 rstest4 rstest5 rswhite scalar sclforin sclifin \
 	sortempty splitargv splitarr splitdef splitvar splitwht sprintfc \
-	strcat1 strtod subamp subsepnm subslash substr swaplns synerr1 tradanch \
-	tweakfld uninit2 uninit3 uninit4 uninitialized unterm wjposer1 \
-	zeroe0 zeroflag
-
-UNIX_TESTS = fflush getlnhd pid pipeio1 pipeio2 poundbang space strftlng
-GAWK_EXT_TESTS = argtest asort asorti backw badargs clos1way fieldwdth fsfwfs \
-	gensub gensub2 gnuops2 gnuops3 gnureops icasefs icasers igncdym igncfs ignrcase \
-	ignrcas2 lint match1 match2 manyfiles nondec nondec2 posix procinfs \
-	printfbad1 regx8bit rebuf reint rsstart1 rsstart2 rsstart3 \
-	rstest6 shadow sort1 strtonum strftime whiny
+	strcat1 strtod strnum1 subamp subi18n subsepnm subslash substr swaplns \
+	synerr1 synerr2 tradanch \
+	tweakfld uninit2 uninit3 uninit4 uninitialized unterm wideidx wideidx2 \
+	widesub widesub2 widesub3 widesub4 wjposer1 zeroe0 zeroflag zero2
+
+UNIX_TESTS = fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
+GAWK_EXT_TESTS = argtest asort asorti backw badargs binmode1 clos1way devfd devfd1 devfd2 double1 double2 \
+	fieldwdth fsfwfs fwtest fwtest2 gensub gensub2 gnuops2 gnuops3 gnureops icasefs \
+	icasers igncdym igncfs ignrcase ignrcas2 lint lintold match1 match2 manyfiles \
+	nondec nondec2 posix procinfs printfbad1 regx8bit rebuf reint reint2 rsstart1 \
+	rsstart2 rsstart3 rstest6 shadow sort1 strtonum strftime whiny
 
 EXTRA_TESTS = regtest inftest
 INET_TESTS = inetechu inetecht inetdayu inetdayt
 
 # List of the tests which should be run with --lint option:
-NEED_LINT = defref noeffect nofmtch shadow uninit2 uninit3 uninit4 uninitialized
+NEED_LINT = defref fmtspcl noeffect nofmtch shadow uninit2 uninit3 uninit4 uninitialized
+
+# List of the tests which should be run with --lint-old option:
+NEED_LINT_OLD = lintold
+
+# List of the tests which fail with EXIT CODE 1
+FAIL_CODE1 = fnarray2 fnmisc gsubasgn mixed1 noparms paramdup synerr1 synerr2 unterm
 
 # List of the files that appear in manual tests or are for reserve testing:
 GENTESTS_UNUSED = Makefile.in gtlnbufv.awk printfloat.awk switch2.awk
@@ -812,7 +901,6 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -821,22 +909,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -894,12 +981,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -918,16 +1013,19 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 # Message stuff is to make it a little easier to follow.
@@ -1018,7 +1116,7 @@ regtest::
 	@echo 'Some of the output from regtest is very system specific, do not'
 	@echo 'be distressed if your output differs from that distributed.'
 	@echo 'Manual inspection is called for.'
-	AWK=`pwd`/$(AWK) $(srcdir)/regtest.sh
+	AWK=$(AWKPROG) $(srcdir)/regtest.sh
 
 manyfiles::
 	@echo manyfiles
@@ -1079,6 +1177,11 @@ litoct::
 	@echo ab | $(AWK) --traditional -f $(srcdir)/litoct.awk >_$@
 	@-$(CMP) $(srcdir)/litoct.ok _$@ && rm -f _$@
 
+devfd::
+	@echo $@
+	@$(AWK) 1 /dev/fd/4 /dev/fd/5 4<$(srcdir)/devfd.in4 5<$(srcdir)/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 fflush::
 	@echo $@
 	@$(srcdir)/fflush.sh >_$@
@@ -1105,7 +1208,7 @@ tradanch::
 pid::
 	@echo pid
 	@AWKPATH=$(srcdir) AWK=$(AWKPROG) $(SHELL) $(srcdir)/pid.sh $$$$ > _`basename $@` ; :
-	@-$(CMP) $(srcdir)/pid.ok _`basename $@` && rm -f _`basename $@` _`basename $@`.in
+	@-$(CMP) $(srcdir)/pid.ok _`basename $@` && rm -f _`basename $@`
 
 strftlng::
 	@echo $@
@@ -1120,6 +1223,14 @@ nors::
 	@echo A B C D E | tr -d '\12\15' | $(AWK) '{ print $$NF }' - $(srcdir)/nors.in > _$@
 	@-$(CMP) $(srcdir)/nors.ok _$@ && rm -f _$@
 
+fmtspcl.ok: fmtspcl.tok Makefile
+	@$(AWK) -v "sd=$(srcdir)" 'BEGIN {pnan = sprintf("%g",sqrt(-1)); nnan = sprintf("%g",-sqrt(-1)); pinf = sprintf("%g",-log(0)); ninf = sprintf("%g",log(0))} {sub(/positive_nan/,pnan); sub(/negative_nan/,nnan); sub(/positive_infinity/,pinf); sub(/negative_infinity/,ninf); sub(/fmtspcl/,(sd"/fmtspcl")); print}' < $(srcdir)/fmtspcl.tok > $@ 2>/dev/null
+
+fmtspcl: fmtspcl.ok
+	@echo fmtspcl
+	@$(AWK) -f $(srcdir)/fmtspcl.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $@.ok _$@ && rm -f _$@
+
 reint::
 	@echo $@
 	@$(AWK) --re-interval -f $(srcdir)/reint.awk $(srcdir)/reint.in >_$@
@@ -1222,6 +1333,42 @@ whiny::
 	@WHINY_USERS=1 $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+wideidx::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+wideidx2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub3::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+widesub4::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 ignrcas2::
 	@echo $@
 	@GAWKLOCALE=en_US ; export GAWKLOCALE ; \
@@ -1265,6 +1412,59 @@ nondec2::
 	@echo $@
 	@$(AWK) --non-decimal-data -v a=0x1 -f $(srcdir)/$@.awk >_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+nofile::
+	@echo $@
+	@$(AWK) '{}' no/such/file >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+binmode1::
+	@echo $@
+	@$(AWK) -v BINMODE=3 'BEGIN { print BINMODE }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+subi18n::
+	@echo $@
+	@GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f $(srcdir)/$@.awk > _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+concat4::
+	@echo $@
+	@GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in > _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+devfd1::
+	@echo $@
+	@$(AWK) -f $(srcdir)/$@.awk 4< $(srcdir)/devfd.in1 5< $(srcdir)/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+# The program text is the '1' which will print each record. How compact can you get?
+devfd2::
+	@echo $@
+	@$(AWK) 1 /dev/fd/4 /dev/fd/5 4< $(srcdir)/devfd.in1 5< $(srcdir)/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+mixed1::
+	@echo $@
+	@$(AWK) -f /dev/null --source 'BEGIN {return junk}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+mtchi18n::
+	@echo $@
+	@GAWKLOCALE=ru_RU.UTF-8 ; export GAWKLOCALE ; \
+	$(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+reint2::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) --re-interval -f $@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+localenl::
+	@echo $@
+	@$(srcdir)/$@.sh >_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -1622,6 +1822,11 @@ intest:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+intformat:
+	@echo intformat
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 intprec:
 	@echo intprec
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1797,6 +2002,11 @@ opasnslf:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+ovrflow1:
+	@echo ovrflow1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 paramdup:
 	@echo paramdup
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1807,6 +2017,16 @@ paramtyp:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+parse1:
+	@echo parse1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+parsefld:
+	@echo parsefld
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 parseme:
 	@echo parseme
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1992,6 +2212,11 @@ strtod:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+strnum1:
+	@echo strnum1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 subsepnm:
 	@echo subsepnm
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2017,6 +2242,11 @@ synerr1:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+synerr2:
+	@echo synerr2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 uninit2:
 	@echo uninit2
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2057,6 +2287,11 @@ zeroflag:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+zero2:
+	@echo zero2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 getlnhd:
 	@echo getlnhd
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2082,6 +2317,16 @@ clos1way:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+double1:
+	@echo double1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+double2:
+	@echo double2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 fieldwdth:
 	@echo fieldwdth
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2092,6 +2337,16 @@ fsfwfs:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+fwtest:
+	@echo fwtest
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+fwtest2:
+	@echo fwtest2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 gensub:
 	@echo gensub
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2147,6 +2402,11 @@ lint:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+lintold:
+	@echo lintold
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint-old < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 match1:
 	@echo match1
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2212,10 +2472,11 @@ strtonum:
 # Targets generated for other tests:
 
 $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
-	$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" *.awk *.in > $(srcdir)/Maketests
+	files=`cd "$(srcdir)" && echo *.awk *.in`; \
+	$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests
 
 clean:
-	rm -fr _* core core.* junk out1 out2 out3 strftime.ok test1 test2 seq *~
+	rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~
 
 # An attempt to print something that can be grepped for in build logs
 pass-fail:
@@ -2229,10 +2490,31 @@ pass-fail:
 diffout:
 	for i in _* ; \
 	do  \
+		if [ "$$i" != "_*" ]; then \
 		echo ============== $$i ============= ; \
+		if [ -r $${i#_}.ok ]; then \
+		diff -c $${i#_}.ok $$i ; \
+		else \
 		diff -c $(srcdir)/$${i#_}.ok  $$i ; \
+		fi ; \
+		fi ; \
 	done | more
 
+# convenient way to scan valgrind results for errors
+valgrind-scan:
+	@echo "Scanning valgrind log files for problems:"
+	@$(AWK) '\
+	function show() {if (cmd) {printf "%s: %s\n",FILENAME,cmd; cmd = ""}; \
+	  printf "\t%s\n",$$0}; \
+	{$$1 = ""}; \
+	/Prog and args are:/ {incmd = 1; cmd = ""; next}; \
+	incmd {if (NF == 1) incmd = 0; else {cmd = (cmd $$0); next}}; \
+	/ERROR SUMMARY:/ && !/: 0 errors from 0 contexts/ {show()}; \
+	/definitely lost:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	/possibly lost:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	/ suppressed:/ && !/: 0 bytes in 0 blocks/ {show()}; \
+	' log.[0-9]*
+
 # This target is for testing with electric fence.
 efence:
 	for i in $$(ls _* | sed 's;_\(.*\);\1;') ; \
diff --git a/test/Maketests b/test/Maketests
index cb117521..8edf10c5 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -355,6 +355,11 @@ intest:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+intformat:
+	@echo intformat
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 intprec:
 	@echo intprec
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -530,6 +535,11 @@ opasnslf:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+ovrflow1:
+	@echo ovrflow1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 paramdup:
 	@echo paramdup
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -540,6 +550,16 @@ paramtyp:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+parse1:
+	@echo parse1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+parsefld:
+	@echo parsefld
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 parseme:
 	@echo parseme
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -725,6 +745,11 @@ strtod:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+strnum1:
+	@echo strnum1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 subsepnm:
 	@echo subsepnm
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -750,6 +775,11 @@ synerr1:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+synerr2:
+	@echo synerr2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 uninit2:
 	@echo uninit2
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -790,6 +820,11 @@ zeroflag:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+zero2:
+	@echo zero2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 getlnhd:
 	@echo getlnhd
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -815,6 +850,16 @@ clos1way:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+double1:
+	@echo double1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+double2:
+	@echo double2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 fieldwdth:
 	@echo fieldwdth
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -825,6 +870,16 @@ fsfwfs:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+fwtest:
+	@echo fwtest
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+fwtest2:
+	@echo fwtest2
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 gensub:
 	@echo gensub
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -880,6 +935,11 @@ lint:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+lintold:
+	@echo lintold
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint-old < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 match1:
 	@echo match1
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/badargs.ok b/test/badargs.ok
index 5c3bba71..28e42360 100644
--- a/test/badargs.ok
+++ b/test/badargs.ok
@@ -22,6 +22,7 @@ POSIX options:		GNU long options:
 	-W source=program-text	--source=program-text
 	-W traditional		--traditional
 	-W usage		--usage
+	-W use-lc-numeric	--use-lc-numeric
 	-W version		--version
 
 To report bugs, see node `Bugs' in `gawk.info', which is
diff --git a/test/binmode1.ok b/test/binmode1.ok
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/test/binmode1.ok
@@ -0,0 +1 @@
+3
diff --git a/test/concat4.awk b/test/concat4.awk
new file mode 100644
index 00000000..e6cf24fb
--- /dev/null
+++ b/test/concat4.awk
@@ -0,0 +1,7 @@
+{
+	a = $0
+	print index(a,"b")
+	getline
+	a = a $0
+	print index(a,"b")
+}
diff --git a/test/concat4.in b/test/concat4.in
new file mode 100644
index 00000000..3bd1f0e2
--- /dev/null
+++ b/test/concat4.in
@@ -0,0 +1,2 @@
+foo
+bar
diff --git a/test/concat4.ok b/test/concat4.ok
new file mode 100644
index 00000000..4f1d7cd3
--- /dev/null
+++ b/test/concat4.ok
@@ -0,0 +1,2 @@
+0
+4
diff --git a/test/devfd.in1 b/test/devfd.in1
new file mode 100644
index 00000000..0e50e690
--- /dev/null
+++ b/test/devfd.in1
@@ -0,0 +1,20 @@
+this is file f1, line 1
+this is file f1, line 2
+this is file f1, line 3
+this is file f1, line 4
+this is file f1, line 5
+this is file f1, line 6
+this is file f1, line 7
+this is file f1, line 8
+this is file f1, line 9
+this is file f1, line 10
+this is file f1, line 11
+this is file f1, line 12
+this is file f1, line 13
+this is file f1, line 14
+this is file f1, line 15
+this is file f1, line 16
+this is file f1, line 17
+this is file f1, line 18
+this is file f1, line 19
+this is file f1, line 20
diff --git a/test/devfd.in2 b/test/devfd.in2
new file mode 100644
index 00000000..d3299a9d
--- /dev/null
+++ b/test/devfd.in2
@@ -0,0 +1,20 @@
+this is file f2, line 1
+this is file f2, line 2
+this is file f2, line 3
+this is file f2, line 4
+this is file f2, line 5
+this is file f2, line 6
+this is file f2, line 7
+this is file f2, line 8
+this is file f2, line 9
+this is file f2, line 10
+this is file f2, line 11
+this is file f2, line 12
+this is file f2, line 13
+this is file f2, line 14
+this is file f2, line 15
+this is file f2, line 16
+this is file f2, line 17
+this is file f2, line 18
+this is file f2, line 19
+this is file f2, line 20
diff --git a/test/devfd.in4 b/test/devfd.in4
new file mode 100644
index 00000000..57da1f80
--- /dev/null
+++ b/test/devfd.in4
@@ -0,0 +1 @@
+file on fd 4
diff --git a/test/devfd.in5 b/test/devfd.in5
new file mode 100644
index 00000000..4469cb4d
--- /dev/null
+++ b/test/devfd.in5
@@ -0,0 +1 @@
+file on fd 5
diff --git a/test/devfd.ok b/test/devfd.ok
new file mode 100644
index 00000000..14f8f2e5
--- /dev/null
+++ b/test/devfd.ok
@@ -0,0 +1,2 @@
+file on fd 4
+file on fd 5
diff --git a/test/devfd1.awk b/test/devfd1.awk
new file mode 100644
index 00000000..6795704d
--- /dev/null
+++ b/test/devfd1.awk
@@ -0,0 +1,11 @@
+BEGIN {
+	while (1) {
+		if ((getline l1 < "/dev/fd/4") <= 0)
+			break
+		print l1
+
+		if ((getline l2 < "/dev/fd/5") <= 0)
+			break
+		print l2
+	}
+}
diff --git a/test/devfd1.ok b/test/devfd1.ok
new file mode 100644
index 00000000..359d7d34
--- /dev/null
+++ b/test/devfd1.ok
@@ -0,0 +1,40 @@
+this is file f1, line 1
+this is file f2, line 1
+this is file f1, line 2
+this is file f2, line 2
+this is file f1, line 3
+this is file f2, line 3
+this is file f1, line 4
+this is file f2, line 4
+this is file f1, line 5
+this is file f2, line 5
+this is file f1, line 6
+this is file f2, line 6
+this is file f1, line 7
+this is file f2, line 7
+this is file f1, line 8
+this is file f2, line 8
+this is file f1, line 9
+this is file f2, line 9
+this is file f1, line 10
+this is file f2, line 10
+this is file f1, line 11
+this is file f2, line 11
+this is file f1, line 12
+this is file f2, line 12
+this is file f1, line 13
+this is file f2, line 13
+this is file f1, line 14
+this is file f2, line 14
+this is file f1, line 15
+this is file f2, line 15
+this is file f1, line 16
+this is file f2, line 16
+this is file f1, line 17
+this is file f2, line 17
+this is file f1, line 18
+this is file f2, line 18
+this is file f1, line 19
+this is file f2, line 19
+this is file f1, line 20
+this is file f2, line 20
diff --git a/test/devfd2.ok b/test/devfd2.ok
new file mode 100644
index 00000000..be928c1b
--- /dev/null
+++ b/test/devfd2.ok
@@ -0,0 +1,40 @@
+this is file f1, line 1
+this is file f1, line 2
+this is file f1, line 3
+this is file f1, line 4
+this is file f1, line 5
+this is file f1, line 6
+this is file f1, line 7
+this is file f1, line 8
+this is file f1, line 9
+this is file f1, line 10
+this is file f1, line 11
+this is file f1, line 12
+this is file f1, line 13
+this is file f1, line 14
+this is file f1, line 15
+this is file f1, line 16
+this is file f1, line 17
+this is file f1, line 18
+this is file f1, line 19
+this is file f1, line 20
+this is file f2, line 1
+this is file f2, line 2
+this is file f2, line 3
+this is file f2, line 4
+this is file f2, line 5
+this is file f2, line 6
+this is file f2, line 7
+this is file f2, line 8
+this is file f2, line 9
+this is file f2, line 10
+this is file f2, line 11
+this is file f2, line 12
+this is file f2, line 13
+this is file f2, line 14
+this is file f2, line 15
+this is file f2, line 16
+this is file f2, line 17
+this is file f2, line 18
+this is file f2, line 19
+this is file f2, line 20
diff --git a/test/double1.awk b/test/double1.awk
new file mode 100644
index 00000000..70a6fb65
--- /dev/null
+++ b/test/double1.awk
@@ -0,0 +1,4 @@
+BEGIN {
+	print 9223372036854775808
+	printf("%d\n", 9223372036854775808)
+}
diff --git a/test/double1.ok b/test/double1.ok
new file mode 100644
index 00000000..e07477e1
--- /dev/null
+++ b/test/double1.ok
@@ -0,0 +1,2 @@
+9223372036854775808
+9223372036854775808
diff --git a/test/double2.awk b/test/double2.awk
new file mode 100644
index 00000000..e826eeca
--- /dev/null
+++ b/test/double2.awk
@@ -0,0 +1,46 @@
+# Date: Mon, 19 Dec 2005 18:14:13 -0800
+# From: David Ellsworth <ellswort@nas.nasa.gov>
+# Subject: Re: gawk number to string bug
+# To: eggert@CS.UCLA.EDU, eliz@gnu.org
+# Cc: arnold@skeeve.com, aschorr@telemetry-investments.com,
+#         bug-gnu-utils@gnu.org, ellswort@nas.nasa.gov
+# Message-id: <200512200214.jBK2EDuu020216@ece03.nas.nasa.gov>
+# 
+# Since you are taking my bug report seriously (which is really great),
+# let me add some more fuel to the fire.  Consider this program:
+# 
+# BEGIN { x=2**60; for(i=60;i<=65;i++) { printf "2^%d= %s %d %g\n",i,x,x,x; x*=2}}
+# 
+# which prints out powers of two around 2^63.  On an Opteron (as well as
+# an Itanium), you get
+# 
+# 2^60= 1152921504606846976 1152921504606846976 1.15292e+18
+# 2^61= 2305843009213693952 2305843009213693952 2.30584e+18
+# 2^62= 4611686018427387904 4611686018427387904 4.61169e+18
+# 2^63= -9223372036854775808 9223372036854775808 9.22337e+18
+# 2^64= 1.84467e+19 0 1.84467e+19
+# 2^65= 3.68935e+19 3.68935e+19 3.68935e+19
+# 
+# On a Xeon, you get
+# 
+# 2^60= 1.15292e+18 1152921504606846976 1.15292e+18
+# 2^61= 2.30584e+18 2305843009213693952 2.30584e+18
+# 2^62= 4.61169e+18 4611686018427387904 4.61169e+18
+# 2^63= 9.22337e+18 9223372036854775808 9.22337e+18
+# 2^64= 1.84467e+19 0 1.84467e+19
+# 2^65= 3.68935e+19 3.68935e+19 3.68935e+19
+# 
+# The 2^64 value for %d is probably also a bug since the outputs
+# for 2^63 and 2^65 are reasonable.
+# 
+# - David
+# 
+
+BEGIN {
+	x = 2 ^ 60
+#	for (i = 60; i <= 65; i++) {
+	for (i = 60; i <= 63; i++) {
+		printf "2^%d= %s %d %g %o\n", i, x, x, x, x
+		x *= 2
+	}
+}
diff --git a/test/double2.ok b/test/double2.ok
new file mode 100644
index 00000000..f7224e2a
--- /dev/null
+++ b/test/double2.ok
@@ -0,0 +1,4 @@
+2^60= 1152921504606846976 1152921504606846976 1.15292e+18 100000000000000000000
+2^61= 2305843009213693952 2305843009213693952 2.30584e+18 200000000000000000000
+2^62= 4611686018427387904 4611686018427387904 4.61169e+18 400000000000000000000
+2^63= 9223372036854775808 9223372036854775808 9.22337e+18 1000000000000000000000
diff --git a/test/exitval2.w32 b/test/exitval2.w32
new file mode 100644
index 00000000..7f003663
--- /dev/null
+++ b/test/exitval2.w32
@@ -0,0 +1,3 @@
+BEGIN { print "foo" | "sh -c \"read x ; echo $x ; exit 12\"" }
+# this should still exit 0, as pointed out by kenny mccormack in
+# comp.lang.awk on 2 feb 2005
diff --git a/test/fmtspcl.awk b/test/fmtspcl.awk
new file mode 100644
index 00000000..6f037a3a
--- /dev/null
+++ b/test/fmtspcl.awk
@@ -0,0 +1,26 @@
+function display(x,str,  i,res) {
+	for (i = 0; i < n; i++) {
+		if ((res = sprintf(formats[i],x)) != str)
+			printf "sprintf(%s,%s) = %s (!= %s)\n",
+			       formats[i],x,res,str
+	}
+}
+
+BEGIN {
+	nan = sqrt(-1)
+	nan_str = sprintf("%f",nan)
+	nnan_str = sprintf("%f",-nan)
+	inf = -log(0)
+	inf_str = sprintf("%f",inf)
+
+	n = 0
+	formats[n++] = "%f"
+	formats[n++] = "%s"
+	formats[n++] = "%g"
+	formats[n++] = "%x"
+	formats[n++] = "%d"
+	display(nan,nan_str)
+	display(-nan,nnan_str)
+	display(inf,inf)
+	display(-inf,"-"inf_str)
+}
diff --git a/test/fmtspcl.tok b/test/fmtspcl.tok
new file mode 100644
index 00000000..6bfb077d
--- /dev/null
+++ b/test/fmtspcl.tok
@@ -0,0 +1,9 @@
+gawk: fmtspcl.awk:10: warning: sqrt: called with negative argument -1
+gawk: fmtspcl.awk:6: warning: [s]printf: value positive_nan is out of range for `%x' format
+gawk: fmtspcl.awk:6: warning: [s]printf: value positive_nan is out of range for `%d' format
+gawk: fmtspcl.awk:6: warning: [s]printf: value negative_nan is out of range for `%x' format
+gawk: fmtspcl.awk:6: warning: [s]printf: value negative_nan is out of range for `%d' format
+gawk: fmtspcl.awk:6: warning: [s]printf: value positive_infinity is out of range for `%x' format
+gawk: fmtspcl.awk:6: warning: [s]printf: value positive_infinity is out of range for `%d' format
+gawk: fmtspcl.awk:6: warning: [s]printf: value negative_infinity is out of range for `%x' format
+gawk: fmtspcl.awk:6: warning: [s]printf: value negative_infinity is out of range for `%d' format
diff --git a/test/fnarray.ok b/test/fnarray.ok
index 3ee41814..c680c349 100644
--- a/test/fnarray.ok
+++ b/test/fnarray.ok
@@ -1,3 +1,5 @@
 gawk: fnarray.awk:5:   Num = foo[c]
 gawk: fnarray.awk:5:              ^ use of non-array as array
-EXIT CODE: 1
+gawk: fnarray.awk:5: fatal: function `foo' called with space between name and `(',
+or used as a variable or an array
+EXIT CODE: 2
diff --git a/test/fwtest.awk b/test/fwtest.awk
new file mode 100644
index 00000000..730aeda8
--- /dev/null
+++ b/test/fwtest.awk
@@ -0,0 +1,2 @@
+BEGIN {  FIELDWIDTHS = "1 1 1" }
+{ print NF, $1, $2, $3 }
diff --git a/test/fwtest.in b/test/fwtest.in
new file mode 100644
index 00000000..8baef1b4
--- /dev/null
+++ b/test/fwtest.in
@@ -0,0 +1 @@
+abc
diff --git a/test/fwtest.ok b/test/fwtest.ok
new file mode 100644
index 00000000..f2e4bc6b
--- /dev/null
+++ b/test/fwtest.ok
@@ -0,0 +1 @@
+3 a b c
diff --git a/test/fwtest2.awk b/test/fwtest2.awk
new file mode 100644
index 00000000..f9df5833
--- /dev/null
+++ b/test/fwtest2.awk
@@ -0,0 +1,59 @@
+# Date: Fri, 24 Mar 2006 15:17:24 +0100
+# From: =?UTF-8?Q?Ram=C3=B3n_Garc=C3=ADa?= <ramon.garcia.f@gmail.com>
+# Subject: Re: Bug when parsing FIELDWIDTHS
+# In-reply-to: <200603241144.k2OBiFOX030158@skeeve.com>
+# To: Aharon Robbins <arnold@skeeve.com>
+# Message-id: <daa40b5d0603240617j1b7e8861g3963035eafdeba1e@mail.gmail.com>
+# MIME-version: 1.0
+# Content-type: multipart/mixed; boundary="----=_Part_9022_17179442.1143209844259"
+# DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;        s=beta; d=gmail.com;
+#  h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:references;
+#  b=QVst9uUwAllKuDwXhuHbNjpRJStt3nEGc7p+BMG+HNk/qyHmnG/TYXSvIVKgZFja1thLhYbPYncw2MyEHtKyZuiTJCYqvpjWeST9qQNfxVMeu8FahqAky7n8ldsjOK6ncbCoE3hZe/g/Z9ZsVFC9LORXvM5uo7y1MGkUhgxO4qU=
+# 
+# ------=_Part_9022_17179442.1143209844259
+# Content-Type: text/plain; charset=UTF-8
+# Content-Transfer-Encoding: base64
+# Content-Disposition: inline
+# 
+# DQpTdXJlLiBIZXJlIGl0IGlzLg0KDQojIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
+# IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjDQpUaGlz
+# IE1haWwgV2FzIFNjYW5uZWQgYnkgMDEyLm5ldCBBbnRpVmlydXMgU2VydmljZTItIFBvd2VyZWQg
+# YnkgVHJlbmRNaWNybyBJbnRlcnNjYW4NCg==
+# ------=_Part_9022_17179442.1143209844259
+# Content-Type: application/octet-stream; name=bug_data
+# Content-Transfer-Encoding: 7bit
+# X-Attachment-Id: f_el6ll617
+# Content-Disposition: attachment; filename="bug_data"
+# 
+#    0.4867373206   1.3206333033  -0.2333178127 
+#    0.5668176165   1.3711756314  -0.2193558040 
+#    0.4325251781   1.3399488722  -0.1568307497 
+#    0.4900487563   1.3295759570  -0.2217392402 
+#   -0.6790064191   1.2536623801  -0.2955415433 
+#   -0.6311440220   1.2966579993  -0.2246692210 
+#   -0.7209390351   1.1783407099  -0.2539408209 
+#   -0.6782473356   1.2495242556  -0.2811436366 
+#   -0.7062054082   1.1223820964  -1.1619805834 
+#   -0.6491590119   1.1248946162  -1.0851579675 
+#   -0.7948856821   1.1208852325  -1.1259821556 
+#   -0.7102549262   1.1225121126  -1.1475381286         
+# 
+# ------=_Part_9022_17179442.1143209844259
+# Content-Type: application/octet-stream; name=bug.awk
+# Content-Transfer-Encoding: 7bit
+# X-Attachment-Id: f_el6llnjj
+# Content-Disposition: attachment; filename="bug.awk"
+# 
+#!/usr/bin/awk -f
+BEGIN {
+   FIELDWIDTHS = "15 15 15";
+}
+{
+   x = $1;
+   y = $2;
+   z = $3;
+   print "x y z", x, y, z
+}
+# 
+# ------=_Part_9022_17179442.1143209844259--
+# 
diff --git a/test/fwtest2.in b/test/fwtest2.in
new file mode 100644
index 00000000..93f4f007
--- /dev/null
+++ b/test/fwtest2.in
@@ -0,0 +1,12 @@
+   0.4867373206   1.3206333033  -0.2333178127 
+   0.5668176165   1.3711756314  -0.2193558040 
+   0.4325251781   1.3399488722  -0.1568307497 
+   0.4900487563   1.3295759570  -0.2217392402 
+  -0.6790064191   1.2536623801  -0.2955415433 
+  -0.6311440220   1.2966579993  -0.2246692210 
+  -0.7209390351   1.1783407099  -0.2539408209 
+  -0.6782473356   1.2495242556  -0.2811436366 
+  -0.7062054082   1.1223820964  -1.1619805834 
+  -0.6491590119   1.1248946162  -1.0851579675 
+  -0.7948856821   1.1208852325  -1.1259821556 
+  -0.7102549262   1.1225121126  -1.1475381286         
diff --git a/test/fwtest2.ok b/test/fwtest2.ok
new file mode 100644
index 00000000..a53d2dfb
--- /dev/null
+++ b/test/fwtest2.ok
@@ -0,0 +1,12 @@
+x y z    0.4867373206    1.3206333033   -0.2333178127
+x y z    0.5668176165    1.3711756314   -0.2193558040
+x y z    0.4325251781    1.3399488722   -0.1568307497
+x y z    0.4900487563    1.3295759570   -0.2217392402
+x y z   -0.6790064191    1.2536623801   -0.2955415433
+x y z   -0.6311440220    1.2966579993   -0.2246692210
+x y z   -0.7209390351    1.1783407099   -0.2539408209
+x y z   -0.6782473356    1.2495242556   -0.2811436366
+x y z   -0.7062054082    1.1223820964   -1.1619805834
+x y z   -0.6491590119    1.1248946162   -1.0851579675
+x y z   -0.7948856821    1.1208852325   -1.1259821556
+x y z   -0.7102549262    1.1225121126   -1.1475381286
diff --git a/test/getline.awk b/test/getline.awk
index fc09f789..4601ca11 100644
--- a/test/getline.awk
+++ b/test/getline.awk
@@ -26,4 +26,8 @@ BEGIN {
 	a = cmd | getline x
 	close(cmd)
 	print a, x
+
+	# Concatenation has higher precedence than IO.
+	"echo " "date" | getline
+	print
 }
diff --git a/test/getline.ok b/test/getline.ok
index dd5bdb64..a033cb65 100644
--- a/test/getline.ok
+++ b/test/getline.ok
@@ -5,3 +5,4 @@
 2 B
 -1 C
 1 D
+date
diff --git a/test/hsprint.awk b/test/hsprint.awk
index d17cedeb..facc109d 100644
--- a/test/hsprint.awk
+++ b/test/hsprint.awk
@@ -51,7 +51,7 @@ BEGIN {
 			      substr(spc,s,1) substr(alt,a,1) substr(zero,z,1);
 			    fstr = sprintf(\
 				     "%6s|%s%s|%s%s|%s%s|%s%s|%s%s|%s%s|\n",
-					   fmt, 
+					   "%" fmt, 
 					   fmt, oper[r],
 					   fmt, oper[r+1],
 					   fmt, oper[r+2],
@@ -69,6 +69,3 @@ BEGIN {
 	print "";
     }
 }
-
-
-
diff --git a/test/hsprint.ok b/test/hsprint.ok
index 55fd16f3..88fa832a 100644
--- a/test/hsprint.ok
+++ b/test/hsprint.ok
@@ -1,66 +1,66 @@
-     %|   45|   55|   2d|  12.68|  1.27e+01|     12.68|
-    %0|00045|00055|0002d|0012.68|001.27e+01|0000012.68|
-    %#|   45|  055| 0x2d|  12.68|  1.27e+01|     12.68|
-   %#0|00045|00055|0x02d|0012.68|001.27e+01|0000012.68|
-    % |   45|   55|   2d|  12.68|  1.27e+01|     12.68|
-   % 0| 0045|00055|0002d| 012.68| 01.27e+01| 000012.68|
-   % #|   45|  055| 0x2d|  12.68|  1.27e+01|     12.68|
-  % #0| 0045|00055|0x02d| 012.68| 01.27e+01| 000012.68|
-    %+|  +45|   55|   2d| +12.68| +1.27e+01|    +12.68|
-   %+0|+0045|00055|0002d|+012.68|+01.27e+01|+000012.68|
-   %+#|  +45|  055| 0x2d| +12.68| +1.27e+01|    +12.68|
-  %+#0|+0045|00055|0x02d|+012.68|+01.27e+01|+000012.68|
-   %+ |  +45|   55|   2d| +12.68| +1.27e+01|    +12.68|
-  %+ 0|+0045|00055|0002d|+012.68|+01.27e+01|+000012.68|
-  %+ #|  +45|  055| 0x2d| +12.68| +1.27e+01|    +12.68|
- %+ #0|+0045|00055|0x02d|+012.68|+01.27e+01|+000012.68|
-    %-|45   |55   |2d   |12.68  |1.27e+01  |12.68     |
-   %-0|45   |55   |2d   |12.68  |1.27e+01  |12.68     |
-   %-#|45   |055  |0x2d |12.68  |1.27e+01  |12.68     |
-  %-#0|45   |055  |0x2d |12.68  |1.27e+01  |12.68     |
-   %- | 45  |55   |2d   | 12.68 | 1.27e+01 | 12.68    |
-  %- 0| 45  |55   |2d   | 12.68 | 1.27e+01 | 12.68    |
-  %- #| 45  |055  |0x2d | 12.68 | 1.27e+01 | 12.68    |
- %- #0| 45  |055  |0x2d | 12.68 | 1.27e+01 | 12.68    |
-   %-+|+45  |55   |2d   |+12.68 |+1.27e+01 |+12.68    |
-  %-+0|+45  |55   |2d   |+12.68 |+1.27e+01 |+12.68    |
-  %-+#|+45  |055  |0x2d |+12.68 |+1.27e+01 |+12.68    |
- %-+#0|+45  |055  |0x2d |+12.68 |+1.27e+01 |+12.68    |
-  %-+ |+45  |55   |2d   |+12.68 |+1.27e+01 |+12.68    |
- %-+ 0|+45  |55   |2d   |+12.68 |+1.27e+01 |+12.68    |
- %-+ #|+45  |055  |0x2d |+12.68 |+1.27e+01 |+12.68    |
+    %|   45|   55|   2d|  12.68|  1.27e+01|     12.68|
+   %0|00045|00055|0002d|0012.68|001.27e+01|0000012.68|
+   %#|   45|  055| 0x2d|  12.68|  1.27e+01|     12.68|
+  %#0|00045|00055|0x02d|0012.68|001.27e+01|0000012.68|
+   % |   45|   55|   2d|  12.68|  1.27e+01|     12.68|
+  % 0| 0045|00055|0002d| 012.68| 01.27e+01| 000012.68|
+  % #|   45|  055| 0x2d|  12.68|  1.27e+01|     12.68|
+ % #0| 0045|00055|0x02d| 012.68| 01.27e+01| 000012.68|
+   %+|  +45|   55|   2d| +12.68| +1.27e+01|    +12.68|
+  %+0|+0045|00055|0002d|+012.68|+01.27e+01|+000012.68|
+  %+#|  +45|  055| 0x2d| +12.68| +1.27e+01|    +12.68|
+ %+#0|+0045|00055|0x02d|+012.68|+01.27e+01|+000012.68|
+  %+ |  +45|   55|   2d| +12.68| +1.27e+01|    +12.68|
+ %+ 0|+0045|00055|0002d|+012.68|+01.27e+01|+000012.68|
+ %+ #|  +45|  055| 0x2d| +12.68| +1.27e+01|    +12.68|
+%+ #0|+0045|00055|0x02d|+012.68|+01.27e+01|+000012.68|
+   %-|45   |55   |2d   |12.68  |1.27e+01  |12.68     |
+  %-0|45   |55   |2d   |12.68  |1.27e+01  |12.68     |
+  %-#|45   |055  |0x2d |12.68  |1.27e+01  |12.68     |
+ %-#0|45   |055  |0x2d |12.68  |1.27e+01  |12.68     |
+  %- | 45  |55   |2d   | 12.68 | 1.27e+01 | 12.68    |
+ %- 0| 45  |55   |2d   | 12.68 | 1.27e+01 | 12.68    |
+ %- #| 45  |055  |0x2d | 12.68 | 1.27e+01 | 12.68    |
+%- #0| 45  |055  |0x2d | 12.68 | 1.27e+01 | 12.68    |
+  %-+|+45  |55   |2d   |+12.68 |+1.27e+01 |+12.68    |
+ %-+0|+45  |55   |2d   |+12.68 |+1.27e+01 |+12.68    |
+ %-+#|+45  |055  |0x2d |+12.68 |+1.27e+01 |+12.68    |
+%-+#0|+45  |055  |0x2d |+12.68 |+1.27e+01 |+12.68    |
+ %-+ |+45  |55   |2d   |+12.68 |+1.27e+01 |+12.68    |
+%-+ 0|+45  |55   |2d   |+12.68 |+1.27e+01 |+12.68    |
+%-+ #|+45  |055  |0x2d |+12.68 |+1.27e+01 |+12.68    |
 %-+ #0|+45  |055  |0x2d |+12.68 |+1.27e+01 |+12.68    |
 
-     %|  zap|    *|     -3|  -3.46| -3.46e+00|    -3.457|
-    %0|00zap|0000*|-000003|-003.46|-03.46e+00|-00003.457|
-    %#|  zap|    *|    -3.|  -3.46| -3.46e+00|    -3.457|
-   %#0|00zap|0000*|-00003.|-003.46|-03.46e+00|-00003.457|
-    % |  zap|    *|     -3|  -3.46| -3.46e+00|    -3.457|
-   % 0|00zap|0000*|-000003|-003.46|-03.46e+00|-00003.457|
-   % #|  zap|    *|    -3.|  -3.46| -3.46e+00|    -3.457|
-  % #0|00zap|0000*|-00003.|-003.46|-03.46e+00|-00003.457|
-    %+|  zap|    *|     -3|  -3.46| -3.46e+00|    -3.457|
-   %+0|00zap|0000*|-000003|-003.46|-03.46e+00|-00003.457|
-   %+#|  zap|    *|    -3.|  -3.46| -3.46e+00|    -3.457|
-  %+#0|00zap|0000*|-00003.|-003.46|-03.46e+00|-00003.457|
-   %+ |  zap|    *|     -3|  -3.46| -3.46e+00|    -3.457|
-  %+ 0|00zap|0000*|-000003|-003.46|-03.46e+00|-00003.457|
-  %+ #|  zap|    *|    -3.|  -3.46| -3.46e+00|    -3.457|
- %+ #0|00zap|0000*|-00003.|-003.46|-03.46e+00|-00003.457|
-    %-|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
-   %-0|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
-   %-#|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
-  %-#0|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
-   %- |zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
-  %- 0|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
-  %- #|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
- %- #0|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
-   %-+|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
-  %-+0|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
-  %-+#|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
- %-+#0|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
-  %-+ |zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
- %-+ 0|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
- %-+ #|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
+    %|  zap|    *|     -3|  -3.46| -3.46e+00|    -3.457|
+   %0|00zap|0000*|-000003|-003.46|-03.46e+00|-00003.457|
+   %#|  zap|    *|    -3.|  -3.46| -3.46e+00|    -3.457|
+  %#0|00zap|0000*|-00003.|-003.46|-03.46e+00|-00003.457|
+   % |  zap|    *|     -3|  -3.46| -3.46e+00|    -3.457|
+  % 0|00zap|0000*|-000003|-003.46|-03.46e+00|-00003.457|
+  % #|  zap|    *|    -3.|  -3.46| -3.46e+00|    -3.457|
+ % #0|00zap|0000*|-00003.|-003.46|-03.46e+00|-00003.457|
+   %+|  zap|    *|     -3|  -3.46| -3.46e+00|    -3.457|
+  %+0|00zap|0000*|-000003|-003.46|-03.46e+00|-00003.457|
+  %+#|  zap|    *|    -3.|  -3.46| -3.46e+00|    -3.457|
+ %+#0|00zap|0000*|-00003.|-003.46|-03.46e+00|-00003.457|
+  %+ |  zap|    *|     -3|  -3.46| -3.46e+00|    -3.457|
+ %+ 0|00zap|0000*|-000003|-003.46|-03.46e+00|-00003.457|
+ %+ #|  zap|    *|    -3.|  -3.46| -3.46e+00|    -3.457|
+%+ #0|00zap|0000*|-00003.|-003.46|-03.46e+00|-00003.457|
+   %-|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
+  %-0|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
+  %-#|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
+ %-#0|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
+  %- |zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
+ %- 0|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
+ %- #|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
+%- #0|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
+  %-+|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
+ %-+0|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
+ %-+#|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
+%-+#0|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
+ %-+ |zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
+%-+ 0|zap  |*    |-3     |-3.46  |-3.46e+00 |-3.457    |
+%-+ #|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
 %-+ #0|zap  |*    |-3.    |-3.46  |-3.46e+00 |-3.457    |
 
diff --git a/test/icasers.awk b/test/icasers.awk
index 933e3bf7..8fdc826b 100644
--- a/test/icasers.awk
+++ b/test/icasers.awk
@@ -1,2 +1,2 @@
-BEGIN { RS = "[[:upper:]]+" }
+BEGIN { RS = "[[:upper:]\\n]+" }
 { print ; IGNORECASE = ! IGNORECASE }
diff --git a/test/intformat.awk b/test/intformat.awk
new file mode 100644
index 00000000..56ce606b
--- /dev/null
+++ b/test/intformat.awk
@@ -0,0 +1,74 @@
+function abs(x) {
+	return (x+0 >= 0) ? x : -x
+}
+
+function check(x,what,  f,res) {
+	for (f in formats) {
+		res = sprintf(f,x)
+		if (formats[f] == "non-decimal") {
+			if ((x >= 0) && (res !~ /e+/)) {
+				if (abs(strtonum(res)-x) > 1e-5*abs(x))
+				       printf "(sprintf(%s,%s) = %s)-%g = %g\n",
+					      f,what,res,x,strtonum(res)-x
+			}
+		}
+		else if (abs(res-x) > 1e-5*abs(x))
+			printf "(sprintf(%s,%s) = %s)-%g = %g\n",
+			       f,what,res,x,res-x
+	}
+}
+
+function check_cons(fmt,base,rot,mexp,  i,j,dig,res,s) {
+	# first off, check that zero formats properly
+	if ((s = sprintf(fmt,0)) != "0")
+		printf "(sprintf(%s,0) = %s) != 0\n",fmt,s
+
+	res = "1"
+	dig = 1
+	j = 0
+	for (i = 0; i <= mexp; i++) {
+		s = sprintf(fmt,base^i)
+		if (s ~ /e+/)
+			return
+		if (s != res)
+			printf "(sprintf(%s,%d^%d) = %s) != %s\n",
+			       fmt,base,i,s,res
+		if (++j == rot) {
+			dig = 1
+			res = ("10"substr(res,2))
+			j = 0
+		}
+		else {
+			dig *= 2
+			res = (dig substr(res,2))
+		}
+	}
+}
+
+BEGIN {
+	formats["%s"] = ""
+	formats["%d"] = ""
+	formats["%.0f"] = ""
+	formats["0%o"] = "non-decimal"
+	formats["0x%x"] = "non-decimal"
+
+	check(0,"0")
+	for (i = 0; i <= 308; i++) {
+		check(10^i,"10^"i)
+		check(-10^i,"-10^"i)
+	}
+	for (i = 0; i <= 1023; i++) {
+		check(2^i,"2^"i)
+		check(-2^i,"-2^"i)
+	}
+
+	check_cons("%d",10,1,9)
+	check_cons("%x",2,4,31)
+	check_cons("%o",2,3,31)
+
+	# make sure basic %d and %x are working properly
+	printf "%d %d %x\n",3.7,-3.7,23.7
+
+	# check another problem in gawk 3.1.5: precision over 30 crashes
+	printf "%.55d\n",1
+}
diff --git a/test/intformat.ok b/test/intformat.ok
new file mode 100644
index 00000000..868f9f11
--- /dev/null
+++ b/test/intformat.ok
@@ -0,0 +1,2 @@
+3 -3 17
+0000000000000000000000000000000000000000000000000000001
diff --git a/test/lintold.awk b/test/lintold.awk
new file mode 100644
index 00000000..61d12f2f
--- /dev/null
+++ b/test/lintold.awk
@@ -0,0 +1,21 @@
+# lintold.awk --- test --lint-old
+
+BEGIN {
+	a[1] = 1
+	for (i in a)
+	  print a[i]
+	delete a[1]
+	if (2 in a)
+	  a[2] **= 2;
+	if ((2,3) in a)
+	  a[2,3] ^= 2 ** 3 ^ 15;
+}
+BEGIN {
+	FS = "ab"
+	foo = "\b\f\r"
+}
+END {
+}
+END {
+        print "done"
+}
diff --git a/test/lintold.in b/test/lintold.in
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/test/lintold.in
@@ -0,0 +1 @@
+
diff --git a/test/lintold.ok b/test/lintold.ok
new file mode 100644
index 00000000..e3867e4e
--- /dev/null
+++ b/test/lintold.ok
@@ -0,0 +1,16 @@
+gawk: lintold.awk:7: warning: `delete' is not supported in old awk
+gawk: lintold.awk:8: warning: old awk does not support the keyword `in' except after `for'
+gawk: lintold.awk:9: warning: old awk does not support operator `**='
+gawk: lintold.awk:10: warning: old awk does not support the keyword `in' except after `for'
+gawk: lintold.awk:10: warning: old awk does not support multidimensional arrays
+gawk: lintold.awk:11: warning: operator `^=' is not supported in old awk
+gawk: lintold.awk:11: warning: old awk does not support operator `**'
+gawk: lintold.awk:11: warning: operator `^' is not supported in old awk
+gawk: lintold.awk:13: warning: old awk does not support multiple `BEGIN' or `END' rules
+gawk: lintold.awk:15: warning: old awk does not support the `\b' escape sequence
+gawk: lintold.awk:15: warning: old awk does not support the `\f' escape sequence
+gawk: lintold.awk:15: warning: old awk does not support the `\r' escape sequence
+gawk: lintold.awk:19: warning: old awk does not support multiple `BEGIN' or `END' rules
+1
+gawk: lintold.awk:14: warning: old awk does not support regexps as value of `FS'
+done
diff --git a/test/localenl.ok b/test/localenl.ok
new file mode 100644
index 00000000..a6a1cffa
--- /dev/null
+++ b/test/localenl.ok
@@ -0,0 +1,5 @@
+LC_ALL=C passed
+LC_ALL=UNKNOWN passed
+LC_ALL=POSIX passed
+LC_ALL=en_US.ISO-8859-1 passed
+LC_ALL=en_US.UTF-8 passed
diff --git a/test/localenl.sh b/test/localenl.sh
new file mode 100755
index 00000000..2c7e78ce
--- /dev/null
+++ b/test/localenl.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# From arnold@f7.net  Sun Apr 22 20:15:25 2007
+# Date: Thu, 19 Apr 2007 17:09:02 +0300
+# From: Pekka Pessi <Pekka.Pessi@nokia.com>
+# X-Face: #V(jdpv[lI!TNUU=2*oh:="#suS*ponXW"yr6G;~L}<xZn_2^0)V{jqdc4y}@2b]ffd}SY#
+#  :9||1pew85O,WjiYA"6C7bW^zt^+.{b#B{lEE+4$9lrXL(55g}dU>uZ\JfD\"IG#G{j`hZI;=DmT\H
+#  pfDMyJ`i=:M;BM3R.`[>P^ER8+]i
+# Subject: UTF-8 locale and \n in regexps
+# To: bug-gawk@gnu.org
+# Cc: Pekka.Pessi@nokia.com
+# Message-id: <pvlkgoh2wx.fsf@nokia.com>
+# MIME-version: 1.0
+# Content-type: multipart/mixed; boundary="=-=-="
+# 
+# --=-=-=
+# 
+# Hello,
+# 
+# It looks like regexp with \n in [^] behaves badly if locale has
+# an UTF-8 ctype.
+# 
+# It looks like if there is \n and an range without \n, like /\n[^x\n]foo/,
+# and first \n ends an even-numbered line within the string, regexp
+# does not match.
+# 
+# Please see the attached script for an demonstration.
+# 
+# --Pekka Pessi
+# 
+# 
+# --=-=-=
+# Content-Disposition: inline; filename=gawk-test
+# 
+#! /bin/sh
+
+AWK=${AWK:-../gawk}
+
+for LC_ALL in C UNKNOWN POSIX en_US.ISO-8859-1 en_US.UTF-8
+do
+export LC_ALL
+cat <<EOF |
+line1
+line2
+line3
+line4 
+line5
+line6
+line7
+line8
+line9
+EOF
+$AWK '
+BEGIN { RS="\0"; }
+{ 
+  if (match($0, /\n[^2\n]*2/)) { got2=1; } else { print "no match 2"; }
+  if (match($0, /\n[^3\n]*3/)) { got3=1; } else { print "no match 3"; }
+  if (match($0, /\n[^4\n]*4/)) { got4=1; } else { print "no match 4"; }
+  if (match($0, /\n[^5\t]*5/)) { got5=1; } else { print "no match 5"; }
+  if (match($0, /\n[^6\n]*6/)) { got6=1; } else { print "no match 6"; }
+  if (match($0, /\n[a-z]*7\n/)){ got7=1; } else { print "no match 7"; }
+  if (match($0, /\n[^8\n]*8/)) { got8=1; } else { print "no match 8"; }
+  if (match($0, /8.[^9\n]+9/)) { got9=1; } else { print "no match 9"; }
+}
+
+END { exit(!(got2 && got3 && got4 && got5 && got6 && got7 && got8 && got9)); }
+' || { 
+  echo LC_ALL=$LC_ALL FAILED
+  exit 1
+}
+echo LC_ALL=$LC_ALL passed
+done
+# 
+# --=-=-=--
+# 
diff --git a/test/mixed1.ok b/test/mixed1.ok
new file mode 100644
index 00000000..91608fa3
--- /dev/null
+++ b/test/mixed1.ok
@@ -0,0 +1,3 @@
+gawk: BEGIN {return junk}
+gawk:        ^ `return' used outside function context
+EXIT CODE: 1
diff --git a/test/mtchi18n.awk b/test/mtchi18n.awk
new file mode 100644
index 00000000..aac65451
--- /dev/null
+++ b/test/mtchi18n.awk
@@ -0,0 +1 @@
+{print match(""," *")}
diff --git a/test/mtchi18n.in b/test/mtchi18n.in
new file mode 100644
index 00000000..139597f9
--- /dev/null
+++ b/test/mtchi18n.in
@@ -0,0 +1,2 @@
+
+
diff --git a/test/mtchi18n.ok b/test/mtchi18n.ok
new file mode 100644
index 00000000..6ed281c7
--- /dev/null
+++ b/test/mtchi18n.ok
@@ -0,0 +1,2 @@
+1
+1
diff --git a/test/nofile.ok b/test/nofile.ok
new file mode 100644
index 00000000..2dee4572
--- /dev/null
+++ b/test/nofile.ok
@@ -0,0 +1,2 @@
+gawk: cmd. line:1: fatal: cannot open file `no/such/file' for reading (No such file or directory)
+EXIT CODE: 2
diff --git a/test/ovrflow1.awk b/test/ovrflow1.awk
new file mode 100644
index 00000000..0506a06e
--- /dev/null
+++ b/test/ovrflow1.awk
@@ -0,0 +1,82 @@
+# From arnold@f7.net  Thu Dec 15 08:57:08 2005
+# Return-Path: <arnold@f7.net>
+# Received: from localhost (skeeve [127.0.0.1])
+# 	by skeeve.com (8.12.11/8.12.11) with ESMTP id jBF6ubXX003003
+# 	for <arnold@localhost>; Thu, 15 Dec 2005 08:57:08 +0200
+# Received: from pop.012.net.il [84.95.5.221]
+# 	by localhost with POP3 (fetchmail-6.2.5)
+# 	for arnold@localhost (single-drop); Thu, 15 Dec 2005 08:57:08 +0200 (IST)
+# Received: from mtain3.012.net.il ([10.220.5.7])
+#  by i_mss3.012.net.il (HyperSendmail v2004.12)
+#  with ESMTP id <0IRI007F9SHYRDF0@i_mss3.012.net.il> for arobbins@012.net.il;
+#  Thu, 15 Dec 2005 05:32:22 +0200 (IST)
+# Received: from i_mtain1.012.net.il ([10.220.20.4])
+#  by i_mtain3.012.net.il (HyperSendmail v2004.12)
+#  with ESMTP id <0IRI00CUNSHXU5D0@i_mtain3.012.net.il> for arobbins@012.net.il
+#  (ORCPT arobbins@012.net.il); Thu, 15 Dec 2005 05:32:22 +0200 (IST)
+# Received: from f7.net ([64.34.169.74])
+#  by i_mtain1.012.net.il (HyperSendmail v2004.12)
+#  with ESMTP id <0IRI005JEPNHIG00@i_mtain1.012.net.il> for arobbins@012.net.il;
+#  Thu, 15 Dec 2005 04:30:54 +0200 (IST)
+# Received: (from arnold@localhost)	by f7.net (8.11.7-20030920/8.11.7)
+#  id jBF2TkQ18162	for arobbins@012.net.il; Wed, 14 Dec 2005 20:29:46 -0600
+# Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164])
+# 	by f7.net (8.11.7-20030920/8.11.7) with ESMTP id jBF2Tis18148	for
+#  <arnold@skeeve.com>; Wed, 14 Dec 2005 20:29:44 -0600
+# Received: from monty-python.gnu.org ([199.232.76.173])
+# 	by fencepost.gnu.org with esmtp (Exim 4.34)
+# 	id 1Emir1-0007i6-1e	for bug-gawk@gnu.org; Wed, 14 Dec 2005 21:28:23 -0500
+# Received: from Debian-exim by monty-python.gnu.org with spam-scanned
+#  (Exim 4.34)	id 1Emiv6-0006FV-9G	for bug-gawk@gnu.org; Wed,
+#  14 Dec 2005 21:32:37 -0500
+# Received: from [129.99.139.165] (helo=ece03.nas.nasa.gov)
+# 	by monty-python.gnu.org with esmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24)
+# 	(Exim 4.34)	id 1Emiv5-0006F0-UO	for bug-gawk@gnu.org; Wed,
+#  14 Dec 2005 21:32:36 -0500
+# Received: from ece03.nas.nasa.gov (localhost.localdomain [127.0.0.1])
+# 	by ece03.nas.nasa.gov (8.12.11/8.12.11) with ESMTP id jBF2TcNa022308; Wed,
+#  14 Dec 2005 18:29:38 -0800
+# Received: (from ellswort@localhost)
+# 	by ece03.nas.nasa.gov (8.12.11/8.12.11/Submit) id jBF2TcQC022307; Wed,
+#  14 Dec 2005 18:29:38 -0800
+# Date: Wed, 14 Dec 2005 18:29:38 -0800
+# From: David Ellsworth <ellswort@nas.nasa.gov>
+# Subject: gawk number to string bug
+# To: bug-gawk@gnu.org
+# Cc: ellswort@nas.nasa.gov
+# Message-id: <200512150229.jBF2TcQC022307@ece03.nas.nasa.gov>
+# Original-recipient: rfc822;arobbins@012.net.il
+# X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on skeeve.com
+# X-Spam-Level: 
+# X-Spam-Status: No, hits=-4.9 required=5.0 tests=BAYES_00 autolearn=ham 
+# 	version=2.63
+# 
+# 
+# I ran into a bug in how gawk converts numbers into strings.  
+# 
+# Running the program
+   BEGIN { print 9223372036854775808 }
+# prints
+#   -9223372036854775808
+# on a 64-bit machine.  On a 32-bit machine, the same program prints out
+#   9.22337e+18
+# which is correct.
+# 
+# Note that 9223372036854775808 == 2^63.  Printing out other powers of 2
+# is OK.
+# 
+# Version details:
+#   gawk version 3.1.5, freshly downloaded from gnu.org
+#   gcc (GCC) 3.4.4 (Gentoo 3.4.4-r1, ssp-3.4.4-1.0, pie-8.7.8)
+#   uname -a output:
+#     Linux pixie 2.6.12-gentoo-r10 #2 SMP Tue Nov 1 03:42:22 PST 2005
+#     x86_64 Dual Core AMD Opteron(tm) Processor 275 AuthenticAMD GNU/Linux
+# 
+# (the 32-bit example used gawk version 3.1.3)
+# 
+# - David
+# 
+# 
+# #####################################################################################
+# This Mail Was Scanned by 012.net AntiVirus Service4- Powered by TrendMicro Interscan
+#
diff --git a/test/ovrflow1.ok b/test/ovrflow1.ok
new file mode 100644
index 00000000..b0898f38
--- /dev/null
+++ b/test/ovrflow1.ok
@@ -0,0 +1 @@
+9223372036854775808
diff --git a/test/parse1.awk b/test/parse1.awk
new file mode 100644
index 00000000..84906c49
--- /dev/null
+++ b/test/parse1.awk
@@ -0,0 +1,35 @@
+# Date: Fri, 06 Jan 2006 14:02:17 -0800
+# From: Paul Eggert <eggert@CS.UCLA.EDU>
+# Subject: gawk misparses $expr++ if expr ends in ++
+# To: bug-gawk@gnu.org
+# Message-id: <87irsxypzq.fsf@penguin.cs.ucla.edu>
+# 
+# Here's an example of the problem:
+# 
+# $ gawk 'BEGIN{a=3}{print $$a++++}'
+# gawk: {print $$a++++}
+# gawk:               ^ syntax error
+# 
+# But it's not a syntax error, as the expression conforms to the POSIX
+# spec: it should be treated like '$($a++)++'.
+# 
+# Mawk, Solaris awk (old awk), and Solaris nawk all accept the
+# expression.  For example:
+# 
+# $ echo '3 4 5 6 7 8 9' | nawk 'BEGIN{a=3}{print $$a++++}'
+# 7
+# 
+# This is with gawk 3.1.5 on Solaris 8 (sparc).
+# 
+# 
+# #####################################################################################
+# This Mail Was Scanned by 012.net AntiVirus Service1- Powered by TrendMicro Interscan
+# 
+BEGIN { a = 3 }
+
+{
+	print "in:", $0
+	print "a =", a
+	print $$a++++
+	print "out:", $0
+}
diff --git a/test/parse1.in b/test/parse1.in
new file mode 100644
index 00000000..4a001d7b
--- /dev/null
+++ b/test/parse1.in
@@ -0,0 +1 @@
+3 4 5 6 7 8 9
diff --git a/test/parse1.ok b/test/parse1.ok
new file mode 100644
index 00000000..a452e60c
--- /dev/null
+++ b/test/parse1.ok
@@ -0,0 +1,4 @@
+in: 3 4 5 6 7 8 9
+a = 3
+7
+out: 3 4 6 6 8 8 9
diff --git a/test/parsefld.awk b/test/parsefld.awk
new file mode 100644
index 00000000..0dd2f914
--- /dev/null
+++ b/test/parsefld.awk
@@ -0,0 +1,2 @@
+{ print $/= b/ c /= d/ }
+{ print /a/ + /b/ + !/c/}
diff --git a/test/parsefld.in b/test/parsefld.in
new file mode 100644
index 00000000..959d6825
--- /dev/null
+++ b/test/parsefld.in
@@ -0,0 +1 @@
+a = b
diff --git a/test/parsefld.ok b/test/parsefld.ok
new file mode 100644
index 00000000..8d0316f1
--- /dev/null
+++ b/test/parsefld.ok
@@ -0,0 +1,2 @@
+a0
+3
diff --git a/test/pid.awk b/test/pid.awk
index 9b47d908..de83dabe 100644
--- a/test/pid.awk
+++ b/test/pid.awk
@@ -27,18 +27,20 @@
 BEGIN {
 	getline pid <"/dev/pid"
 	getline ppid <"/dev/ppid"
-}
-NR == 1 {
-	if (pid != $0) {
-		printf "Bad pid %d, wanted %d\n", $0, pid
-	}
-}
-NR == 2 {
-	if (ppid != $0) {
-		printf "Bad ppid %d, wanted %d\n", $0, ppid
-	}
-}
-END {	# ADR --- added
+
+	if (pid != ok_pid)
+		printf "Bad pid %d, wanted %d\n", pid, ok_pid
+	else
+		print "PID ok"
+
+	if (ppid != ok_ppid)
+		printf "Bad ppid %d, wanted %d\n", ppid, ok_ppid
+	else
+		print "PPID ok"
+
+	# ADR --- added
 	close("/dev/pid")
 	close("/dev/ppid")
+
+	print "All Done."
 }
diff --git a/test/pid.ok b/test/pid.ok
index e69de29b..a700d101 100644
--- a/test/pid.ok
+++ b/test/pid.ok
@@ -0,0 +1,3 @@
+PID ok
+PPID ok
+All Done.
diff --git a/test/pid.sh b/test/pid.sh
index 901637ad..da49afdf 100755
--- a/test/pid.sh
+++ b/test/pid.sh
@@ -1,5 +1,3 @@
 #! /bin/sh
 AWK=${AWK-../gawk}
-echo $$ > _pid.in
-echo $1 >> _pid.in
-exec $AWK -f pid.awk _pid.in 2>/dev/null
+exec $AWK -v "ok_pid=$$" -v "ok_ppid=$1" -f pid.awk 2>/dev/null
diff --git a/test/pipeio2.awk b/test/pipeio2.awk
index dbf354bf..a4cd3bfa 100644
--- a/test/pipeio2.awk
+++ b/test/pipeio2.awk
@@ -25,7 +25,9 @@ BEGIN	{
 			#com = "cal 01 1997"
 			com = ("cat " SRCDIR "/pipeio2.in")
 
-			while ((com | getline fnam) > 0) {
+			# Don't use empty lines, because Windows ECHO does
+			# something different when invoked without arguments
+			while ((com | getline fnam) > 0 && fnam != "") {
 
 #				com_tr = "echo " fnam " | tr [0-9]. ..........."
 #				com_tr = "echo " fnam " | sed 's/[0-9]/./g'"
diff --git a/test/pipeio2.ok b/test/pipeio2.ok
index 13b0b9b0..4514fbb3 100644
--- a/test/pipeio2.ok
+++ b/test/pipeio2.ok
@@ -12,5 +12,3 @@ S M Tu W Th F S
 .. .. .. .. .. .. ..
 'echo 26 27 28 29 30 31 | sed "s/[0-9]/./g"'
 .. .. .. .. .. ..
-'echo  | sed "s/[0-9]/./g"'
-
diff --git a/test/reg/func2.good b/test/reg/func2.good
index 3d7b5bae..a6515c97 100644
--- a/test/reg/func2.good
+++ b/test/reg/func2.good
@@ -1,2 +1,2 @@
 gawk: reg/func2.awk:2: fatal: function `dummy' called with space between name and `(',
-or used in other expression context
+or used as a variable or an array
diff --git a/test/reg/func2.out b/test/reg/func2.out
deleted file mode 100644
index a6515c97..00000000
--- a/test/reg/func2.out
+++ /dev/null
@@ -1,2 +0,0 @@
-gawk: reg/func2.awk:2: fatal: function `dummy' called with space between name and `(',
-or used as a variable or an array
diff --git a/test/reint2.awk b/test/reint2.awk
new file mode 100644
index 00000000..f9269dd8
--- /dev/null
+++ b/test/reint2.awk
@@ -0,0 +1 @@
+/^([[:digit:]]+[[:space:]]+){2}/
diff --git a/test/reint2.in b/test/reint2.in
new file mode 100644
index 00000000..b85905ec
--- /dev/null
+++ b/test/reint2.in
@@ -0,0 +1 @@
+1 2 3
diff --git a/test/reint2.ok b/test/reint2.ok
new file mode 100644
index 00000000..b85905ec
--- /dev/null
+++ b/test/reint2.ok
@@ -0,0 +1 @@
+1 2 3
diff --git a/test/strnum1.awk b/test/strnum1.awk
new file mode 100644
index 00000000..e9cbdaf6
--- /dev/null
+++ b/test/strnum1.awk
@@ -0,0 +1,35 @@
+# Date: Tue, 04 Jul 2006 21:06:14 +0200 (MEST)
+# From: Heiner Marxen <Heiner.Marxen@DrB.Insel.DE>
+# Subject: conversion error
+# To: bug-gawk@gnu.org
+# Message-id: <200607041906.k64J6Eqa019360@drb9.drb.insel.de>
+# 
+# Hello,
+# 
+# The following awk script fails for gawk 3.1.4 and 3.1.5.
+# Older versions did not do this, but I cannot say, how old they were.
+# 
+BEGIN {
+    if( 0 ) {		#ok
+	t = "8"
+    }else {		#fails
+	t = ""
+	t = t "8"
+    }
+    printf("8  = %d\n", 0+t)	# ok without this line
+    t = t "8"			# does not invalidate numeric interpretation
+    printf("88 = %s\n", 0+t)
+    ## The above prints "88 = 8" with gawk 3.1.4 and 3.1.5
+}
+# 
+# 
+# The following one-liner already exhibits the bug:
+# 
+# gawk 'BEGIN{t=""; t=t "8";printf("8=%d\n", 0+t);t=t "8";printf("88=%s\n", 0+t)}'
+# 
+# 
+# Preliminary observation: under somewhat strange conditions a variable
+# does retain its numeric interpretation although something is appended to it.
+# -- 
+# Heiner Marxen				http://www.drb.insel.de/~heiner/
+# 
diff --git a/test/strnum1.ok b/test/strnum1.ok
new file mode 100644
index 00000000..804bcfde
--- /dev/null
+++ b/test/strnum1.ok
@@ -0,0 +1,2 @@
+8  = 8
+88 = 88
diff --git a/test/subi18n.awk b/test/subi18n.awk
new file mode 100644
index 00000000..69bfca2b
--- /dev/null
+++ b/test/subi18n.awk
@@ -0,0 +1,68 @@
+# Date: Mon, 27 Feb 2006 12:35:30 +0900
+# From: KIMURA Koichi <kimura.koichi@canon.co.jp>
+# Subject: gawk: sub_common has multi-byte aware bug
+# To: bug-gawk@gnu.org
+# Message-id: <20060227121045.2198.KIMURA.KOICHI@canon.co.jp>
+# 
+# Hi,
+# 
+# A certain user faced bug of sub builtin function and report to me.
+# Then I investigated the bug.
+# 
+# reproduce script is here.
+
+BEGIN {
+	str = "type=\"directory\" version=\"1.0\""
+	#print "BEGIN:", str
+
+	while (str) {
+		sub(/^[^=]*/, "", str);
+		s = substr(str, 2)
+		print s
+		sub(/^="[^"]*"/, "", str)
+		sub(/^[ \t]*/, "", str)
+	}
+}
+
+# and sample result is here (on GNU/Linux Fedora core 3)
+# 
+# [kbk@skuld gawk-3.1.5]$ LC_ALL=C ./gawk -f subbug.awk
+# "directory" version="1.0"
+# "1.0"
+# [kbk@skuld gawk-3.1.5]$ LC_ALL=en_US.UTF-8 ./gawk -f subbug.awk
+# "directory" version="1.0"
+# "dire
+# [kbk@skuld gawk-3.1.5]$
+# 
+# In my investigation, this bug is cause by don't release wide-string when
+# sub is executed.
+# 
+# patch is here.
+# 
+# --- builtin.c.orig	2005-07-27 03:07:43.000000000 +0900
+# +++ builtin.c	2006-02-26 02:07:52.000000000 +0900
+# @@ -2463,6 +2468,15 @@ sub_common(NODE *tree, long how_many, in
+#  	t->stptr = buf;
+#  	t->stlen = textlen;
+# 
+# +#ifdef MBS_SUPPORT
+# +    if (t->flags & WSTRCUR) {
+# +        if (t->wstptr != NULL)
+# +            free(t->wstptr);
+# +        t->wstptr = NULL;
+# +        t->wstlen = 0;
+# +        t->flags &= ~WSTRCUR;
+# +    }
+# +#endif
+#  	free_temp(s);
+#  	if (matches > 0 && lhs) {
+#  		if (priv) {
+# 
+# 
+# -- 
+# KIMURA Koichi
+# 
+# 
+# #####################################################################################
+# This Mail Was Scanned by 012.net AntiVirus Service1- Powered by TrendMicro Interscan
+# 
diff --git a/test/subi18n.ok b/test/subi18n.ok
new file mode 100644
index 00000000..54842cda
--- /dev/null
+++ b/test/subi18n.ok
@@ -0,0 +1,2 @@
+"directory" version="1.0"
+"1.0"
diff --git a/test/synerr2.awk b/test/synerr2.awk
new file mode 100644
index 00000000..9860f248
--- /dev/null
+++ b/test/synerr2.awk
@@ -0,0 +1,47 @@
+# From: =?ISO-8859-1?Q?J=FCrgen_Kahrs?= <Juergen.KahrsDELETETHIS@vr-web.de>
+# Newsgroups: gnu.utils.bug
+# Subject: Re: gawk-3.1.5: syntax error, core dump
+# Date: Fri, 23 Jun 2006 18:12:07 +0200
+# Lines: 12
+# Approved: bug-gnu-utils@gnu.org
+# Message-ID: <mailman.3258.1151079135.9609.bug-gnu-utils@gnu.org>
+# References: <mailman.3236.1151045898.9609.bug-gnu-utils@gnu.org>
+# Reply-To: Juergen.KahrsDELETETHIS@vr-web.de
+# NNTP-Posting-Host: lists.gnu.org
+# Mime-Version: 1.0
+# Content-Type: text/plain; charset=ISO-8859-1
+# Content-Transfer-Encoding: 7bit
+# X-Trace: news.Stanford.EDU 1151079136 27033 199.232.76.165 (23 Jun 2006 16:12:16 GMT)
+# X-Complaints-To: news@news.stanford.edu
+# To: gnu-utils-bug@moderators.isc.org
+# Envelope-to: bug-gnu-utils@gnu.org
+# X-Orig-X-Trace: individual.net
+# 	vYX9N7nUUtqHxPyspweN0gZ4Blkl17z/xU01EwbykxB178O8M=
+# User-Agent: Thunderbird 1.5 (X11/20060317)
+# In-Reply-To: <mailman.3236.1151045898.9609.bug-gnu-utils@gnu.org>
+# X-BeenThere: bug-gnu-utils@gnu.org
+# X-Mailman-Version: 2.1.5
+# Precedence: list
+# List-Id: Bug reports for the GNU utilities <bug-gnu-utils.gnu.org>
+# List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-gnu-utils>,
+# 	<mailto:bug-gnu-utils-request@gnu.org?subject=unsubscribe>
+# List-Archive: <http://lists.gnu.org/pipermail/bug-gnu-utils>
+# List-Post: <mailto:bug-gnu-utils@gnu.org>
+# List-Help: <mailto:bug-gnu-utils-request@gnu.org?subject=help>
+# List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-gnu-utils>,
+# 	<mailto:bug-gnu-utils-request@gnu.org?subject=subscribe>
+# Path: news.012.net.il!seanews2.seabone.net!newsfeed.albacom.net!news.mailgate.org!newsfeed.stueberl.de!newsfeed.news2me.com!headwall.stanford.edu!newsfeed.stanford.edu!shelby.stanford.edu!individual.net!not-for-mail
+# Xref: news.012.net.il gnu.utils.bug:813
+# 
+# Karel Zak wrote:
+# 
+# >  it seems that gawk has problem with "syntax error" reporting:
+# > 
+# >  ./gawk '/^include / { system(sprintf("cd /etc; cat %s", [$]2)); skip
+# >  = 1; } { if (!skip) print $0; skipQuit; }' < /etc/ld.so.conf 
+# 
+# This test case can be boiled down to
+# 
+#   gawk 'BEGIN {sprintf("%s", $)}'
+# 
+BEGIN { sprintf("%s", $) }
diff --git a/test/synerr2.ok b/test/synerr2.ok
new file mode 100644
index 00000000..cd30a843
--- /dev/null
+++ b/test/synerr2.ok
@@ -0,0 +1,3 @@
+gawk: synerr2.awk:47: BEGIN { sprintf("%s", $) }
+gawk: synerr2.awk:47:                        ^ syntax error
+EXIT CODE: 1
diff --git a/test/wideidx.awk b/test/wideidx.awk
new file mode 100644
index 00000000..9c8a64ce
--- /dev/null
+++ b/test/wideidx.awk
@@ -0,0 +1,7 @@
+{
+	a=$0
+	print index(a,"b")
+	getline
+	a = a $0
+	print index(a,"b")
+}
diff --git a/test/wideidx.in b/test/wideidx.in
new file mode 100644
index 00000000..3bd1f0e2
--- /dev/null
+++ b/test/wideidx.in
@@ -0,0 +1,2 @@
+foo
+bar
diff --git a/test/wideidx.ok b/test/wideidx.ok
new file mode 100644
index 00000000..4f1d7cd3
--- /dev/null
+++ b/test/wideidx.ok
@@ -0,0 +1,2 @@
+0
+4
diff --git a/test/wideidx2.awk b/test/wideidx2.awk
new file mode 100644
index 00000000..335c29de
--- /dev/null
+++ b/test/wideidx2.awk
@@ -0,0 +1,89 @@
+# Date: Thu, 27 Apr 2006 20:59:03 +0100
+# From: Lee Haywood <ljhaywood2@googlemail.com>
+# Subject: gawk multi-byte support bugs, assertion bug and fix.
+# To: bug-gawk@gnu.org
+# Message-id: <60962be00604271259na0d8fdayb9d0c69a853216e8@mail.gmail.com>
+# MIME-version: 1.0
+# Content-type: multipart/alternative;
+#  boundary="----=_Part_10136_920879.1146167943492"
+# Status: RO
+# 
+# ------=_Part_10136_920879.1146167943492
+# Content-Type: text/plain; charset=ISO-8859-1
+# Content-Transfer-Encoding: quoted-printable
+# Content-Disposition: inline
+# 
+# 
+# Firstly, I have been getting the following error from version 3.1.5.
+# 
+#     awk: node.c:515: unref: Assertion `(tmp->flags & 4096) !=3D 0' failed.
+# 
+# In mk_number() in node.c the MBS_SUPPORT code is inside the GAWKDEBUG
+# section - moving it outside explicitly clears the string values, which
+# prevents the assertion error from occurring.  The corrected version is
+# shown at the end of this message.
+# 
+# As an aside, I also noticed that n->wstptr is not cleared by
+# set_field() and set_record() in field.c when the flags are set to
+# exclude WSTRCUR.  However, I do not have a test case to show if
+# changing them makes any difference.
+# 
+# A second problem also occurs when gawk 3.1.5 is compiled with
+# multi-byte character support (MBS_SUPPORT).  The following code should
+# change the index of the substring "bc" from 2 to 3, but it gets
+# reported as 2 in both cases - which is obviously disastrous.
+# 
+#     awk 'BEGIN {
+#             Value =3D "abc"
+# 
+#             print "Before <" Value "> ",
+#                   index( Value, "bc" )
+# 
+#             sub( /bc/, "bbc", Value )
+# 
+#             print "After  <" Value ">",
+#                   index( Value, "bc" )
+#         }'
+# 
+# Compiling with MBS_SUPPORT undefined makes these problems go away.
+# 
+# /* mk_number --- allocate a node with defined number */
+# 
+# NODE *
+# mk_number(AWKNUM x, unsigned int flags)
+# {
+#         register NODE *r;
+# 
+#         getnode(r);
+#         r->type =3D Node_val;
+#         r->numbr =3D x;
+#         r->flags =3D flags;
+# #if defined MBS_SUPPORT
+#         r->wstptr =3D NULL;
+#         r->wstlen =3D 0;
+# #endif /* MBS_SUPPORT */
+# #ifdef GAWKDEBUG
+#         r->stref =3D 1;
+#         r->stptr =3D NULL;
+#         r->stlen =3D 0;
+# #if defined MBS_SUPPORT
+#         r->flags &=3D ~WSTRCUR;
+# #endif /* MBS_SUPPORT */
+# #endif /* GAWKDEBUG */
+#         return r;
+# }
+# 
+# Thanks.
+# 
+# --
+# Lee Haywood.
+
+BEGIN {
+	Value = "abc"
+
+	print "Before <" Value "> ", index( Value, "bc" )
+ 
+	sub( /bc/, "bbc", Value )
+
+	print "After  <" Value ">", index( Value, "bc" )
+}
diff --git a/test/wideidx2.ok b/test/wideidx2.ok
new file mode 100644
index 00000000..c0206ec6
--- /dev/null
+++ b/test/wideidx2.ok
@@ -0,0 +1,2 @@
+Before <abc>  2
+After  <abbc> 3
diff --git a/test/widesub.awk b/test/widesub.awk
new file mode 100644
index 00000000..768e715c
--- /dev/null
+++ b/test/widesub.awk
@@ -0,0 +1,12 @@
+BEGIN {
+	str = "type=\"directory\" version=\"1.0\""
+	#print "BEGIN:", str
+
+	while (str) {
+		sub(/^[^=]*/, "", str);
+		s = substr(str, 2)
+		print s
+		sub(/^="[^"]*"/, "", str)
+		sub(/^[ \t]*/, "", str)
+	}
+}
diff --git a/test/widesub.ok b/test/widesub.ok
new file mode 100644
index 00000000..54842cda
--- /dev/null
+++ b/test/widesub.ok
@@ -0,0 +1,2 @@
+"directory" version="1.0"
+"1.0"
diff --git a/test/widesub2.awk b/test/widesub2.awk
new file mode 100644
index 00000000..69383d34
--- /dev/null
+++ b/test/widesub2.awk
@@ -0,0 +1,9 @@
+BEGIN {
+	Value = "abc"
+
+	print "Before <" Value "> ", index( Value, "bc" )
+
+	sub( /bc/, "bbc", Value )
+
+	print "After  <" Value ">", index( Value, "bc" )
+}
diff --git a/test/widesub2.ok b/test/widesub2.ok
new file mode 100644
index 00000000..c0206ec6
--- /dev/null
+++ b/test/widesub2.ok
@@ -0,0 +1,2 @@
+Before <abc>  2
+After  <abbc> 3
diff --git a/test/widesub3.awk b/test/widesub3.awk
new file mode 100644
index 00000000..48c414a9
--- /dev/null
+++ b/test/widesub3.awk
@@ -0,0 +1,6 @@
+{
+   if (substr($1,1,1) == substr($0,1,1))
+      print "substr matches"
+   sub(/foo/,"bar")
+   print nr++
+}
diff --git a/test/widesub3.in b/test/widesub3.in
new file mode 100644
index 00000000..6357df99
--- /dev/null
+++ b/test/widesub3.in
@@ -0,0 +1,2 @@
+test
+foo
diff --git a/test/widesub3.ok b/test/widesub3.ok
new file mode 100644
index 00000000..7507261c
--- /dev/null
+++ b/test/widesub3.ok
@@ -0,0 +1,4 @@
+substr matches
+0
+substr matches
+1
diff --git a/test/widesub4.awk b/test/widesub4.awk
new file mode 100644
index 00000000..c917aacb
--- /dev/null
+++ b/test/widesub4.awk
@@ -0,0 +1,54 @@
+# Date: Sun, 28 May 2006 11:20:58 +0200
+# From: Frantisek Hanzlik <franta@hanzlici.cz>
+# Subject: sub() function do'nt alter string length in awk 3.1.5
+# To: bug-gawk@gnu.org
+# Message-id: <44796B7A.3050908@hanzlici.cz>
+# 
+# Hello,
+# I not know when it is my mistake or gawk bug - in simple example below
+# I delete some chars from string variable, and after this string is
+# modified, but its length is unchanged.
+# 
+# awk 'BEGIN{A="1234567890abcdef";
+#   for (i=1;i<6;i++){print length(A),"A=" A ".";sub("....","",A)}
+# }'
+# 16 A=1234567890abcdef.
+# 16 A=567890abcdef.
+# 16 A=90abcdef.
+# 16 A=cdef.
+# 16 A=.
+# 
+# When I use gensub() instead of sub(), result is as I expected:
+# 
+# awk 'BEGIN{A="1234567890abcdef";
+#   for (i=1;i<6;i++){print length(A),"A=" A ".";A=gensub("....","",1,A)}
+# }'
+# 16 A=1234567890abcdef.
+# 12 A=567890abcdef.
+# 8 A=90abcdef.
+# 4 A=cdef.
+# 0 A=.
+# 
+# OS/GAWK versions:
+# - GNU/Linux kernel 2.6.16-1.2122_FC5 #1 i686, Fedora Core 5 distro
+# - glibc-2.4-8
+# - GNU Awk 3.1.5
+# 
+# Yours sincerely
+# Frantisek Hanzlík
+# 
+# == Lucní 502        Linux/Unix, Novell, Internet   Tel: +420-373729699 ==
+# == 33209 Stenovice   e-mail:franta@hanzlici.cz     Fax: +420-373729699 ==
+# == Czech Republic        http://hanzlici.cz/       GSM: +420-604117319 ==
+# 
+# 
+# 
+# #####################################################################################
+# This Mail Was Scanned by 012.net AntiVirus Service3- Powered by TrendMicro Interscan
+# 
+BEGIN{A="1234567890abcdef";
+   for (i=1;i<6;i++){print length(A),"A=" A ".";sub("....","",A)}
+}
+BEGIN{A="1234567890abcdef";
+   for (i=1;i<6;i++){print length(A),"A=" A ".";A=gensub("....","",1,A)}
+}
diff --git a/test/widesub4.ok b/test/widesub4.ok
new file mode 100644
index 00000000..d582543b
--- /dev/null
+++ b/test/widesub4.ok
@@ -0,0 +1,10 @@
+16 A=1234567890abcdef.
+12 A=567890abcdef.
+8 A=90abcdef.
+4 A=cdef.
+0 A=.
+16 A=1234567890abcdef.
+12 A=567890abcdef.
+8 A=90abcdef.
+4 A=cdef.
+0 A=.
diff --git a/test/zero2.awk b/test/zero2.awk
new file mode 100644
index 00000000..8ecfb2f9
--- /dev/null
+++ b/test/zero2.awk
@@ -0,0 +1,5 @@
+BEGIN {
+	printf "%d\n", -.4
+	printf "%d\n", -0.0
+	printf "%d\n", -.9
+}
diff --git a/test/zero2.ok b/test/zero2.ok
new file mode 100644
index 00000000..bb0b1cf6
--- /dev/null
+++ b/test/zero2.ok
@@ -0,0 +1,3 @@
+0
+0
+0
diff --git a/unsupported/atari/ChangeLog b/unsupported/atari/ChangeLog
index ab54b6e9..9fe50fd3 100644
--- a/unsupported/atari/ChangeLog
+++ b/unsupported/atari/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/unsupported/atari/Makefile.awklib b/unsupported/atari/Makefile.awklib
index baa06f98..e69706ee 100644
--- a/unsupported/atari/Makefile.awklib
+++ b/unsupported/atari/Makefile.awklib
@@ -5,14 +5,14 @@
 # This Makefile actually will work for awklib even when NOT
 # compiling with Atari Makefile!!!
 #
-# Copyright (C) 1995, 96 the Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996 the Free Software Foundation, Inc.
 # 
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
 # 
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GAWK is distributed in the hope that it will be useful,
diff --git a/unsupported/atari/Makefile.st b/unsupported/atari/Makefile.st
index c322de87..fe618c6c 100644
--- a/unsupported/atari/Makefile.st
+++ b/unsupported/atari/Makefile.st
@@ -16,7 +16,7 @@
 # 
 # GAWK is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GAWK is distributed in the hope that it will be useful,
diff --git a/unsupported/atari/config.h b/unsupported/atari/config.h
index 9acb6a4c..840bcf66 100644
--- a/unsupported/atari/config.h
+++ b/unsupported/atari/config.h
@@ -7,14 +7,14 @@
  */
 
 /* 
- * Copyright (C) 1995, 96 the Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1996 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/unsupported/atari/gawkmisc.atr b/unsupported/atari/gawkmisc.atr
index a10ccbcf..35dcff80 100644
--- a/unsupported/atari/gawkmisc.atr
+++ b/unsupported/atari/gawkmisc.atr
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/unsupported/atari/redirect.h b/unsupported/atari/redirect.h
index c84cad0c..0a95c06d 100644
--- a/unsupported/atari/redirect.h
+++ b/unsupported/atari/redirect.h
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/unsupported/tandem/ChangeLog b/unsupported/tandem/ChangeLog
index 4cda1d1a..7585feb6 100644
--- a/unsupported/tandem/ChangeLog
+++ b/unsupported/tandem/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/unsupported/tandem/config.h b/unsupported/tandem/config.h
index a8458577..27ced919 100644
--- a/unsupported/tandem/config.h
+++ b/unsupported/tandem/config.h
@@ -12,7 +12,7 @@
  *
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GAWK is distributed in the hope that it will be useful,
diff --git a/unsupported/tandem/tmisc.c b/unsupported/tandem/tmisc.c
index 10663258..9cc29a46 100644
--- a/unsupported/tandem/tmisc.c
+++ b/unsupported/tandem/tmisc.c
@@ -35,7 +35,7 @@ int fd;
  *
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GAWK is distributed in the hope that it will be useful,
diff --git a/version.c b/version.c
index cf0f7da4..d2d2667a 100644
--- a/version.c
+++ b/version.c
@@ -1,6 +1,6 @@
 #include "config.h"
 
-const char *version_string = "@(#)GNU Awk 3.1.5";
+const char *version_string = "@(#)GNU Awk 3.1.6";
 
 /* 1.02		fixed /= += *= etc to return the new Left Hand Side instead
 		of the Right Hand Side */
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 9a477d7f..13422217 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,50 @@
+Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.6: Release tar file made.
+
+Wed May 16 19:54:00 2007        Pat Rankin      <rankin@pactechdata.com>
+
+	* vms-conf.h: re-sync with configh.in.
+
+Sun Apr 29 18:09:17 2007        Pat Rankin      <rankin@pactechdata.com>
+
+	* redirect.h: declare snprintf() if CRTL_VER_V732 is defined;
+	redefining __CRTL_VER in config.h causes <stdio.h> to suppress it.
+
+	* vmstest.com (fnarray): exit code has changed to 2.
+	(pid): target values now passed by command line rather than file.
+
+Fri Apr 20 16:48:30 2007        Pat Rankin      <rankin@pactechdata.com>
+
+	* vms-conf.h: #define HAVE_SNPRINTF for V7.3-2 and later CRTL.
+	* redirect.h: #define snprintf to gawk_snprintf if we're using
+	  missing_d/snprintf.c; avoids diagnostic about its declaration.
+
+Thu Apr 12 18:59:33 2007        Pat Rankin      <rankin@pactechdata.com>
+
+	* vms-conf.h: Leave HAVE_MKSTEMP undefined; we want tmpfile().
+
+Thu Mar 29 19:30:20 2007        Pat Rankin      <rankin@pactechdata.com>
+
+	* vms-conf.h: reconcile with configh.in.
+
+	* descrip.mms: compile floatcomp.c; add pgawk target and build
+	pgawk.exe for `make all'.
+	* vmsbuild.com: compile floatcomp.c; always build pgawk.exe in
+	addition to gawk.exe.
+
+Wed Jul 27 21:31:14 2005        Pat Rankin      <rankin@pactechdata.com>
+
+	* vmstest.com: Format test group feedback differently (append "...")
+	  to distinguish it from individual test feedback.
+	(manyfiles): Determine the number of files to use dynamically
+	  instead of using hardcoded 300 in case user's open file quota
+	  is generous enough to support more than that.
+	(longsub): Add error trap so that failure when gawk is built with
+	  VAXCRTL doesn't cause testing to terminate.
+	(vms_io1): Invoke with normal Unix-style command line syntax.
+	(vms_cmd): New test; split off DCL-style command line from vms_io1.
+
 Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* Release 3.1.5: Release tar file made.
diff --git a/vms/descrip.mms b/vms/descrip.mms
index 975b0fec..994ee46b 100644
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -12,6 +12,10 @@
 # gawk.exe :
 #	This is the default target.  DEC C has become the default compiler.
 #
+# pgawk.exe :
+#	An alternate version which generates some profiling feedback for
+#	the awk programs it executes.  Included with `make all'.
+#
 # awkgram.c :
 #	If you don't have bison but do have VMS POSIX or DEC/Shell,
 #	change the PARSER and PASERINIT macros to use yacc.  If you don't
@@ -88,10 +92,12 @@ ECHO = write sys$output
 NOOP = continue
 
 # object files
+GAWKOBJ =  eval.obj,profile.obj
+PGAWKOBJ =  eval_p.obj,profile_p.obj
 AWKOBJ1 =  array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,\
-	field.obj,gawkmisc.obj,getopt.obj,getopt1.obj,io.obj,main.obj,\
-	msg.obj,node.obj,random.obj,re.obj
-AWKOBJ2 = regex.obj,replace.obj,version.obj,eval.obj,profile.obj
+	field.obj,floatcomp.obj,gawkmisc.obj,getopt.obj,getopt1.obj,io.obj
+AWKOBJ2 = main.obj,msg.obj,node.obj,random.obj,re.obj,\
+	regex.obj,replace.obj,version.obj
 AWKOBJS = $(AWKOBJ1),$(AWKOBJ2)
 
 # VMSOBJS
@@ -101,11 +107,11 @@ VMSCODE = vms_misc.obj,vms_popen.obj,vms_fwrite.obj,vms_args.obj,\
 VMSCMD	= gawk_cmd.obj			# built from .cld file
 VMSOBJS = $(VMSCODE),$(VMSCMD)
 
-# source and documentation files
-AWKSRC = array.c,builtin.c,ext.c,eval.c,dfa.c,field.c,gawkmisc.c,\
-	getopt.c,getopt1.c,io.c,main.c,msg.c,node.c,random.c,re.c,\
-	random.c,regcomp.c,regex.c,regex_internal.c,regexec.c,\
-	replace.c,version.c,eval.c,profile.c
+# primary source files
+AWKSRC = array.c,builtin.c,dfa.c,eval.c,eval_p.c,ext.c,field.c,\
+	floatcomp.c,gawkmisc.c,getopt.c,getopt1.c,io.c,main.c,\
+	msg.c,node.c,profile.c,profile_p.c,random.c,re.c,regcomp.c,\
+	regex.c,regex_internal.c,regexec.c,replace.c,version.c
 
 ALLSRC = $(AWKSRC),awkgram.y,awk.h,custom.h,dfa.h,getopt.h,\
 	gettext.h,mbsupport.h,protos.h,random.h
@@ -125,20 +131,41 @@ REL=3.1
 PATCHLVL=5
 
 # generic target
-all : gawk
+all : gawk,pgawk
 	$(NOOP)
 
 # dummy target to allow building "gawk" in addition to explicit "gawk.exe"
 gawk : gawk.exe
 	$(ECHO) " GAWK "
+pgawk : pgawk.exe
+	$(ECHO) " PGAWK "
 
 # rules to build gawk
-gawk.exe : $(AWKOBJS) $(VMSOBJS) gawk.opt
+gawk.exe : $(GAWKOBJ) $(AWKOBJS) $(VMSOBJS) gawk.opt
 	$(LINK) $(LINKFLAGS) gawk.opt/options
 
+# rules to build pgawk
+pgawk.exe : $(PGAWKOBJ) $(AWKOBJS) $(VMSOBJS) pgawk.opt
+	$(LINK) $(LINKFLAGS) pgawk.opt/options
+
 gawk.opt : $(MAKEFILE)			# create linker options file
 	open/write opt gawk.opt		! ~ 'cat <<close >gawk.opt'
 	write opt "! GAWK -- GNU awk"
+      @ write opt "$(GAWKOBJ)"
+      @ write opt "$(AWKOBJ1)"
+      @ write opt "$(AWKOBJ2)"
+      @ write opt "$(VMSOBJS)"
+      @ write opt "psect_attr=environ,noshr	!extern [noshare] char **"
+      @ write opt "stack=48	!preallocate more pages (default is 20)"
+      @ write opt "iosegment=128	!ditto (default is 32)"
+	write opt "$(LIBS)"
+	write opt "identification=""V$(REL).$(PATCHLVL)"""
+	close opt
+
+pgawk.opt : $(MAKEFILE)			# create linker options file
+	open/write opt pgawk.opt
+	write opt "! PGAWK -- GNU awk w/ run-time profiling"
+      @ write opt "$(PGAWKOBJ)"
       @ write opt "$(AWKOBJ1)"
       @ write opt "$(AWKOBJ2)"
       @ write opt "$(VMSOBJS)"
@@ -161,6 +188,8 @@ gawkmisc.obj	: gawkmisc.c $(VMSDIR)gawkmisc.vms
 
 $(AWKOBJS)	: awk.h gettext.h mbsupport.h regex.h dfa.h \
 		  config.h $(VMSDIR)redirect.h
+$(GAWKOBJ)	: awk.h config.h $(VMSDIR)redirect.h
+$(PGAWKOBJ)	: awk.h config.h $(VMSDIR)redirect.h
 random.obj	: random.h
 builtin.obj	: random.h
 awkgram.obj	: awkgram.c awk.h
@@ -194,10 +223,12 @@ tidy :
       - if f$search("[.*]*.*;-1").nes."" then  purge [.*]
 
 clean :
-      - delete *.obj;*,gawk.opt;*
+      - delete *.obj;*,gawk.opt;*,pgawk.opt;*
 
 spotless : clean tidy
+      - if f$search("config.h").nes."" then  rename config.h config.h-old/New
       - if f$search("gawk.exe").nes."" then  delete gawk.exe;*
+      - if f$search("pgawk.exe").nes."" then  delete pgawk.exe;*
       - if f$search("gawk.dvi").nes."" then  delete gawk.dvi;*
       - if f$search("[.doc]texindex.exe").nes."" then  delete [.doc]texindex.exe;*
 
diff --git a/vms/gawkmisc.vms b/vms/gawkmisc.vms
index 28e06544..df5ded15 100644
--- a/vms/gawkmisc.vms
+++ b/vms/gawkmisc.vms
@@ -10,7 +10,7 @@
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
diff --git a/vms/redirect.h b/vms/redirect.h
index a0de1729..943af981 100644
--- a/vms/redirect.h
+++ b/vms/redirect.h
@@ -3,14 +3,15 @@
  */
 
 /* 
- * Copyright (C) 1986, 88, 89, 91-93, 1996, 1997 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 88, 89, 91-93, 1996, 1997, 2007
+ * the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -82,6 +83,15 @@ extern int   gettimeofday(struct timeval *,void *);
 #define open		vms_open
 #define popen		vms_popen
 #define pclose		vms_pclose
+#ifndef HAVE_SNPRINTF
+#define snprintf gawk_snprintf	/* avoid %CC-I-INTRINSICDECL diagnostic */
+#else
+#ifdef CRTL_VER_V732
+/* when overriding the version of the C library that compiler thinks is
+   in use, we need to duplicate something being suppressed in <stdio.h> */
+int snprintf(char *,size_t,const char *,...);
+#endif
+#endif
 #define strerror	vms_strerror
 #define strdup		vms_strdup
 #define unlink		vms_unlink
diff --git a/vms/vms-conf.h b/vms/vms-conf.h
index 5bfa3f88..91de82f7 100644
--- a/vms/vms-conf.h
+++ b/vms/vms-conf.h
@@ -3,18 +3,19 @@
 /*
  * config.h -- configuration definitions for gawk.
  *
- * For VMS (assumes V4.6 or later; tested on V5.5-2 and V7.1)
+ * For VMS (assumes V4.6 or later; tested on V7.3-1, V8.3.
  */
 
 /* 
- * Copyright (C) 1991-1992, 1995-1996, 1999, 2001, 2002, 2003, 2005 the Free Software Foundation, Inc.
+ * Copyright (C) 1991-1992, 1995-1996, 1999, 2001, 2002, 2003, 2005
+ * the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
  * 
  * GAWK is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -30,17 +31,19 @@
 /* switch statements are enabled in awk programs */
 #undef ALLOW_SWITCH
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-#if 0
+#if 0		/* no longer used */
 /* Define to 1 if using alloca.c.  */
 #define C_ALLOCA 1
 #else
 #define NO_ALLOCA	/* vms/vms_fwrite.c needs this */
-#endif
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#define STACK_DIRECTION (-1)
+#endif /*0*/
 
 /* dynamic loading is possible */
 #undef DYNAMIC
@@ -59,42 +62,27 @@
 /* Define to 1 if you have the `alarm' function. */
 #define HAVE_ALARM 1
 
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
 
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
+/* Define to 1 if you have the `btowc' function. */
+#undef HAVE_BTOWC
 
-/* Define to 1 if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
 
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
 
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_FEOF_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FGETS_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_GETC_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNPRINTF 0
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNWPRINTF 0
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+#undef HAVE_DECL_TZNAME
 
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
@@ -105,20 +93,8 @@
 /* Define to 1 if you have the `fmod' function. */
 #define HAVE_FMOD 1
 
-/* Define to 1 if you have the `fwprintf' function. */
-#undef HAVE_FWPRINTF
-
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `getegid' function. */
-#undef HAVE_GETEGID
-
-/* Define to 1 if you have the `geteuid' function. */
-#define HAVE_GETEUID 1
-
-/* Define to 1 if you have the `getgid' function. */
-#define HAVE_GETGID 1
+/* have getaddrinfo */
+#undef HAVE_GETADDRINFO
 
 /* Define to 1 if you have the `getgrent' function. */
 #undef HAVE_GETGRENT
@@ -126,15 +102,9 @@
 /* Define to 1 if you have the `getgroups' function. */
 #undef HAVE_GETGROUPS
 
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define to 1 if you have the `getuid' function. */
-#define HAVE_GETUID 1
-
 /* Define to 1 if you have the `grantpt' function. */
 #undef HAVE_GRANTPT
 
@@ -144,13 +114,16 @@
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
 #undef HAVE_INTMAX_T
 
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
+/* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
 /* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
    declares uintmax_t. */
 #undef HAVE_INTTYPES_H_WITH_UINTMAX
 
+/* Define to 1 if you have the `isascii' function. */
+#define HAVE_ISASCII 1
+
 /* Define to 1 if you have the `iswctype' function. */
 #undef HAVE_ISWCTYPE
 
@@ -166,9 +139,6 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
@@ -181,14 +151,11 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
-/* Define if you have the 'long double' type. */
-#undef HAVE_LONG_DOUBLE
-
 /* Define if you have the 'long long' type. */
 #undef HAVE_LONG_LONG
 
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
+/* Define to 1 if the system has the type `long long int'. */
+#undef HAVE_LONG_LONG_INT
 
 /* Define to 1 if you have the `mbrlen' function. */
 #undef HAVE_MBRLEN
@@ -205,26 +172,26 @@
 /* Define to 1 if you have the `memcpy' function. */
 #define HAVE_MEMCPY 1
 
+/* Define to 1 if you have the `memcpy_ulong' function. */
+#undef HAVE_MEMCPY_ULONG
+
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
-
 /* Define to 1 if you have the `memset' function. */
 #define HAVE_MEMSET 1
 
-/* we have the mktime function */
-#define HAVE_MKTIME 1
+/* Define to 1 if you have the `memset_ulong' function. */
+#undef HAVE_MEMSET_ULONG
 
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
 
-/* Define to 1 if you have the `munmap' function. */
-#undef HAVE_MUNMAP
+/* we have the mktime function */
+#define HAVE_MKTIME 1
 
 /* Define to 1 if you have the <netdb.h> header file. */
 #undef HAVE_NETDB_H
@@ -232,21 +199,9 @@
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
-/* Define to 1 if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
 /* we have portals on /p on this system */
 #undef HAVE_PORTALS
 
-/* Define if your printf() function supports format strings with positions. */
-#undef HAVE_POSIX_PRINTF
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
 /* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
@@ -256,6 +211,9 @@
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
+/* newer systems define this type here */
+#undef HAVE_SOCKADDR_STORAGE
+
 /* we have sockets on this system */
 #undef HAVE_SOCKETS
 
@@ -275,18 +233,9 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* Define to 1 if you have the `stpcpy' function. */
-#undef HAVE_STPCPY
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the `strchr' function. */
 #define HAVE_STRCHR 1
 
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
@@ -346,12 +295,19 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
+/* Define to 1 if you have the `tmpfile' function. */
+#define HAVE_TMPFILE 1
+/* Force snprintf.c to use tmpfile() instead of mkstemp(). */
+#ifdef HAVE_MKSTEMP
+#undef HAVE_MKSTEMP
+#endif
+
 /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
 #undef HAVE_TM_ZONE
@@ -362,9 +318,6 @@
 /* Define to 1 if you have the `towupper' function. */
 #undef HAVE_TOWUPPER
 
-/* Define to 1 if you have the `tsearch' function. */
-#undef HAVE_TSEARCH
-
 /* Define to 1 if you don't have `tm_zone' but do have the external array
    `tzname'. */
 #define HAVE_TZNAME 1		/* (faked in vms/vms_misc.c) */
@@ -382,27 +335,24 @@
 #undef HAVE_UNISTD_H
 #endif
 
-/* Define if you have the unsigned long long type. */
+/* Define if you have the 'unsigned long long' type. */
 #undef HAVE_UNSIGNED_LONG_LONG
 
+/* Define to 1 if the system has the type `unsigned long long int'. */
+#undef HAVE_UNSIGNED_LONG_LONG_INT
+
 /* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1
 
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
-/* Define if you have the 'wchar_t' type. */
-#undef HAVE_WCHAR_T
-
 /* Define to 1 if you have the `wcrtomb' function. */
 #undef HAVE_WCRTOMB
 
 /* Define to 1 if you have the `wcscoll' function. */
 #undef HAVE_WCSCOLL
 
-/* Define to 1 if you have the `wcslen' function. */
-#undef HAVE_WCSLEN
-
 /* Define to 1 if you have the `wctype' function. */
 #undef HAVE_WCTYPE
 
@@ -415,23 +365,8 @@
 /* systems should define this type here */
 #undef HAVE_WINT_T
 
-/* Define to 1 if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define to 1 if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-#undef HAVE___FSETLOCKING
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#define INTDIV0_RAISES_SIGFPE 1
+/* disable fatal errors on directories */
+#undef NO_DIRECTORY_FATAL
 
 /* disable lint checks */
 #undef NO_LINT
@@ -446,21 +381,18 @@
 #define PACKAGE_NAME "GNU Awk"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Awk 3.1.4c"
+#define PACKAGE_STRING "GNU Awk 3.1.6"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gawk"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.1.4c"
+#define PACKAGE_VERSION "3.1.6"
 
 /* Define to 1 if *printf supports %F format */
 #undef PRINTF_HAS_F_FORMAT
 
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-#undef PRI_MACROS_BROKEN
-
-/* Define if compiler has function prototypes */
+/* Define to 1 if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
 
 /* Define as the return type of signal handlers (`int' or `void'). */
@@ -472,27 +404,12 @@
 /* The size of a `unsigned long', as computed by sizeof. */
 #define SIZEOF_UNSIGNED_LONG 4
 
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#define SIZE_MAX 0xffffffffUL
-
 /* return type of sprintf */
 #define SPRINTF_RET int
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
-#define STACK_DIRECTION (-1)
-
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* strtod doesn't have C89 semantics */
-#define STRTOD_NOT_C89 1
-
 /* some systems define this type here */
 #undef TIME_T_IN_SYS_TYPES_H
 
@@ -506,7 +423,7 @@
 #define USE_INCLUDED_STRFTIME 1
 
 /* Version number of package */
-#define VERSION "3.1.4"
+#define VERSION "3.1.6"
 
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
@@ -518,6 +435,11 @@
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
@@ -536,6 +458,17 @@
 # undef __CHAR_UNSIGNED__
 #endif
 
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+
 /* Define like PROTOTYPES; this can be used by system headers. */
 #define __PROTOTYPES 1
 
@@ -554,22 +487,22 @@
 /* Define to widest signed type if <inttypes.h> doesn't define. */
 #define intmax_t long int
 
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef pid_t
 
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-#undef ptrdiff_t
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-#undef signed
+/* Define to equivalent of C99 restrict keyword, or to nothing if this is not
+   supported. Do not define if restrict is supported directly. */
+#define restrict
+#if defined(__DECC) && (__DECC_VER >= 60400000)
+#undef restrict
+#endif
 
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 
+/* type to use in place of socklen_t if not defined */
+#undef socklen_t
+
 /* Define to `int' if <sys/types.h> does not define. */
 #define ssize_t int
 
@@ -581,7 +514,7 @@
 #define uintmax_t unsigned long
 
 #if 0
-#include <custom.h>	/* overrides for stuff autoconf can't deal with */
+#include "custom.h"	/* overrides for stuff autoconf can't deal with */
 #else
 
 /* Whether `time_t' is an unsigned type. */
@@ -662,6 +595,10 @@
 # define __VMS_VER 60100000
 #endif
 #if __CRTL_VER >= 60200000
+# if __CRTL_VER >= 70320000
+#  define CRTL_VER_V732
+#  define HAVE_SNPRINTF 1
+# endif
 # if __CRTL_VER >= 70301000
 #  define CRTL_VER_V731
 # endif
@@ -692,6 +629,7 @@
 #ifdef __GNUC__
 /* #define const */
 /* #undef STDC_HEADERS */
+/* #undef HAVE_STDDEF_H */
 #ifndef STDC_HEADERS
 #define alloca __builtin_alloca
 #define environ $$PsectAttributes_NOSHR$$environ	/* awful GAS kludge */
@@ -703,6 +641,6 @@
 #include "vms/redirect.h"
 #undef  IN_CONFIG_H
 
-#endif	/*<custom.h>*/
+#endif	/*"custom.h"*/
 
 #endif	/*CONFIG_H*/
diff --git a/vms/vmsbuild.com b/vms/vmsbuild.com
index 107523bd..ea33290a 100644
--- a/vms/vmsbuild.com
+++ b/vms/vmsbuild.com
@@ -7,9 +7,10 @@ $!						gawk 3.0   revised, Dec'95
 $!						gawk 3.0.1 revised, Nov'96
 $!						gawk 3.1.0 revised, Mar'01
 $!						gawk 3.1.1 revised, Apr'02
+$!						gawk 3.1.6 revised, Mar'07
 $!
 $ REL = "3.1"	!release version number
-$ PATCHLVL = "5"
+$ PATCHLVL = "6"
 $!
 $!
 $ CCFLAGS = "/noList"	! "/noOpt/Debug"
@@ -65,6 +66,7 @@ $ cc builtin.c
 $ cc dfa.c
 $ cc ext.c
 $ cc field.c
+$ cc floatcomp.c
 $ cc gawkmisc.c
 $ cc getopt.c
 $ cc getopt1.c
@@ -78,7 +80,9 @@ $ cc regex.c
 $ cc replace.c
 $ cc version.c
 $ cc eval.c
+$ cc eval_p.c
 $ cc profile.c
+$ cc profile_p.c
 $ cc [.vms]vms_misc.c
 $ cc [.vms]vms_popen.c
 $ cc [.vms]vms_fwrite.c
@@ -91,9 +95,9 @@ $!
 $ close/noLog Fopt
 $ create gawk.opt
 ! GAWK -- GNU awk
-array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,field.obj,gawkmisc.obj
-getopt.obj,getopt1.obj,io.obj,main.obj,msg.obj,node.obj,random.obj
-re.obj,regex.obj,replace.obj,version.obj,eval.obj,profile.obj
+array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,field.obj,floatcomp.obj
+gawkmisc.obj,getopt.obj,getopt1.obj,io.obj,main.obj,msg.obj,node.obj
+random.obj,re.obj,regex.obj,replace.obj,version.obj,eval.obj,profile.obj
 []vms_misc.obj,vms_popen.obj,vms_fwrite.obj,vms_args.obj
 []vms_gawk.obj,vms_cli.obj,gawk_cmd.obj
 psect_attr=environ,noshr	!extern [noshare] char **
@@ -104,7 +108,23 @@ $ write Fopt libs
 $ write Fopt "identification=""V''REL'.''PATCHLVL'"""
 $ close Fopt
 $!
+$ create pgawk.opt
+! PGAWK -- GNU awk w/ run-time profiling
+array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,field.obj,floatcomp.obj
+gawkmisc.obj,getopt.obj,getopt1.obj,io.obj,main.obj,msg.obj,node.obj
+random.obj,re.obj,regex.obj,replace.obj,version.obj,eval_p.obj,profile_p.obj
+[]vms_misc.obj,vms_popen.obj,vms_fwrite.obj,vms_args.obj
+[]vms_gawk.obj,vms_cli.obj,gawk_cmd.obj
+psect_attr=environ,noshr	!extern [noshare] char **
+stack=48	!preallocate more pages (default is 20)
+iosegment=128	!ditto (default is 32)
+$ open/append Fopt pgawk.opt
+$ write Fopt libs
+$ write Fopt "identification=""V''REL'.''PATCHLVL'"""
+$ close Fopt
+$!
 $ v = f$verify(1)
 $ link/exe=gawk.exe gawk.opt/options
+$ link/exe=pgawk.exe pgawk.opt/options
 $! 'f$verify(v)'
 $ exit
diff --git a/vms/vmstest.com b/vms/vmstest.com
index 130411c6..a5cbc03d 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -24,7 +24,7 @@ $	exit
 $
 $all:
 $bigtest:	bigtest_list = "basic unix_tests gawk_ext vms_tests"
-$		echo "bigtest"
+$		echo "bigtest..."
 $bigtest_loop:	bigtest_test = f$element(0," ",bigtest_list)
 $		bigtest_list = bigtest_list - bigtest_test - " "
 $		if bigtest_test.nes." " then  gosub 'bigtest_test'
@@ -62,7 +62,7 @@ $		basic_lst4 = "manglprm nested nfneg noloop1 noloop2" -
 		  + " rstest4 rstest5 scalar sortempty splitarr strcat1" -
 		  + " subsepnm synerr1 uninit2 uninit3 uninit4" -
 		  + " uninitialized unterm wjposer1 zeroe0"
-$		echo "basic"
+$		echo "basic..."
 $basic_loop1:	basic_test = f$element(0," ",basic_lst1)
 $		basic_lst1 = basic_lst1 - basic_test - " "
 $		if basic_test.nes." " then  gosub 'basic_test'
@@ -83,7 +83,7 @@ $		return
 $
 $unix_tests:	unix_tst_list = "fflush getlnhd pid pipeio1" -
 		  + " pipeio2 poundbang strftlng"
-$		echo "unix_tests"
+$		echo "unix_tests..."
 $unix_tst_loop: unix_tst_test = f$element(0," ",unix_tst_list)
 $		unix_tst_list = unix_tst_list - unix_tst_test - " "
 $		if unix_tst_test.nes." " then  gosub 'unix_tst_test'
@@ -94,15 +94,15 @@ $gawk_ext:	gawk_ext_list = "argtest badargs clos1way fieldwdth" -
 		  + " fsfwfs gensub gnuops2 gnureops igncdym igncfs" -
 		  + " ignrcase lint manyfiles nondec posix procinfs" -
 		  + " regx8bit reint shadow sort1 strftime"
-$		echo "gawk_ext (gawk.extensions)"
+$		echo "gawk_ext... (gawk.extensions)"
 $gawk_ext_loop: gawk_ext_test = f$element(0," ",gawk_ext_list)
 $		gawk_ext_list = gawk_ext_list - gawk_ext_test - " "
 $		if gawk_ext_test.nes." " then  gosub 'gawk_ext_test'
 $		if gawk_ext_list.nes.""  then  goto   gawk_ext_loop
 $		return
 $
-$vms_tests:	vms_tst_list = "vms_io1"
-$		echo "vms_tests"
+$vms_tests:	vms_tst_list = "vms_io1 vms_cmd"
+$		echo "vms_tests..."
 $vms_tst_loop: vms_tst_test = f$element(0," ",vms_tst_list)
 $		vms_tst_list = vms_tst_list - vms_tst_test - " "
 $		if vms_tst_test.nes." " then  gosub 'vms_tst_test'
@@ -110,7 +110,7 @@ $		if vms_tst_list.nes.""  then  goto   vms_tst_loop
 $		return
 $
 $extra:		extra_list = "regtest inftest inet"
-$		echo "extra"
+$		echo "extra..."
 $extra_loop: extra_test = f$element(0," ",extra_list)
 $		extra_list = extra_list - extra_test - " "
 $		if extra_test.nes." " then  gosub 'extra_test'
@@ -118,7 +118,7 @@ $		if extra_list.nes.""  then  goto   extra_loop
 $		return
 $
 $inet:		inet_list = "inetechu inetecht inetdayu inetdayt"
-$		echo "inet"
+$		echo "inet..."
 $		type sys$input:
  The inet tests only work if gawk has been built with tcp/ip socket
  support and your system supports the services "discard" at port 9
@@ -224,17 +224,29 @@ $	if $status then  rm tmp.;
 $	return
 $
 $manyfiles:	echo "manyfiles"
+$!! this used to use a hard-coded value of 300 simultaneously open
+$!! files, but if our open file quota is generous enough then that
+$!! wouldn't exercise the ability to handle more than the maximum
+$!! number allowed at once
+$	f_cnt = 300
+$	chnlc = f$getsyi("CHANNELCNT")
+$	fillm = f$getjpi("","FILLM")
+$	if fillm.ge.chnlc then  fillm = chnlc - 1
+$	if fillm.ge.f_cnt then  f_cnt = fillm + 10
 $	if f$search("[.junk]*.*").nes."" then  rm [.junk]*.*;*
 $	if f$parse("[.junk]").eqs."" then  create/Dir/Prot=(O:rwed) [.junk]
-$	gawk "BEGIN { for (i = 1; i <= 300; i++) print i, i}" >tmp.
-$	echo "This may take quite a while..."
-$	echo ""
+$	gawk -v "F_CNT=''f_cnt'" "BEGIN {for (i = 1; i <= F_CNT; i++) print i, i}" >tmp.
+$	echo "(processing ''f_cnt' files; this may take quite a while)"
 $	gawk -f manyfiles.awk tmp. tmp.
 $	define/User sys$error _NL:
 $	define/User sys$output tmp.too
 $	search/Match=Nor/Output=_NL:/Log [.junk]*.* ""
 $!/Log output: "%SEARCH-S-NOMATCH, <filename> - <#> records" plus 1 line summary
-$	gawk "$4!=2{++count}; END{if(NR!=301||count!=1){print ""Failed!""}}" tmp.too
+$	gawk -v "F_CNT=''f_cnt'" -f - tmp.too
+$deck	!some input begins with "$"
+$4 != 2 {++count}
+END {if (NR != F_CNT+1 || count != 1) {print "\nFailed!"}}
+$eod
 $	rm tmp.;,tmp.too;,[.junk]*.*;*,[]junk.dir;
 $	return
 $
@@ -603,7 +615,7 @@ $fnarray:	echo "fnarray"
 $	set noOn
 $	AWKPATH_srcdir
 $	gawk -f fnarray.awk >tmp. 2>&1
-$	if .not.$status then call exit_code 1
+$	if .not.$status then call exit_code 2
 $	set On
 $	cmp fnarray.ok tmp.
 $	if $status then  rm tmp.;
@@ -672,14 +684,9 @@ $	if $status then  rm tmp.;
 $	return
 $
 $pid:		echo "pid"
-$	if f$search("pid.ok").eqs."" then  create pid.ok
-$	if f$trnlnm("FTMP").nes."" then  close/noLog ftmp
-$	open/Write ftmp _pid.in
-$	write ftmp f$integer("%x" + f$getjpi("","PID"))
-$	write ftmp f$integer("%x" + f$getjpi("","OWNER"))
-$	close ftmp
-$	gawk -f pid.awk _pid.in >tmp. >& _NL:
-$	rm _pid.in;
+$	pid = f$integer("%x" + f$getjpi("","PID"))
+$	ppid = f$integer("%x" + f$getjpi("","OWNER"))
+$	gawk -v "ok_pid=''pid'" -v "ok_ppid=''ppid'" -f pid.awk >tmp. >& _NL:
 $	cmp pid.ok tmp.
 $	if $status then  rm tmp.;
 $	return
@@ -1217,6 +1224,7 @@ $	if $status then  rm tmp.;
 $	return
 $
 $longsub:	echo "longsub"
+$	set noOn
 $	gawk -f longsub.awk longsub.in >tmp.
 $!! the records here are too long for DIFF to handle
 $!! so assume success as long as gawk doesn't crash
@@ -1224,6 +1232,7 @@ $!!	call fixup_LRL longsub.ok
 $!!	call fixup_LRL tmp. "purge"
 $!!	cmp longsub.ok tmp.
 $	if $status then  rm tmp.;
+$	set On
 $	return
 $
 $arrayprm2:	echo "arrayprm2"
@@ -1656,13 +1665,23 @@ $	then create vms_io1.ok
 Hello
 $	endif
 $ !	define/User dbg$input sys$command:
-$	gawk /Input=sys$input _NL: /Output=tmp.
+$	gawk -f - >tmp.
 # prior to 3.0.4, gawk crashed doing any redirection after closing stdin
 BEGIN { print "Hello" >"/dev/stdout" }
 $	cmp vms_io1.ok tmp.
 $	if $status then  rm tmp.;
 $	return
 $
+$vms_cmd:	echo "vms_cmd"
+$	if f$search("vms_cmd.ok").eqs.""
+$	then create vms_cmd.ok
+World!
+$	endif
+$	gawk /Commands="BEGIN { print ""World!"" }" _NL: /Output=tmp.
+$	cmp vms_cmd.ok tmp.
+$	if $status then  rm tmp.;
+$	return
+$
 $clean:
 $	if f$search("tmp.")	 .nes."" then  rm tmp.;*
 $	if f$search("tmp.too")	 .nes."" then  rm tmp.too;*
diff --git a/ylwrap b/ylwrap
index 77eb34c3..102bd893 100755
--- a/ylwrap
+++ b/ylwrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2005-02-02.22
+scriptversion=2005-05-14.22
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
@@ -20,7 +20,8 @@ scriptversion=2005-02-02.22
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a