lib: Allow compilation with Augeas < 1.8.0 which lacked ‘aug_source’ function.

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

diff --git a/augeas-c.c b/augeas-c.c
index f4396cb..3c523ea 100644 (file)
--- a/augeas-c.c
+++ b/augeas-c.c
@@ -1,5 +1,5 @@
 /* Augeas OCaml bindings
- * Copyright (C) 2008-2012 Red Hat Inc., Richard W.M. Jones
+ * Copyright (C) 2008-2017 Red Hat Inc., Richard W.M. Jones
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -206,16 +206,16 @@ ocaml_augeas_get (value tv, value pathv)
   int r;
 
   r = aug_get (t, path, &val);
-  if (r == 1) {                        /* Return Some val */
+  if (r == 1 && val) {         /* Return Some val */
     v = caml_copy_string (val);
     optv = caml_alloc (1, 0);
     Field (optv, 0) = v;
-  } else if (r == 0)           /* Return None */
+  } else if (r == 0 || !val)   /* Return None */
     optv = Val_int (0);
   else if (r == -1)            /* Error or multiple matches */
     raise_error (t, "Augeas.get");
   else
-    failwith ("Augeas.get: bad return value");
+    caml_failwith ("Augeas.get: bad return value");
 
   CAMLreturn (optv);
 }
@@ -369,3 +369,50 @@ ocaml_augeas_set (value tv, value pathv, value valuev)
 
   CAMLreturn (Val_unit);
 }
+
+/* val transform : t -> string -> string -> transform_mode -> unit */
+CAMLprim value
+ocaml_augeas_transform (value tv, value lensv, value filev, value modev)
+{
+  CAMLparam4 (tv, lensv, filev, modev);
+  augeas_t t = Augeas_t_val (tv);
+  const char *lens = String_val (lensv);
+  const char *file = String_val (filev);
+  const int excl = Int_val (modev) == 1 ? 1 : 0;
+
+  if (aug_transform (t, lens, file, excl) == -1)
+    raise_error (t, "Augeas.transform");
+
+  CAMLreturn (Val_unit);
+}
+
+/* val source : t -> path -> path option */
+CAMLprim value
+ocaml_augeas_source (value tv, value pathv)
+{
+#ifdef HAVE_AUG_SOURCE
+  CAMLparam2 (tv, pathv);
+  CAMLlocal2 (optv, v);
+  augeas_t t = Augeas_t_val (tv);
+  const char *path = String_val (pathv);
+  char *file_path;
+  int r;
+
+  r = aug_source (t, path, &file_path);
+  if (r == 0) {
+    if (file_path) {   /* Return Some file_path */
+      v = caml_copy_string (file_path);
+      optv = caml_alloc (1, 0);
+      Field (optv, 0) = v;
+      free (file_path);
+    } else             /* Return None */
+      optv = Val_int (0);
+  }
+  else                 /* Error */
+    raise_error (t, "Augeas.source");
+
+  CAMLreturn (optv);
+#else
+  caml_failwith ("Augeas.source: function not implemented");
+#endif
+}