[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-616
|
From: |
Arnold Robbins |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-616-g925f936 |
|
Date: |
Wed, 18 Mar 2015 19:53:39 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, gawk-4.1-stable has been updated
via 925f9363c4b0a5bb9375298afcdcf404efb32587 (commit)
via e0c1194c4348e7adf99802461d45e3dd1bd192ff (commit)
from cffd09247c1681fbf3d5cad5253b3199704f83e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=925f9363c4b0a5bb9375298afcdcf404efb32587
commit 925f9363c4b0a5bb9375298afcdcf404efb32587
Author: Arnold D. Robbins <address@hidden>
Date: Wed Mar 18 21:53:21 2015 +0200
Update to libtool 2.4.6.
diff --git a/ChangeLog b/ChangeLog
index cf18c51..b8b3ee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-18 Arnold D. Robbins <address@hidden>
+
+ * config.guess, config.sub: Updated, from libtool 2.4.6.
+
2015-03-17 Arnold D. Robbins <address@hidden>
* profile.c (pp_number): Allocate enough room to print the number
diff --git a/NEWS b/NEWS
index faeb461..0df1f0c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- Copyright (C) 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015,
+ Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -42,7 +43,7 @@ Changes from 4.1.1 to 4.1.2
AWKPATH setting, be sure to put "." in it somewhere. The documentation
has been updated and clarified.
-10. Infrastructure upgrades: Automake 1.15, Gettext 0.19.4, Libtool 2.4.5,
+10. Infrastructure upgrades: Automake 1.15, Gettext 0.19.4, Libtool 2.4.6,
Bison 3.0.4.
11. If a user-defined function has a parameter with the same name as another
diff --git a/config.guess b/config.guess
index 6c32c86..dbfb978 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-11-04'
+timestamp='2015-01-01'
# 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
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/config.sub b/config.sub
index 7ffe373..6d2e94c 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-12-03'
+timestamp='2015-01-01'
# 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
@@ -68,7 +68,7 @@ Report bugs and patches to <address@hidden>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
- | fido | fr30 | frv \
+ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
diff --git a/extension/ChangeLog b/extension/ChangeLog
index b3c9c0d..5d8c7b8 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,5 +1,9 @@
2015-03-18 Arnold D. Robbins <address@hidden>
+ * configure: Updated to libtool 2.4.6.
+
+2015-03-18 Arnold D. Robbins <address@hidden>
+
* inplace.3am (SYNOPSIS): Updated to not show the contents
of the extension.
(BUGS): Removed.
diff --git a/extension/build-aux/ChangeLog b/extension/build-aux/ChangeLog
index 697db60..589d20c 100644
--- a/extension/build-aux/ChangeLog
+++ b/extension/build-aux/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-18 Arnold D. Robbins <address@hidden>
+
+ * config.guess, config.sub, ltmain.sh: Updated, from libtool 2.4.6.
+
2014-04-08 Arnold D. Robbins <address@hidden>
* 4.1.1: Release tar ball made.
diff --git a/extension/build-aux/config.guess b/extension/build-aux/config.guess
index 6c32c86..dbfb978 100755
--- a/extension/build-aux/config.guess
+++ b/extension/build-aux/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-11-04'
+timestamp='2015-01-01'
# 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
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/extension/build-aux/config.sub b/extension/build-aux/config.sub
index 7ffe373..6d2e94c 100755
--- a/extension/build-aux/config.sub
+++ b/extension/build-aux/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-12-03'
+timestamp='2015-01-01'
# 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
@@ -68,7 +68,7 @@ Report bugs and patches to <address@hidden>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
- | fido | fr30 | frv \
+ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
diff --git a/extension/build-aux/ltmain.sh b/extension/build-aux/ltmain.sh
index b891526..0f0a2da 100644
--- a/extension/build-aux/ltmain.sh
+++ b/extension/build-aux/ltmain.sh
@@ -2,7 +2,7 @@
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.5
+# libtool (GNU libtool) 2.4.6
# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <address@hidden>, 1996
@@ -31,8 +31,8 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.5
-package_revision=2.4.5
+VERSION=2.4.6
+package_revision=2.4.6
## ------ ##
@@ -64,7 +64,7 @@ package_revision=2.4.5
# libraries, which are installed to $pkgauxdir.
# Set a version string for this script.
-scriptversion=2014-01-03.01; # UTC
+scriptversion=2015-01-20.17; # UTC
# General shell script boiler plate, and helper functions.
# Written by Gary V. Vaughan, 2004
@@ -192,7 +192,7 @@ func_path_progs ()
_G_path_prog_max=0
_G_path_prog_found=false
- _G_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
for _G_dir in $_G_PATH; do
IFS=$_G_save_IFS
test -z "$_G_dir" && _G_dir=.
@@ -1977,7 +1977,7 @@ func_version ()
# End:
# Set a version string.
-scriptversion='(GNU libtool) 2.4.5'
+scriptversion='(GNU libtool) 2.4.6'
# func_echo ARG...
@@ -2039,7 +2039,12 @@ usage_message="Options:
"
# Additional text appended to 'usage_message' in response to '--help'.
-long_help_message=$long_help_message"
+func_help ()
+{
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message
MODE must be one of the following:
@@ -2063,13 +2068,15 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.4.5
+ version: $progname (GNU libtool) 2.4.6
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <address@hidden>.
GNU libtool home page: <http://www.gnu.org/software/libtool/>.
General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
# func_lo2o OBJECT-NAME
diff --git a/extension/configure b/extension/configure
index 6818958..199833f 100755
--- a/extension/configure
+++ b/extension/configure
@@ -4852,8 +4852,8 @@ esac
-macro_version='2.4.5'
-macro_revision='2.4.5'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -8187,7 +8187,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -11693,13 +11693,20 @@ if test set =
"${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script
decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -13791,7 +13798,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED
"$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED
"$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED
"$delay_single_quote_subst"`'
-lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" |
$SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED
"$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO
"$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED
"$delay_single_quote_subst"`'
@@ -13909,7 +13917,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-lt_cv_sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e
\\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e
\\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from
sc_prohibit_nested_quotes
@@ -14685,7 +14694,7 @@ $as_echo X"$file" |
available_tags=''
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -14936,8 +14945,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -15089,9 +15101,8 @@ hardcode_action=$hardcode_action
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
# func_munge_path_list VARIABLE PATH
# -----------------------------------
@@ -15113,7 +15124,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -15144,6 +15155,8 @@ func_cc_basename ()
}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
diff --git a/extension/m4/ChangeLog b/extension/m4/ChangeLog
index f991eac..6895c6b 100644
--- a/extension/m4/ChangeLog
+++ b/extension/m4/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-18 Arnold D. Robbins <address@hidden>
+
+ * libtoolm4, ltversion.m4: Updated to libtool 2.4.6.
+
2015-01-24 Arnold D. Robbins <address@hidden>
* gettext.m4, iconv.m4, intlmacosx.m4, po.m4: Removed.
diff --git a/extension/m4/libtool.m4 b/extension/m4/libtool.m4
index f796d7b..a3bc337 100644
--- a/extension/m4/libtool.m4
+++ b/extension/m4/libtool.m4
@@ -738,7 +738,7 @@ _LT_COPYING
_LT_LIBTOOL_TAGS
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
_LT_LIBTOOL_CONFIG_VARS
@@ -748,13 +748,14 @@ _LT_LIBTOOL_TAG_VARS
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
_LT_PREPARE_MUNGE_PATH_LIST
_LT_PREPARE_CC_BASENAME
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
@@ -2256,7 +2257,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` address@hidden|@1\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` address@hidden|@@S|@1\"
;;
x:*)
eval @S|@1=\"address@hidden|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
@@ -3100,13 +3101,15 @@ if test set =
"${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script
decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
_LT_DECL([], [variables_saved_for_relink], [1],
[Variables whose values should be saved in libtool wrapper scripts and
restored at link time])
@@ -3139,8 +3142,10 @@ _LT_DECL([], [hardcode_into_libs], [0],
[Whether we should hardcode library paths into libraries])
_LT_DECL([], [sys_lib_search_path_spec], [2],
[Compile-time system search path for libraries])
-_LT_DECL([sys_lib_dlsearch_path_spec], [lt_cv_sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+ [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
])# _LT_SYS_DYNAMIC_LINKER
diff --git a/extension/m4/ltversion.m4 b/extension/m4/ltversion.m4
index a4c5ed4..fa04b52 100644
--- a/extension/m4/ltversion.m4
+++ b/extension/m4/ltversion.m4
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 4171 ltversion.m4
+# serial 4179 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.5])
-m4_define([LT_PACKAGE_REVISION], [2.4.5])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.5'
-macro_revision='2.4.5'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=e0c1194c4348e7adf99802461d45e3dd1bd192ff
commit e0c1194c4348e7adf99802461d45e3dd1bd192ff
Author: Arnold D. Robbins <address@hidden>
Date: Wed Mar 18 21:43:14 2015 +0200
Bug fix to inplace extension and doc updates.
diff --git a/awklib/eg/lib/inplace.awk b/awklib/eg/lib/inplace.awk
index 6403a22..d157465 100644
--- a/awklib/eg/lib/inplace.awk
+++ b/awklib/eg/lib/inplace.awk
@@ -5,10 +5,15 @@
# Please set INPLACE_SUFFIX to make a backup copy. For example, you may
# want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
+# N.B. We call inplace_end() in the BEGINFILE and END rules so that any
+# actions in an ENDFILE rule will be redirected as expected.
+
BEGINFILE {
- inplace_begin(FILENAME, INPLACE_SUFFIX)
+ if (_inplace_filename != "")
+ inplace_end(_inplace_filename, INPLACE_SUFFIX)
+ inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
}
-ENDFILE {
+END {
inplace_end(FILENAME, INPLACE_SUFFIX)
}
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f8a317f..f2fa97b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-17 Andrew J. Schorr <address@hidden>
+
+ * gawktexi.in: Modify inplace.awk to call inplace_end in BEGINFILE
+ and END instead of in ENDFILE. This way, actions in ENDFILE rules
+ will be redirected as expected.
+
2015-03-17 Arnold D. Robbins <address@hidden>
* gawktexi.in: Turn "positive" into non-negative as appropriate.
diff --git a/doc/gawk.info b/doc/gawk.info
index 2d4fd90..d6aea49 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -25670,11 +25670,16 @@ performs "in-place" editing of each input file. It
uses the bundled
# Please set INPLACE_SUFFIX to make a backup copy. For example, you may
# want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN
rule.
+ # N.B. We call inplace_end() in the BEGINFILE and END rules so that any
+ # actions in an ENDFILE rule will be redirected as expected.
+
BEGINFILE {
- inplace_begin(FILENAME, INPLACE_SUFFIX)
+ if (_inplace_filename != "")
+ inplace_end(_inplace_filename, INPLACE_SUFFIX)
+ inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
}
- ENDFILE {
+ END {
inplace_end(FILENAME, INPLACE_SUFFIX)
}
@@ -25686,6 +25691,10 @@ the extension restores standard output to its original
destination. If
a backup file name created by appending that suffix. Finally, the
temporary file is renamed to the original file name.
+ The `_inplace_filename' variable serves to keep track of the current
+filename so as to not invoke `inplace_end()' before processing the
+first file.
+
If any error occurs, the extension issues a fatal error to terminate
processing immediately without damaging the original file.
@@ -34955,91 +34964,91 @@ Node: Extension Sample File Functions1023254
Node: Extension Sample Fnmatch1030935
Node: Extension Sample Fork1032423
Node: Extension Sample Inplace1033638
-Node: Extension Sample Ord1035314
-Node: Extension Sample Readdir1036150
-Ref: table-readdir-file-types1037027
-Node: Extension Sample Revout1037838
-Node: Extension Sample Rev2way1038427
-Node: Extension Sample Read write array1039167
-Node: Extension Sample Readfile1041107
-Node: Extension Sample Time1042202
-Node: Extension Sample API Tests1043550
-Node: gawkextlib1044041
-Node: Extension summary1046719
-Node: Extension Exercises1050408
-Node: Language History1051130
-Node: V7/SVR3.11052786
-Node: SVR41054939
-Node: POSIX1056373
-Node: BTL1057754
-Node: POSIX/GNU1058485
-Node: Feature History1064006
-Node: Common Extensions1077104
-Node: Ranges and Locales1078476
-Ref: Ranges and Locales-Footnote-11083095
-Ref: Ranges and Locales-Footnote-21083122
-Ref: Ranges and Locales-Footnote-31083357
-Node: Contributors1083578
-Node: History summary1089118
-Node: Installation1090497
-Node: Gawk Distribution1091443
-Node: Getting1091927
-Node: Extracting1092750
-Node: Distribution contents1094387
-Node: Unix Installation1100141
-Node: Quick Installation1100758
-Node: Additional Configuration Options1103182
-Node: Configuration Philosophy1104985
-Node: Non-Unix Installation1107354
-Node: PC Installation1107812
-Node: PC Binary Installation1109132
-Node: PC Compiling1110980
-Ref: PC Compiling-Footnote-11114001
-Node: PC Testing1114110
-Node: PC Using1115286
-Node: Cygwin1119401
-Node: MSYS1120171
-Node: VMS Installation1120672
-Node: VMS Compilation1121464
-Ref: VMS Compilation-Footnote-11122693
-Node: VMS Dynamic Extensions1122751
-Node: VMS Installation Details1124435
-Node: VMS Running1126686
-Node: VMS GNV1129526
-Node: VMS Old Gawk1130261
-Node: Bugs1130731
-Node: Other Versions1134620
-Node: Installation summary1141054
-Node: Notes1142113
-Node: Compatibility Mode1142978
-Node: Additions1143760
-Node: Accessing The Source1144685
-Node: Adding Code1146120
-Node: New Ports1152277
-Node: Derived Files1156759
-Ref: Derived Files-Footnote-11162234
-Ref: Derived Files-Footnote-21162268
-Ref: Derived Files-Footnote-31162864
-Node: Future Extensions1162978
-Node: Implementation Limitations1163584
-Node: Extension Design1164832
-Node: Old Extension Problems1165986
-Ref: Old Extension Problems-Footnote-11167503
-Node: Extension New Mechanism Goals1167560
-Ref: Extension New Mechanism Goals-Footnote-11170920
-Node: Extension Other Design Decisions1171109
-Node: Extension Future Growth1173217
-Node: Old Extension Mechanism1174053
-Node: Notes summary1175815
-Node: Basic Concepts1177001
-Node: Basic High Level1177682
-Ref: figure-general-flow1177954
-Ref: figure-process-flow1178553
-Ref: Basic High Level-Footnote-11181782
-Node: Basic Data Typing1181967
-Node: Glossary1185295
-Node: Copying1217224
-Node: GNU Free Documentation License1254780
-Node: Index1279916
+Node: Extension Sample Ord1035724
+Node: Extension Sample Readdir1036560
+Ref: table-readdir-file-types1037437
+Node: Extension Sample Revout1038248
+Node: Extension Sample Rev2way1038837
+Node: Extension Sample Read write array1039577
+Node: Extension Sample Readfile1041517
+Node: Extension Sample Time1042612
+Node: Extension Sample API Tests1043960
+Node: gawkextlib1044451
+Node: Extension summary1047129
+Node: Extension Exercises1050818
+Node: Language History1051540
+Node: V7/SVR3.11053196
+Node: SVR41055349
+Node: POSIX1056783
+Node: BTL1058164
+Node: POSIX/GNU1058895
+Node: Feature History1064416
+Node: Common Extensions1077514
+Node: Ranges and Locales1078886
+Ref: Ranges and Locales-Footnote-11083505
+Ref: Ranges and Locales-Footnote-21083532
+Ref: Ranges and Locales-Footnote-31083767
+Node: Contributors1083988
+Node: History summary1089528
+Node: Installation1090907
+Node: Gawk Distribution1091853
+Node: Getting1092337
+Node: Extracting1093160
+Node: Distribution contents1094797
+Node: Unix Installation1100551
+Node: Quick Installation1101168
+Node: Additional Configuration Options1103592
+Node: Configuration Philosophy1105395
+Node: Non-Unix Installation1107764
+Node: PC Installation1108222
+Node: PC Binary Installation1109542
+Node: PC Compiling1111390
+Ref: PC Compiling-Footnote-11114411
+Node: PC Testing1114520
+Node: PC Using1115696
+Node: Cygwin1119811
+Node: MSYS1120581
+Node: VMS Installation1121082
+Node: VMS Compilation1121874
+Ref: VMS Compilation-Footnote-11123103
+Node: VMS Dynamic Extensions1123161
+Node: VMS Installation Details1124845
+Node: VMS Running1127096
+Node: VMS GNV1129936
+Node: VMS Old Gawk1130671
+Node: Bugs1131141
+Node: Other Versions1135030
+Node: Installation summary1141464
+Node: Notes1142523
+Node: Compatibility Mode1143388
+Node: Additions1144170
+Node: Accessing The Source1145095
+Node: Adding Code1146530
+Node: New Ports1152687
+Node: Derived Files1157169
+Ref: Derived Files-Footnote-11162644
+Ref: Derived Files-Footnote-21162678
+Ref: Derived Files-Footnote-31163274
+Node: Future Extensions1163388
+Node: Implementation Limitations1163994
+Node: Extension Design1165242
+Node: Old Extension Problems1166396
+Ref: Old Extension Problems-Footnote-11167913
+Node: Extension New Mechanism Goals1167970
+Ref: Extension New Mechanism Goals-Footnote-11171330
+Node: Extension Other Design Decisions1171519
+Node: Extension Future Growth1173627
+Node: Old Extension Mechanism1174463
+Node: Notes summary1176225
+Node: Basic Concepts1177411
+Node: Basic High Level1178092
+Ref: figure-general-flow1178364
+Ref: figure-process-flow1178963
+Ref: Basic High Level-Footnote-11182192
+Node: Basic Data Typing1182377
+Node: Glossary1185705
+Node: Copying1217634
+Node: GNU Free Documentation License1255190
+Node: Index1280326
End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 8d219a0..96d3370 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -34595,11 +34595,16 @@ properly:
# Please set INPLACE_SUFFIX to make a backup copy. For example, you may
# want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
+# N.B. We call inplace_end() in the BEGINFILE and END rules so that any
+# actions in an ENDFILE rule will be redirected as expected.
+
BEGINFILE @{
- inplace_begin(FILENAME, INPLACE_SUFFIX)
+ if (_inplace_filename != "")
+ inplace_end(_inplace_filename, INPLACE_SUFFIX)
+ inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
@}
-ENDFILE @{
+END @{
inplace_end(FILENAME, INPLACE_SUFFIX)
@}
@end group
@@ -34614,6 +34619,10 @@ If @code{INPLACE_SUFFIX} is not an empty string, the
original file is
linked to a backup @value{FN} created by appending that suffix. Finally,
the temporary file is renamed to the original @value{FN}.
+The @code{_inplace_filename} variable serves to keep track of the
+current filename so as to not invoke @code{inplace_end()} before
+processing the first file.
+
If any error occurs, the extension issues a fatal error to terminate
processing immediately without damaging the original file.
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index d4067f7..08a9f7c 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -33686,11 +33686,16 @@ properly:
# Please set INPLACE_SUFFIX to make a backup copy. For example, you may
# want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
+# N.B. We call inplace_end() in the BEGINFILE and END rules so that any
+# actions in an ENDFILE rule will be redirected as expected.
+
BEGINFILE @{
- inplace_begin(FILENAME, INPLACE_SUFFIX)
+ if (_inplace_filename != "")
+ inplace_end(_inplace_filename, INPLACE_SUFFIX)
+ inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
@}
-ENDFILE @{
+END @{
inplace_end(FILENAME, INPLACE_SUFFIX)
@}
@end group
@@ -33705,6 +33710,10 @@ If @code{INPLACE_SUFFIX} is not an empty string, the
original file is
linked to a backup @value{FN} created by appending that suffix. Finally,
the temporary file is renamed to the original @value{FN}.
+The @code{_inplace_filename} variable serves to keep track of the
+current filename so as to not invoke @code{inplace_end()} before
+processing the first file.
+
If any error occurs, the extension issues a fatal error to terminate
processing immediately without damaging the original file.
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 9d7e617..b3c9c0d 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-18 Arnold D. Robbins <address@hidden>
+
+ * inplace.3am (SYNOPSIS): Updated to not show the contents
+ of the extension.
+ (BUGS): Removed.
+
2015-03-17 Arnold D. Robbins <address@hidden>
* inplace.c (do_inplace_begin): Jump through more hoops to satisfy
diff --git a/extension/inplace.3am b/extension/inplace.3am
index d6339c4..f8fc098 100644
--- a/extension/inplace.3am
+++ b/extension/inplace.3am
@@ -1,21 +1,10 @@
-.TH INPLACE 3am "Mar 16 2015" "Free Software Foundation" "GNU Awk Extension
Modules"
+.TH INPLACE 3am "Mar 18 2015" "Free Software Foundation" "GNU Awk Extension
Modules"
.SH NAME
inplace \- emulate sed/perl/ruby in-place editing
.SH SYNOPSIS
.ft CW
.nf
address@hidden "inplace"
-
-# Please set INPLACE_SUFFIX to make a backup copy. For example, you may
-# want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
-
-BEGINFILE {
- inplace_begin(FILENAME, INPLACE_SUFFIX)
-}
-
-ENDFILE {
- inplace_end(FILENAME, INPLACE_SUFFIX)
-}
+gawk -i inplace ...
.fi
.ft R
.SH DESCRIPTION
@@ -27,8 +16,7 @@ and
.BR inplace_end() .
These functions are meant to be invoked from the
.I inplace.awk
-wrapper (whose contents are displayed above)
-which is installed when
+wrapper which is installed when
.I gawk
is.
.PP
@@ -45,10 +33,7 @@ extension concatenates that suffix onto the original
filename and uses the result as a filename for renaming
the original.
... .SH NOTES
-.SH BUGS
-As currently written, output from an \f(CWENDFILE\fP
-rule does not get redirected into the replacement file.
-Neither does output from an \f(CWEND\fP rule.
+... .SH BUGS
.SH EXAMPLE
.ft CW
.nf
diff --git a/test/ChangeLog b/test/ChangeLog
index 24d6bcd..c33ac10 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-17 Andrew J. Schorr <address@hidden>
+
+ * inplace1.ok, inplace2.ok, inplace3.ok: Update error message line
+ numbers to reflect changes to inplace.awk.
+
2015-03-17 Arnold D. Robbins <address@hidden>
* Makefile.am (mpfrmemok1): New test.
diff --git a/test/inplace1.ok b/test/inplace1.ok
index ffcb768..8256223 100644
--- a/test/inplace1.ok
+++ b/test/inplace1.ok
@@ -1,5 +1,5 @@
before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for
invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for
invalid FILENAME `-'
stdin start
is bar replaced?
stdin end
diff --git a/test/inplace2.ok b/test/inplace2.ok
index ffcb768..8256223 100644
--- a/test/inplace2.ok
+++ b/test/inplace2.ok
@@ -1,5 +1,5 @@
before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for
invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for
invalid FILENAME `-'
stdin start
is bar replaced?
stdin end
diff --git a/test/inplace3.ok b/test/inplace3.ok
index 7cd960b..a7b7254 100644
--- a/test/inplace3.ok
+++ b/test/inplace3.ok
@@ -1,11 +1,11 @@
before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for
invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for
invalid FILENAME `-'
stdin start
is bar replaced?
stdin end
after
Before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for
invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for
invalid FILENAME `-'
stdin start
is foo replaced?
stdin end
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 +
NEWS | 5 +-
awklib/eg/lib/inplace.awk | 9 ++-
config.guess | 6 +-
config.sub | 8 +-
doc/ChangeLog | 6 ++
doc/gawk.info | 185 ++++++++++++++++++++------------------
doc/gawk.texi | 13 +++-
doc/gawktexi.in | 13 +++-
extension/ChangeLog | 10 ++
extension/build-aux/ChangeLog | 4 +
extension/build-aux/config.guess | 6 +-
extension/build-aux/config.sub | 8 +-
extension/build-aux/ltmain.sh | 23 +++--
extension/configure | 45 ++++++----
extension/inplace.3am | 23 +----
extension/m4/ChangeLog | 4 +
extension/m4/libtool.m4 | 27 ++++---
extension/m4/ltversion.m4 | 10 +-
test/ChangeLog | 5 +
test/inplace1.ok | 2 +-
test/inplace2.ok | 2 +-
test/inplace3.ok | 4 +-
23 files changed, 249 insertions(+), 173 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-616-g925f936,
Arnold Robbins <=