check for exception propagation in udunits2, closes #423

Author: Enchufa2

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: units
-Version: 1.0-0.3
+Version: 1.0-0.4
 Title: Measurement Units for R Vectors
 Authors@R: c(person("Edzer", "Pebesma", role = c("aut", "cre"), email = "edzer.pebesma@uni-muenster.de", comment = c(ORCID = "0000-0001-8049-7069")),
     person("Thomas", "Mailund", role = "aut", email = "mailund@birc.au.dk"),

NEWS.md

@@ -10,6 +10,8 @@
 
 * Wrap all pointers to avoid memory leaks derived from errors.
 
+* Check for exception propagation in udunits2; #423
+
 # version 1.0-0
 
 * Breaking change: a new tokenizer fixes longstanding issues with parsing

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for units 1.0-0.
+# Generated by GNU Autoconf 2.72 for units 1.0-0.4.
 #
 # Report bugs to <edzer.pebesma@uni-muenster.de>.
 #
@@ -603,8 +603,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='units'
 PACKAGE_TARNAME='units'
-PACKAGE_VERSION='1.0-0'
-PACKAGE_STRING='units 1.0-0'
+PACKAGE_VERSION='1.0-0.4'
+PACKAGE_STRING='units 1.0-0.4'
 PACKAGE_BUGREPORT='edzer.pebesma@uni-muenster.de'
 PACKAGE_URL=''
 
@@ -1260,7 +1260,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 units 1.0-0 to adapt to many kinds of systems.
+'configure' configures units 1.0-0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1322,7 +1322,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of units 1.0-0:";;
+     short | recursive ) echo "Configuration of units 1.0-0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1411,7 +1411,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-units configure 1.0-0
+units configure 1.0-0.4
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1646,6 +1646,50 @@ fi
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
+
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else case e in #(
+  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status ;;
+esac
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_run
 ac_configure_args_raw=
 for ac_arg
 do
@@ -1670,7 +1714,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 units $as_me 1.0-0, which was
+It was created by units $as_me 1.0-0.4, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4295,24 +4339,32 @@ if test "${ac_cv_lib_expat_XML_ParserCreate}" = yes; then
    LIBS="${LIBS} -lexpat"
 fi
 
-ac_fn_cxx_check_header_compile "$LINENO" "udunits2.h" "ac_cv_header_udunits2_h" "$ac_includes_default"
+       for ac_header in udunits2.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "udunits2.h" "ac_cv_header_udunits2_h" "$ac_includes_default"
 if test "x$ac_cv_header_udunits2_h" = xyes
 then :
-  UDUNITS2_DIR=0
+  printf "%s\n" "#define HAVE_UDUNITS2_H 1" >>confdefs.h
+ UDUNITS2_DIR=0
 else case e in #(
   e)
+         for ac_header in udunits2/udunits2.h
+do :
   ac_fn_cxx_check_header_compile "$LINENO" "udunits2/udunits2.h" "ac_cv_header_udunits2_udunits2_h" "$ac_includes_default"
 if test "x$ac_cv_header_udunits2_udunits2_h" = xyes
 then :
-  UDUNITS2_DIR=1
+  printf "%s\n" "#define HAVE_UDUNITS2_UDUNITS2_H 1" >>confdefs.h
+ UDUNITS2_DIR=1
 else case e in #(
   e) UD_ERROR="udunits2.h was not found" ;;
 esac
 fi
-  ;;
+
+done  ;;
 esac
 fi
 
+done
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ut_read_xml in -ludunits2" >&5
 printf %s "checking for ut_read_xml in -ludunits2... " >&6; }
 if test ${ac_cv_lib_udunits2_ut_read_xml+y}
