diff options
-rw-r--r-- | awklib/eg/prog/igawk.sh | 3 | ||||
-rwxr-xr-x | configure | 20 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/ChangeLog | 6 | ||||
-rw-r--r-- | doc/gawk.info | 182 | ||||
-rw-r--r-- | doc/gawk.texi | 7 | ||||
-rw-r--r-- | version.c | 2 |
7 files changed, 120 insertions, 102 deletions
diff --git a/awklib/eg/prog/igawk.sh b/awklib/eg/prog/igawk.sh index bd9d9ac8..03d1c996 100644 --- a/awklib/eg/prog/igawk.sh +++ b/awklib/eg/prog/igawk.sh @@ -84,6 +84,9 @@ function pathto(file, i, t, junk) if (index(file, "/") != 0) return file + if (file == "-") + return file + for (i = 1; i <= ndirs; i++) { t = (pathlist[i] "/" file) if ((getline junk < t) > 0) { @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for GNU Awk 3.1.83. +# Generated by GNU Autoconf 2.68 for GNU Awk 3.1.84. # # Report bugs to <bug-gawk@gnu.org>. # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Awk' PACKAGE_TARNAME='gawk' -PACKAGE_VERSION='3.1.83' -PACKAGE_STRING='GNU Awk 3.1.83' +PACKAGE_VERSION='3.1.84' +PACKAGE_STRING='GNU Awk 3.1.84' PACKAGE_BUGREPORT='bug-gawk@gnu.org' PACKAGE_URL='http://www.gnu.org/software/gawk/' @@ -1292,7 +1292,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.83 to adapt to many kinds of systems. +\`configure' configures GNU Awk 3.1.84 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Awk 3.1.83:";; + short | recursive ) echo "Configuration of GNU Awk 3.1.84:";; esac cat <<\_ACEOF @@ -1474,7 +1474,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Awk configure 3.1.83 +GNU Awk configure 3.1.84 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2178,7 +2178,7 @@ 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.83, which was +It was created by GNU Awk $as_me 3.1.84, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3013,7 +3013,7 @@ fi # Define the identity of the package. PACKAGE='gawk' - VERSION='3.1.83' + VERSION='3.1.84' cat >>confdefs.h <<_ACEOF @@ -11260,7 +11260,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Awk $as_me 3.1.83, which was +This file was extended by GNU Awk $as_me 3.1.84, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11328,7 +11328,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU Awk config.status 3.1.83 +GNU Awk config.status 3.1.84 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e87d61c6..3fdbc824 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT([GNU Awk], 3.1.83, bug-gawk@gnu.org, gawk) +AC_INIT([GNU Awk], 3.1.84, 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. diff --git a/doc/ChangeLog b/doc/ChangeLog index 42dc28ac..1ad3cbf6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +Thu May 19 17:52:46 2011 Arnold D. Robbins <arnold@skeeve.com> + + * gawk.texi: Igawk, have pathto check for "-". + Thanks to Steffen Schuler <schuler.steffen@googlemail.com>, + from email dated 27, December 2008. + Thu May 19 16:57:28 2011 Arnold D. Robbins <arnold@skeeve.com> * gawk.texi, gawk.1, awkcard.in: Revised to reflect the reality diff --git a/doc/gawk.info b/doc/gawk.info index b3c5bd29..b80cd677 100644 --- a/doc/gawk.info +++ b/doc/gawk.info @@ -18381,7 +18381,8 @@ 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' environment variable (*note AWKPATH Variable::). If a file name has a -`/' in it, no path search is done. Otherwise, the file name is +`/' in it, no path search is done. Similarly, if the file name is +`"-"', then that string is used as-is. Otherwise, the file name is concatenated with the name of each directory in the path, and an attempt is made to open the generated file name. The only way to test if a file can be read in `awk' is to go ahead and try to read it with @@ -18395,6 +18396,9 @@ is closed and the file name is returned: if (index(file, "/") != 0) return file + if (file == "-") + return file + for (i = 1; i <= ndirs; i++) { t = (pathlist[i] "/" file) if ((getline junk < t) > 0) { @@ -25516,7 +25520,7 @@ Index * directories, changing: Sample Library. (line 6) * directories, command line: Command line directories. (line 6) -* directories, searching <1>: Igawk Program. (line 364) +* directories, searching <1>: Igawk Program. (line 368) * directories, searching: AWKPATH Variable. (line 6) * disable debugger command: Breakpoint Control. (line 68) * display debugger command: Viewing And Changing Data. @@ -25767,7 +25771,7 @@ Index * 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 364) +* files, source, search path for: Igawk Program. (line 368) * files, splitting: Split Program. (line 6) * files, Texinfo, extracting programs from: Extract Program. (line 6) * finish debugger command: Dgawk Execution Control. @@ -26879,11 +26883,11 @@ Index * Schreiber, Rita: Acknowledgments. (line 38) * search paths <1>: VMS Running. (line 29) * search paths <2>: PC Using. (line 11) -* search paths <3>: Igawk Program. (line 364) +* search paths <3>: Igawk Program. (line 368) * search paths: AWKPATH Variable. (line 6) * search paths, for source files <1>: VMS Running. (line 29) * search paths, for source files <2>: PC Using. (line 11) -* search paths, for source files <3>: Igawk Program. (line 364) +* search paths, for source files <3>: Igawk Program. (line 368) * search paths, for source files: AWKPATH Variable. (line 6) * searching: String Functions. (line 155) * searching, files for regular expressions: Egrep Program. (line 6) @@ -26974,7 +26978,7 @@ Index * source code, QuikTrim Awk: Other Versions. (line 112) * source code, Solaris awk: Other Versions. (line 86) * source code, xgawk: Other Versions. (line 119) -* source files, search path for: Igawk Program. (line 364) +* source files, search path for: Igawk Program. (line 368) * sparse arrays: Array Intro. (line 71) * Spencer, Henry: Glossary. (line 12) * split utility: Split Program. (line 6) @@ -27630,88 +27634,88 @@ Node: Extract Program720406 Ref: Extract Program-Footnote-1727889 Node: Simple Sed728017 Node: Igawk Program731079 -Ref: Igawk Program-Footnote-1746112 -Ref: Igawk Program-Footnote-2746313 -Node: Anagram Program746451 -Node: Signature Program749519 -Node: Debugger750619 -Node: Debugging751530 -Node: Debugging Concepts751943 -Node: Debugging Terms753799 -Node: Awk Debugging756422 -Node: Sample dgawk session757314 -Node: dgawk invocation757806 -Node: Finding The Bug758988 -Node: List of Debugger Commands765474 -Node: Breakpoint Control766785 -Node: Dgawk Execution Control770421 -Node: Viewing And Changing Data773772 -Node: Dgawk Stack777109 -Node: Dgawk Info778569 -Node: Miscellaneous Dgawk Commands782517 -Node: Readline Support787945 -Node: Dgawk Limitations788783 -Node: Language History790972 -Node: V7/SVR3.1792410 -Node: SVR4794731 -Node: POSIX796173 -Node: BTL797181 -Node: POSIX/GNU797915 -Node: Common Extensions803066 -Node: Contributors804167 -Node: Installation808343 -Node: Gawk Distribution809237 -Node: Getting809721 -Node: Extracting810547 -Node: Distribution contents812239 -Node: Unix Installation817461 -Node: Quick Installation818078 -Node: Additional Configuration Options820040 -Node: Configuration Philosophy821517 -Node: Non-Unix Installation823859 -Node: PC Installation824317 -Node: PC Binary Installation825616 -Node: PC Compiling827464 -Node: PC Testing830408 -Node: PC Using831584 -Node: Cygwin835769 -Node: MSYS836769 -Node: VMS Installation837283 -Node: VMS Compilation837886 -Ref: VMS Compilation-Footnote-1838893 -Node: VMS Installation Details838951 -Node: VMS Running840586 -Node: VMS Old Gawk842193 -Node: Bugs842667 -Node: Other Versions846577 -Node: Notes851856 -Node: Compatibility Mode852548 -Node: Additions853331 -Node: Accessing The Source854143 -Node: Adding Code855568 -Node: New Ports861535 -Node: Dynamic Extensions865648 -Node: Internals867024 -Node: Plugin License876127 -Node: Sample Library876761 -Node: Internal File Description877447 -Node: Internal File Ops881162 -Ref: Internal File Ops-Footnote-1885943 -Node: Using Internal File Ops886083 -Node: Future Extensions888460 -Node: Basic Concepts890964 -Node: Basic High Level891721 -Ref: Basic High Level-Footnote-1895756 -Node: Basic Data Typing895941 -Node: Floating Point Issues900466 -Node: String Conversion Precision901549 -Ref: String Conversion Precision-Footnote-1903249 -Node: Unexpected Results903358 -Node: POSIX Floating Point Problems905184 -Ref: POSIX Floating Point Problems-Footnote-1908889 -Node: Glossary908927 -Node: Copying933903 -Node: GNU Free Documentation License971460 -Node: Index996597 +Ref: Igawk Program-Footnote-1746236 +Ref: Igawk Program-Footnote-2746437 +Node: Anagram Program746575 +Node: Signature Program749643 +Node: Debugger750743 +Node: Debugging751654 +Node: Debugging Concepts752067 +Node: Debugging Terms753923 +Node: Awk Debugging756546 +Node: Sample dgawk session757438 +Node: dgawk invocation757930 +Node: Finding The Bug759112 +Node: List of Debugger Commands765598 +Node: Breakpoint Control766909 +Node: Dgawk Execution Control770545 +Node: Viewing And Changing Data773896 +Node: Dgawk Stack777233 +Node: Dgawk Info778693 +Node: Miscellaneous Dgawk Commands782641 +Node: Readline Support788069 +Node: Dgawk Limitations788907 +Node: Language History791096 +Node: V7/SVR3.1792534 +Node: SVR4794855 +Node: POSIX796297 +Node: BTL797305 +Node: POSIX/GNU798039 +Node: Common Extensions803190 +Node: Contributors804291 +Node: Installation808467 +Node: Gawk Distribution809361 +Node: Getting809845 +Node: Extracting810671 +Node: Distribution contents812363 +Node: Unix Installation817585 +Node: Quick Installation818202 +Node: Additional Configuration Options820164 +Node: Configuration Philosophy821641 +Node: Non-Unix Installation823983 +Node: PC Installation824441 +Node: PC Binary Installation825740 +Node: PC Compiling827588 +Node: PC Testing830532 +Node: PC Using831708 +Node: Cygwin835893 +Node: MSYS836893 +Node: VMS Installation837407 +Node: VMS Compilation838010 +Ref: VMS Compilation-Footnote-1839017 +Node: VMS Installation Details839075 +Node: VMS Running840710 +Node: VMS Old Gawk842317 +Node: Bugs842791 +Node: Other Versions846701 +Node: Notes851980 +Node: Compatibility Mode852672 +Node: Additions853455 +Node: Accessing The Source854267 +Node: Adding Code855692 +Node: New Ports861659 +Node: Dynamic Extensions865772 +Node: Internals867148 +Node: Plugin License876251 +Node: Sample Library876885 +Node: Internal File Description877571 +Node: Internal File Ops881286 +Ref: Internal File Ops-Footnote-1886067 +Node: Using Internal File Ops886207 +Node: Future Extensions888584 +Node: Basic Concepts891088 +Node: Basic High Level891845 +Ref: Basic High Level-Footnote-1895880 +Node: Basic Data Typing896065 +Node: Floating Point Issues900590 +Node: String Conversion Precision901673 +Ref: String Conversion Precision-Footnote-1903373 +Node: Unexpected Results903482 +Node: POSIX Floating Point Problems905308 +Ref: POSIX Floating Point Problems-Footnote-1909013 +Node: Glossary909051 +Node: Copying934027 +Node: GNU Free Documentation License971584 +Node: Index996721 End Tag Table diff --git a/doc/gawk.texi b/doc/gawk.texi index 6145b105..bae1fd52 100644 --- a/doc/gawk.texi +++ b/doc/gawk.texi @@ -24706,7 +24706,9 @@ The @code{pathto()} function does the work of finding the full path to a file. It simulates @command{gawk}'s behavior when searching the @env{AWKPATH} environment variable (@pxref{AWKPATH Variable}). -If a @value{FN} has a @samp{/} in it, no path search is done. Otherwise, +If a @value{FN} has a @samp{/} in it, no path search is done. +Similarly, if the @value{FN} is @code{"-"}, then that string is +used as-is. Otherwise, the @value{FN} is concatenated with the name of each directory in the path, and an attempt is made to open the generated @value{FN}. The only way to test if a file can be read in @command{awk} is to go @@ -24733,6 +24735,9 @@ function pathto(file, i, t, junk) if (index(file, "/") != 0) return file + if (file == "-") + return file + for (i = 1; i <= ndirs; i++) @{ t = (pathlist[i] "/" file) @group @@ -1,3 +1,3 @@ #include "config.h" -const char *version_string = "GNU Awk 3.1.83"; +const char *version_string = "GNU Awk 3.1.84"; |