X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=augeas-c.c;h=885b829d69ce0ee7cbe7278dad6289fdbdf60ee2;hb=05f00ac539c2cd0cf5dcbf90d031023a7e973ae7;hp=4db3f6ccfc24498b44e84226f1d57e6e8cfd1eba;hpb=f7638380d5d7b67773ae149c4d3206a716dc9a13;p=ocaml-augeas.git

diff --git a/augeas-c.c b/augeas-c.c
index 4db3f6c..885b829 100644
--- a/augeas-c.c
+++ b/augeas-c.c
@@ -102,7 +102,7 @@ raise_init_error (const char *msg)
 }
 
 /* Map OCaml flags to C flags. */
-static int flag_map[] = {
+static const int flag_map[] = {
   /* AugSaveBackup */  AUG_SAVE_BACKUP,
   /* AugSaveNewFile */ AUG_SAVE_NEWFILE,
   /* AugTypeCheck */   AUG_TYPE_CHECK,
@@ -154,8 +154,8 @@ CAMLprim value
 ocaml_augeas_create (value rootv, value loadpathv, value flagsv)
 {
   CAMLparam1 (rootv);
-  char *root = String_val (rootv);
-  char *loadpath;
+  const char *root = String_val (rootv);
+  const char *loadpath;
   int flags = 0, i;
   augeas_t t;
 
@@ -201,16 +201,16 @@ ocaml_augeas_get (value tv, value pathv)
   CAMLparam2 (tv, pathv);
   CAMLlocal2 (optv, v);
   augeas_t t = Augeas_t_val (tv);
-  char *path = String_val (pathv);
+  const char *path = String_val (pathv);
   const char *val;
   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");
@@ -227,7 +227,7 @@ ocaml_augeas_exists (value tv, value pathv)
   CAMLparam2 (tv, pathv);
   CAMLlocal1 (v);
   augeas_t t = Augeas_t_val (tv);
-  char *path = String_val (pathv);
+  const char *path = String_val (pathv);
   int r;
 
   r = aug_get (t, path, NULL);
@@ -249,8 +249,8 @@ ocaml_augeas_insert (value tv, value beforev, value pathv, value labelv)
 {
   CAMLparam4 (tv, beforev, pathv, labelv);
   augeas_t t = Augeas_t_val (tv);
-  char *path = String_val (pathv);
-  char *label = String_val (labelv);
+  const char *path = String_val (pathv);
+  const char *label = String_val (labelv);
   int before;
 
   before = beforev == Val_int (0) ? 0 : Int_val (Field (beforev, 0));
@@ -267,7 +267,7 @@ ocaml_augeas_rm (value tv, value pathv)
 {
   CAMLparam2 (tv, pathv);
   augeas_t t = Augeas_t_val (tv);
-  char *path = String_val (pathv);
+  const char *path = String_val (pathv);
   int r;
 
   r = aug_rm (t, path);
@@ -284,7 +284,7 @@ ocaml_augeas_match (value tv, value pathv)
   CAMLparam2 (tv, pathv);
   CAMLlocal3 (rv, v, cons);
   augeas_t t = Augeas_t_val (tv);
-  char *path = String_val (pathv);
+  const char *path = String_val (pathv);
   char **matches;
   int r, i;
 
@@ -314,7 +314,7 @@ ocaml_augeas_count_matches (value tv, value pathv)
 {
   CAMLparam2 (tv, pathv);
   augeas_t t = Augeas_t_val (tv);
-  char *path = String_val (pathv);
+  const char *path = String_val (pathv);
   int r;
 
   r = aug_match (t, path, NULL);
@@ -349,3 +349,66 @@ ocaml_augeas_load (value tv)
 
   CAMLreturn (Val_unit);
 }
+
+/* val set : t -> -> path -> value option -> unit */
+CAMLprim value
+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));
+
+  if (aug_set (t, path, val) == -1)
+    raise_error (t, "Augeas.set");
+
+  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)
+{
+  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);
+}