@@ -4376,6 +4428,62 @@ as_fn_error $? "
 
 See 'config.log' for more details" "$LINENO" 5; } fi
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exception propagation in -ludunits2" >&5
+printf %s "checking for exception propagation in -ludunits2... " >&6; }
+if test "$cross_compiling" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5
+printf "%s\n" "unknown (cross-compiling)" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cross-compiling: cannot verify exception propagation in udunits2. Assuming it works." >&5
+printf "%s\n" "$as_me: WARNING: Cross-compiling: cannot verify exception propagation in udunits2. Assuming it works." >&2;}
+
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+    #include <stdexcept>
+    #include <cstdarg>
+    #ifdef HAVE_UDUNITS2_UDUNITS2_H
+    # include <udunits2/udunits2.h>
+    #else
+    # include <udunits2.h>
+    #endif
+    extern "C" {
+      int ud_handler(const char* fmt, va_list args) {
+        throw std::runtime_error("udunits error");
+        return 0;
+      }
+    }
+
+int
+main (void)
+{
+
+    ut_set_error_message_handler(ud_handler);
+    try { ut_read_xml("nonexistent.xml"); }
+    catch (...) { return 0; }
+    return 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+    as_fn_error $? "The udunits2 library does not support exception propagation. Please reinstall it with -fexceptions enabled." "$LINENO" 5 ;;
+esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+
+
 
 
 
@@ -4918,7 +5026,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 units $as_me 1.0-0, which was
+This file was extended by units $as_me 1.0-0.4, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4973,7 +5081,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-units config.status 1.0-0
+units config.status 1.0-0.4
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -59,8 +59,8 @@ if test "${ac_cv_lib_expat_XML_ParserCreate}" = yes; then
    LIBS="${LIBS} -lexpat"
 fi
 
-AC_CHECK_HEADER(udunits2.h, UDUNITS2_DIR=0, [
-  AC_CHECK_HEADER(udunits2/udunits2.h, UDUNITS2_DIR=1,
+AC_CHECK_HEADERS(udunits2.h, UDUNITS2_DIR=0, [
+  AC_CHECK_HEADERS(udunits2/udunits2.h, UDUNITS2_DIR=1,
                   UD_ERROR="udunits2.h was not found") ])
 AC_CHECK_LIB(udunits2, ut_read_xml,
              LIBS="${LIBS} -ludunits2",
@@ -81,6 +81,36 @@ if test "${UD_ERROR}" != ""  ; then AC_MSG_FAILURE([
 --------------------------------------------------------------------------------
 ]) fi
 
+AC_MSG_CHECKING([for exception propagation in -ludunits2])
+AC_RUN_IFELSE([AC_LANG_PROGRAM(
+  [[
+    #include <stdexcept>
+    #include <cstdarg>
+    #ifdef HAVE_UDUNITS2_UDUNITS2_H
+    # include <udunits2/udunits2.h>
+    #else
+    # include <udunits2.h>
+    #endif
+    extern "C" {
+      int ud_handler(const char* fmt, va_list args) {
+        throw std::runtime_error("udunits error");
+        return 0;
+      }
+    }
+  ]],
+  [[
+    ut_set_error_message_handler(ud_handler);
+    try { ut_read_xml("nonexistent.xml"); }
+    catch (...) { return 0; }
+    return 1;
+  ]])],
+  [AC_MSG_RESULT([yes])],
+  [AC_MSG_RESULT([no])
+    AC_MSG_ERROR([The udunits2 library does not support exception propagation. Please reinstall it with -fexceptions enabled.])],
+  [AC_MSG_RESULT([unknown (cross-compiling)])
+    AC_MSG_WARN([Cross-compiling: cannot verify exception propagation in udunits2. Assuming it works.])]
+)
+
 AC_SUBST([CXX_STD])
 AC_SUBST([LIBS])
 AC_SUBST([UD_CPPFLAGS])

src/udunits.cpp

@@ -11,10 +11,11 @@
 #include "units_types.h"
 
 extern "C" {
-  void r_error_fn(const char* fmt, va_list args) {
+  int r_error_fn(const char* fmt, va_list args) {
     char buf[256];
     vsnprintf(buf, (size_t) 256, fmt, args);
     Rcpp::stop("%s", buf);
+    return 0;
   }
 }
 
@@ -42,7 +43,7 @@ void ud_init(CharacterVector path) {
   }
   if (sys == NULL)
     sys = ut_read_xml(NULL); // #nocov
-  ut_set_error_message_handler((ut_error_message_handler) r_error_fn);
+  ut_set_error_message_handler(r_error_fn);
   if (sys == NULL)
     stop("no database found!"); // #nocov
 }