Interrupting autoheader left temp files.

From Jim Meyering.

* autoheader.sh (usage): The usage is to use $0 here.
(ah_base): Be in TMPDIR.
Install the `trap' before creating the first tmp file.
Also trap on 0.

diff --git a/ChangeLog b/ChangeLog
index 69ffac994dbb2a6c00ea14658dc9b8331e94dcad..285f9a6826689818fa0e872a62e18ae373c476d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-02-10  Akim Demaille  <akim@epita.fr>
+
+       Interrupting autoheader left temp files.
+       From Jim Meyering.
+
+       * autoheader.sh (usage): The usage is to use $0 here.
+       (ah_base): Be in TMPDIR.
+       Install the `trap' before creating the first tmp file.
+       Also trap on 0.
+
 2000-02-10  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (AC_OUTPUT_MAKE_DEFS): This is a routine of

diff --git a/autoheader.in b/autoheader.in
index 70bbefc11b8522fdbae9bf160451ddc2fd520e7e..28babfca3f1fa4516acee372de94991a237589a4 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -1,6 +1,6 @@
 #! @SHELL@
 # autoheader -- create `config.h.in' from `configure.in'
-# Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
+# Copyright (C) 1992-94, 96, 98, 99, 2000 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
@@ -26,7 +26,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: autoheader [OPTION] ... [TEMPLATE-FILE]
+Usage: $0 [OPTION] ... [TEMPLATE-FILE]
 
 Create a template file of C \`#define' statements for \`configure' to
 use.  To this end, scan TEMPLATE-FILE, or \`configure.in' if none
@@ -45,7 +45,7 @@ version="\
 autoheader (GNU @PACKAGE@) @VERSION@
 Written by Roland McGrath.
 
-Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
+Copyright (C) 1992-94, 96, 98, 99, 2000 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."
 
@@ -82,7 +82,9 @@ ac_LF_and_DOT=`echo; echo .`
 localdir=.
 debug=false
 # Basename for temporary files.
-ah_base=ah$$
+: ${TMPDIR=/tmp}
+ah_base=$TMPDIR/ah$$
+tmpout=$ah_base.out
 
 while test $# -gt 0 ; do
    case "$1" in
@@ -150,6 +152,9 @@ case `$M4 --help < /dev/null 2>&1` in
 esac
 run_m4="$M4 --reload $AC_MACRODIR/autoheader.m4f $use_localdir"
 
+# Trap on 0 to stop playing with `rm'.
+$debug || trap "rm -f $ah_base*" 0 1 2 15
+
 # Extract assignments of `ah_verbatim_SYMBOL' from the modified
 # autoconf processing of the input file.  The sed hair is necessary to
 # win for multi-line macro invocations.
@@ -163,7 +168,7 @@ sed -n -e '
                s/^/@@@/
                b again
        }' $ah_base.exp >$ah_base.decls
-. ./$ah_base.decls
+. $ah_base.decls
 $debug || rm $ah_base.exp $ah_base.decls
 
 # Make SYMS newline-separated rather than blank-separated, and remove dups.
@@ -224,7 +229,6 @@ if test -n "$syms"; then
   # pattern on the command line, so use a temporary file containing the
   # pattern.
   (fgrep_tmp=$ah_base.fgrep
-   trap "rm -f $fgrep_tmp; exit 1" 1 2 15
    cat > $fgrep_tmp <<EOF
 $syms
 EOF
@@ -274,5 +278,4 @@ if test $status -eq 0; then
   fi
 fi
 
-rm -f $tmpout
 exit $status

diff --git a/autoheader.sh b/autoheader.sh
index 70bbefc11b8522fdbae9bf160451ddc2fd520e7e..28babfca3f1fa4516acee372de94991a237589a4 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -1,6 +1,6 @@
 #! @SHELL@
 # autoheader -- create `config.h.in' from `configure.in'
-# Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
+# Copyright (C) 1992-94, 96, 98, 99, 2000 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
@@ -26,7 +26,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: autoheader [OPTION] ... [TEMPLATE-FILE]
+Usage: $0 [OPTION] ... [TEMPLATE-FILE]
 
 Create a template file of C \`#define' statements for \`configure' to
 use.  To this end, scan TEMPLATE-FILE, or \`configure.in' if none
@@ -45,7 +45,7 @@ version="\
 autoheader (GNU @PACKAGE@) @VERSION@
 Written by Roland McGrath.
 
-Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
+Copyright (C) 1992-94, 96, 98, 99, 2000 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."
 
@@ -82,7 +82,9 @@ ac_LF_and_DOT=`echo; echo .`
 localdir=.
 debug=false
 # Basename for temporary files.
-ah_base=ah$$
+: ${TMPDIR=/tmp}
+ah_base=$TMPDIR/ah$$
+tmpout=$ah_base.out
 
 while test $# -gt 0 ; do
    case "$1" in
@@ -150,6 +152,9 @@ case `$M4 --help < /dev/null 2>&1` in
 esac
 run_m4="$M4 --reload $AC_MACRODIR/autoheader.m4f $use_localdir"
 
+# Trap on 0 to stop playing with `rm'.
+$debug || trap "rm -f $ah_base*" 0 1 2 15
+
 # Extract assignments of `ah_verbatim_SYMBOL' from the modified
 # autoconf processing of the input file.  The sed hair is necessary to
 # win for multi-line macro invocations.
@@ -163,7 +168,7 @@ sed -n -e '
                s/^/@@@/
                b again
        }' $ah_base.exp >$ah_base.decls
-. ./$ah_base.decls
+. $ah_base.decls
 $debug || rm $ah_base.exp $ah_base.decls
 
 # Make SYMS newline-separated rather than blank-separated, and remove dups.
