X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/55f0c7b1f26afabb7f356343f2650626e09fce51..98ae96438ebb4465c777a7849f1b4ca222e760e3:/bootstrap

diff --git a/bootstrap b/bootstrap
index e270db2b..a86aeb83 100755
--- a/bootstrap
+++ b/bootstrap
@@ -58,6 +58,12 @@ build_cvs_prefix() {
   fi
 }
 
+cleanup_gnulib() {
+  status=$?
+  rm -fr gnulib
+  exit $status
+}
+
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
@@ -65,9 +71,6 @@ case ${GNULIB_SRCDIR--} in
   if [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 
-    trap exit 1 2 13 15
-    trap 'rm -fr gnulib; exit 1' 0
-
     case ${CVS_AUTH-anoncvs} in
     anoncvs)
       CVS_PREFIX='anoncvs@';;
@@ -82,9 +85,12 @@ case ${GNULIB_SRCDIR--} in
     '') export CVS_RSH=ssh;;
     esac
 
-    cvs -z3 -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
+    trap cleanup_gnulib 1 2 13 15
+
+    cvs -z3 -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib ||
+      cleanup_gnulib
 
-    trap - 0
+    trap - 1 2 13 15
   fi
   GNULIB_SRCDIR=gnulib
 esac
@@ -110,7 +116,9 @@ stdio-safer
 stpcpy
 strerror
 strtoul
+strverscmp
 unistd-safer
+unlocked-io
 verify
 xalloc
 xalloc-die