re PR java/16472 (jartool.c uses ftruncate, nonexistant on mingw32)

2004-07-11  Bryce McKinlay  <mckinlay@redhat.com>

	PR java/16472
	* configure.ac: Check for ftruncate() and _chsize().
	* jartool.c (main): Use _chsize if ftruncate not available.
	* configure, config.h.in: Rebuilt.

From-SVN: r84929

diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index e7b86595a8df87df406168f44781b73714e922ec..2b54f3bde3cadaab3efb36b25b61d20b5429414c 100644 (file)
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-11  Bryce McKinlay  <mckinlay@redhat.com>
+
+       PR 16472
+       * configure.ac: Check for ftruncate() and _chsize().
+       * jartool.c (main): Use _chsize if ftruncate not available.
+       * configure, config.h.in: Rebuilt.
+
 2004-07-09  Richard Sandiford  <rsandifo@redhat.com>
 
        * jartool.c (find_entry, looks_like_dir): Remove inline spec.

diff --git a/fastjar/config.h.in b/fastjar/config.h.in
index 173a13533a1163da21cfce61b2735ec4fbadbc3f..84efea0e5fc13291643b646045644f683720d183 100644 (file)
--- a/fastjar/config.h.in
+++ b/fastjar/config.h.in
@@ -10,6 +10,9 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the `ftruncate' function. */
+#undef HAVE_FTRUNCATE
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -57,6 +60,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `_chsize' function. */
+#undef HAVE__CHSIZE
+
 /* Define if the host machine stores words of multi-word integers in
    big-endian order. */
 #undef HOST_WORDS_BIG_ENDIAN

diff --git a/fastjar/configure b/fastjar/configure
index a379ca60b793bbe58561a32e4cd4aa045b064f24..2b3bfb7cca33332533c776df12f735455ce175a3 100755 (executable)
--- a/fastjar/configure
+++ b/fastjar/configure
@@ -4150,6 +4150,110 @@ fi
 done
 
 
+
+
+for ac_func in ftruncate _chsize
+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 off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then

diff --git a/fastjar/configure.ac b/fastjar/configure.ac
index 635836fd882d2cdfeedf584e57f4c19a640ebbbf..fa3ecf4ac0e3f69ed76f30fa18faa2de9834744f 100644 (file)
--- a/fastjar/configure.ac
+++ b/fastjar/configure.ac
@@ -27,6 +27,8 @@ AC_HEADER_STDC
 AC_STRUCT_TM
 AC_CHECK_HEADERS(fcntl.h unistd.h sys/param.h stdlib.h limits.h)
 
+AC_CHECK_FUNCS(ftruncate _chsize)
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_OFF_T
 AC_STRUCT_TM

diff --git a/fastjar/jartool.c b/fastjar/jartool.c
index 8d223f6cbf0d5233a54f519f9f0ee919a59e56be..d57794dea928c79c6a07ece72284526170483b8b 100644 (file)
--- a/fastjar/jartool.c
+++ b/fastjar/jartool.c
@@ -573,9 +573,17 @@ int main(int argc, char **argv){
     
     create_central_header(jarfd);
 
+#if ! (HAVE_FTRUNCATE || HAVE__CHSIZE)
+  #error neither ftruncate() or _chsize() available
+#endif
     /* Check if the file shrunk when we updated it. */
     if (action == ACTION_UPDATE)
+#if HAVE_FTRUNCATE
       ftruncate (jarfd, lseek (jarfd, 0, SEEK_CUR));
+#endif
+#if HAVE__CHSIZE
+      _chsize (jarfd, lseek (jarfd, 0, SEEK_CUR));
+#endif
 
     if (jarfd != STDIN_FILENO && close(jarfd) != 0) {
       fprintf(stderr, "%s: error closing jar archive: %s\n",