Starting to work on actually registering the backends as mounted

Original git commit by Alexander Larsson <alex@greebo.(none)> at 1169826631 +0100

svn path=/trunk/; revision=269

1 files changed, 180 insertions, 0 deletions

diff --git a/common/gmountspec.c b/common/gmountspec.c
new file mode 100644
index 00000000..d45ba81d
--- /dev/null
+++ b/common/gmountspec.c
@@ -0,0 +1,180 @@
+#include <config.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <glib/gi18n-lib.h>
+
+#include "gdbusutils.h"
+#include "gmountspec.h"
+
+static int
+item_compare (const void *_a, const void *_b)
+{
+  const GMountSpecItem *a = _a;
+  const GMountSpecItem *b = _b;
+
+  return strcmp (a->key, b->key);
+}
+
+GMountSpec *
+g_mount_spec_new (void)
+{
+  GMountSpec *spec;
+
+  spec = g_new0 (GMountSpec, 1);
+  spec->items = g_array_new (FALSE, TRUE, sizeof (GMountSpecItem));
+
+  return spec;
+}
+
+static void 
+add_item (GMountSpec *spec,
+	  const char *key,
+	  char *value)
+{
+  GMountSpecItem item;
+
+  item.key = g_strdup (key);
+  item.value = value;
+
+  g_array_append_val (spec->items, item);
+}
+
+
+void 
+g_mount_spec_add_item (GMountSpec *spec,
+		       const char *key,
+		       const char *value)
+{
+  add_item (spec, key, g_strdup (value));
+  g_array_sort (spec->items, item_compare);
+}
+
+
+void
+g_mount_spec_free (GMountSpec *spec)
+{
+  int i;
+  
+  g_free (spec->mount_prefix);
+  for (i = 0; i < spec->items->len; i++)
+    {
+      GMountSpecItem *item = &g_array_index (spec->items, GMountSpecItem, i);
+      g_free (item->key);
+      g_free (item->value);
+    }
+  g_array_free (spec->items, TRUE);
+  
+  g_free (spec);
+}
+
+GMountSpec *
+g_mount_spec_from_dbus (DBusMessageIter *iter)
+{
+  GMountSpec *spec;
+  DBusMessageIter array_iter, struct_iter, spec_iter;
+  const char *key;
+  char *value;
+  char *mount_prefix;
+
+  if (dbus_message_iter_get_arg_type (iter) != DBUS_TYPE_STRUCT)
+    return NULL;
+
+  dbus_message_iter_recurse (iter, &spec_iter);
+  
+  if (_g_dbus_message_iter_get_args (&spec_iter, NULL,
+				     G_DBUS_TYPE_CSTRING, &mount_prefix,
+				     0))
+    return NULL;
+
+  spec = g_mount_spec_new ();
+  spec->mount_prefix = mount_prefix;
+  
+  if (dbus_message_iter_get_arg_type (&spec_iter) != DBUS_TYPE_ARRAY ||
+      dbus_message_iter_get_element_type (&spec_iter) != DBUS_TYPE_STRUCT)
+    {
+      g_mount_spec_free (spec);
+      return NULL;
+    }
+  
+  dbus_message_iter_recurse (iter, &array_iter);
+  while (dbus_message_iter_get_arg_type (&array_iter) == DBUS_TYPE_STRUCT)
+    {
+      dbus_message_iter_recurse (&array_iter, &struct_iter);
+      if (_g_dbus_message_iter_get_args (&struct_iter, NULL,
+					 DBUS_TYPE_STRING, &key,
+					 G_DBUS_TYPE_CSTRING, &value,
+					 0))
+	add_item (spec, key, value);
+      dbus_message_iter_next (&array_iter);
+    }
+
+  dbus_message_iter_next (iter);
+  
+  /* Sort on key */
+  g_array_sort (spec->items, item_compare);
+  
+  return spec;
+}
+
+void
+g_mount_spec_to_dbus (DBusMessageIter *iter,
+		      GMountSpec      *spec)
+{
+  DBusMessageIter spec_iter, array_iter, item_iter;
+  int i;
+
+  if (!dbus_message_iter_open_container (iter,
+					 DBUS_TYPE_STRUCT,
+					 DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING
+					 DBUS_TYPE_ARRAY_AS_STRING 
+ 					   DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+					     DBUS_TYPE_STRING_AS_STRING
+					     DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING
+ 					   DBUS_STRUCT_END_CHAR_AS_STRING,
+					 &spec_iter))
+    _g_dbus_oom ();
+
+  _g_dbus_message_iter_append_cstring (&spec_iter, spec->mount_prefix?spec->mount_prefix:"");
+
+  if (!dbus_message_iter_open_container (&spec_iter,
+					 DBUS_TYPE_ARRAY,
+					   DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+					     DBUS_TYPE_STRING_AS_STRING
+					     DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING
+ 					   DBUS_STRUCT_END_CHAR_AS_STRING,
+					 &array_iter))
+    _g_dbus_oom ();
+
+
+  for (i = 0; i < spec->items->len; i++)
+    {
+      GMountSpecItem *item = &g_array_index (spec->items, GMountSpecItem, i);
+
+      if (!dbus_message_iter_open_container (&array_iter,
+					     DBUS_TYPE_STRUCT,
+					     DBUS_TYPE_STRING_AS_STRING
+					     DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING,
+					     &item_iter))
+	_g_dbus_oom ();
+
+      if (!dbus_message_iter_append_basic (&item_iter, DBUS_TYPE_STRING,
+					   &item->key))
+	_g_dbus_oom ();
+      _g_dbus_message_iter_append_cstring  (&item_iter, item->value);
+      
+      if (!dbus_message_iter_close_container (&array_iter, &item_iter))
+	_g_dbus_oom ();
+      
+    }
+  
+  if (!dbus_message_iter_close_container (&spec_iter, &array_iter))
+    _g_dbus_oom ();
+  
+  
+  
+  if (!dbus_message_iter_close_container (iter, &spec_iter))
+    _g_dbus_oom ();
+    
+}