@@ -224,7 +229,6 @@ if test -n "$syms"; then
   # pattern on the command line, so use a temporary file containing the
   # pattern.
   (fgrep_tmp=$ah_base.fgrep
-   trap "rm -f $fgrep_tmp; exit 1" 1 2 15
    cat > $fgrep_tmp <<EOF
 $syms
 EOF
@@ -274,5 +278,4 @@ if test $status -eq 0; then
   fi
 fi
 
-rm -f $tmpout
 exit $status

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 70bbefc11b8522fdbae9bf160451ddc2fd520e7e..28babfca3f1fa4516acee372de94991a237589a4 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -1,6 +1,6 @@
 #! @SHELL@
 # autoheader -- create `config.h.in' from `configure.in'
-# Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
+# Copyright (C) 1992-94, 96, 98, 99, 2000 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
@@ -26,7 +26,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: autoheader [OPTION] ... [TEMPLATE-FILE]
+Usage: $0 [OPTION] ... [TEMPLATE-FILE]
 
 Create a template file of C \`#define' statements for \`configure' to
 use.  To this end, scan TEMPLATE-FILE, or \`configure.in' if none
@@ -45,7 +45,7 @@ version="\
 autoheader (GNU @PACKAGE@) @VERSION@
 Written by Roland McGrath.
 
-Copyright (C) 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
+Copyright (C) 1992-94, 96, 98, 99, 2000 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."
 
@@ -82,7 +82,9 @@ ac_LF_and_DOT=`echo; echo .`
 localdir=.
 debug=false
 # Basename for temporary files.
-ah_base=ah$$
+: ${TMPDIR=/tmp}
+ah_base=$TMPDIR/ah$$
+tmpout=$ah_base.out
 
 while test $# -gt 0 ; do
    case "$1" in
@@ -150,6 +152,9 @@ case `$M4 --help < /dev/null 2>&1` in
 esac
 run_m4="$M4 --reload $AC_MACRODIR/autoheader.m4f $use_localdir"
 
+# Trap on 0 to stop playing with `rm'.
+$debug || trap "rm -f $ah_base*" 0 1 2 15
+
 # Extract assignments of `ah_verbatim_SYMBOL' from the modified
 # autoconf processing of the input file.  The sed hair is necessary to
 # win for multi-line macro invocations.
@@ -163,7 +168,7 @@ sed -n -e '
                s/^/@@@/
                b again
        }' $ah_base.exp >$ah_base.decls
-. ./$ah_base.decls
+. $ah_base.decls
 $debug || rm $ah_base.exp $ah_base.decls
 
 # Make SYMS newline-separated rather than blank-separated, and remove dups.
@@ -224,7 +229,6 @@ if test -n "$syms"; then
   # pattern on the command line, so use a temporary file containing the
   # pattern.
   (fgrep_tmp=$ah_base.fgrep
-   trap "rm -f $fgrep_tmp; exit 1" 1 2 15
    cat > $fgrep_tmp <<EOF
 $syms
 EOF
@@ -274,5 +278,4 @@ if test $status -eq 0; then
   fi
 fi
 
-rm -f $tmpout
 exit $status

diff --git a/man/autoconf.1 b/man/autoconf.1
index cf667dfce5a5d537469d92473fa0a77187af3d96..119f0bcaaab69f817ea001429f01284ec8b35677 100644 (file)
--- a/man/autoconf.1
+++ b/man/autoconf.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.019.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
 .TH AUTOCONF "1" "February 2000" "GNU autoconf 2.14a" FSF
 .SH NAME
 autoconf \- Generate configuration scripts

diff --git a/man/autoheader.1 b/man/autoheader.1
index 6537a3cc961f2135a0d5e0655aa040c76a477dcf..3be0c69f652e7c66a1a7449a326bc03d34db4a7e 100644 (file)
--- a/man/autoheader.1
+++ b/man/autoheader.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.019.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
 .TH AUTOHEADER "1" "February 2000" "GNU autoconf 2.14a" FSF
 .SH NAME
 autoheader \- Create a template header for configure
@@ -32,7 +32,7 @@ Written by Roland McGrath.
 .SH "REPORTING BUGS"
 Report bugs to <bug-autoconf@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1992-1994, 1996, 1998-1999 Free Software Foundation, Inc.
+Copyright \(co 1992-94, 96, 98, 99, 2000 Free Software Foundation, Inc.
 .br
 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/man/autoreconf.1 b/man/autoreconf.1
index 0947631f12705b06d2d6395ec3c0b67fee0ef7a2..4cc9d588e64c1fb960480b4ebcac277bca067133 100644 (file)
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.019.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
 .TH AUTORECONF "1" "February 2000" "GNU autoconf 2.14a" FSF
 .SH NAME
 autoreconf \- Update generated configuration files

diff --git a/man/autoupdate.1 b/man/autoupdate.1
index 8b8b3ebcfd798ffc70c4ab866fb6bb3ec7edbfc2..6b7c36349be0fe24af89543b564659244e15d98b 100644 (file)
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.019.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
 .TH AUTOUPDATE "1" "February 2000" "GNU autoconf 2.14a" FSF
 .SH NAME
 autoupdate \- Update a configure.in to a newer Autoconf

diff --git a/man/ifnames.1 b/man/ifnames.1
index d8b712c74bbbad84c5cded6e4c5633d0820ad318..d6d44f3fdd20c9fd913f1e159d7cc4924e0d9345 100644 (file)
--- a/man/ifnames.1
+++ b/man/ifnames.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.019.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
 .TH IFNAMES "1" "February 2000" "GNU autoconf 2.14a" FSF
 .SH NAME
 ifnames \- Extract CPP conditionals from a set of files