Split the Optstring_val helper

[ocaml-augeas.git] / augeas-c.c

diff --git a/augeas-c.c b/augeas-c.c
index 09d3add..cf8e37f 100644 (file)
--- a/augeas-c.c
+++ b/augeas-c.c
@@ -29,6 +29,8 @@
 #include <caml/callback.h>
 #include <caml/custom.h>
 
+#include <stdbool.h>
+
 #ifdef __GNUC__
   #define NORETURN __attribute__ ((noreturn))
 #else
@@ -73,9 +75,11 @@ static const int error_map[] = {
 };
 static const int error_map_len = sizeof error_map / sizeof error_map[0];
 
-/* Raise an Augeas.Error exception. */
+/* Raise an Augeas.Error exception, and optionally close the
+ * specified handle.
+ */
 static void
-raise_error (augeas_t t, const char *msg)
+raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle)
 {
   value *exn = caml_named_value ("Augeas.Error");
   value args[4];
@@ -85,8 +89,11 @@ raise_error (augeas_t t, const char *msg)
   int ocaml_code = -1;
   int i;
 
-  if (code == AUG_ENOMEM)
+  if (code == AUG_ENOMEM) {
+    if (close_handle)
+      aug_close (t);
     caml_raise_out_of_memory ();
+  }
 
   aug_err_minor = aug_error_minor_message (t);
   aug_err_details = aug_error_details (t);
@@ -107,8 +114,12 @@ raise_error (augeas_t t, const char *msg)
   args[2] = caml_copy_string (aug_err_minor ? : "");
   args[3] = caml_copy_string (aug_err_details ? : "");
 
+  if (close_handle)
+    aug_close (t);
+
   caml_raise_with_args (*exn, 4, args);
 }
+#define raise_error(t, msg) raise_error_and_maybe_close(t, msg, false)
 
 static void
 raise_init_error (const char *msg)
@@ -125,6 +136,15 @@ raise_init_error (const char *msg)
   caml_raise_with_args (*exn, 4, args);
 }
 
+static const char *
+Optstring_val (value strv)
+{
+  if (strv == Val_int (0))      /* None */
+    return NULL;
+  else                          /* Some string */
+    return String_val (Field (strv, 0));
+}
+
 /* Map OCaml flags to C flags. */
 static const int flag_map[] = {
   /* AugSaveBackup */  AUG_SAVE_BACKUP,
@@ -133,6 +153,10 @@ static const int flag_map[] = {
   /* AugNoStdinc */    AUG_NO_STDINC,
   /* AugSaveNoop */    AUG_SAVE_NOOP,
   /* AugNoLoad */      AUG_NO_LOAD,
+  /* AugNoModlAutoload */ AUG_NO_MODL_AUTOLOAD,
+  /* AugEnableSpan */  AUG_ENABLE_SPAN,
+  /* AugNoErrClose */  AUG_NO_ERR_CLOSE,
+  /* AugTraceModuleLoading */ AUG_TRACE_MODULE_LOADING,
 };
 
 /* Wrap and unwrap augeas_t handles, with a finalizer. */
@@ -180,27 +204,26 @@ ocaml_augeas_create (value rootv, value loadpathv, value flagsv)
 {
   CAMLparam1 (rootv);
   const char *root = String_val (rootv);
-  const char *loadpath;
+  const char *loadpath = Optstring_val (loadpathv);
   int flags = 0, i;
   augeas_t t;
 
-  /* Optional loadpath. */
-  loadpath =
-    loadpathv == Val_int (0)
-    ? NULL
-    : String_val (Field (loadpathv, 0));
-
   /* Convert list of flags to C. */
   for (; flagsv != Val_int (0); flagsv = Field (flagsv, 1)) {
     i = Int_val (Field (flagsv, 0));
     flags |= flag_map[i];
   }
 
-  t = aug_init (root, loadpath, flags);
+  /* Pass AUG_NO_ERR_CLOSE so we raise a detailed Augeas.Error. */
+  t = aug_init (root, loadpath, flags | AUG_NO_ERR_CLOSE);
 
   if (t == NULL)
     raise_init_error ("Augeas.create");
 
+  if (aug_error (t) != AUG_NOERROR) {
+    raise_error_and_maybe_close (t, "Augeas.init", true);
+  }
+
   CAMLreturn (Val_augeas_t (t));
 }
 
@@ -382,12 +405,7 @@ ocaml_augeas_set (value tv, value pathv, value valuev)
   CAMLparam3 (tv, pathv, valuev);
   augeas_t t = Augeas_t_val (tv);
   const char *path = String_val (pathv);
-  const char *val;
-
-  val =
-    valuev == Val_int (0)
-    ? NULL
-    : String_val (Field (valuev, 0));
+  const char *val = Optstring_val (valuev);
 
   if (aug_set (t, path, val) == -1)
     raise_error (t, "Augeas.set");