mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-22 18:20:09 +01:00
dbus-viewer introspected and displayed the bus driver * dbus/dbus-object-tree.c (object_tree_test_iteration): add tests for a handler registered on "/" * dbus/dbus-object-tree.c (_dbus_decompose_path): fix to handle path "/" properly (run_decompose_tests): add tests for path decomposition * glib/dbus-gutils.c (_dbus_gutils_split_path): fix to handle "/" properly * glib/dbus-gobject.c (handle_introspect): fix quotes * test/glib/run-test.sh: support launching the bus, then running dbus-viewer * test/glib/test-service-glib.c (main): put in a trivial gobject subclass and register it on the connection * bus/driver.c (bus_driver_handle_introspect): implement introspection of the bus driver service * dbus/dbus-protocol.h: add #defines for the XML namespace, identifiers, doctype decl * bus/driver.c (bus_driver_handle_get_service_owner): handle attempts to get owner of DBUS_SERVICE_ORG_FREEDESKTOP_DBUS by returning the service unchanged. (bus_driver_handle_message): remove old check for reply_serial in method calls, now the message type deals with that (bus_driver_handle_message): handle NULL interface * glib/dbus-gproxy.c (dbus_g_proxy_get_bus_name): new function * glib/dbus-gloader-expat.c (description_load_from_string): allow -1 for len * tools/dbus-viewer.c: add support for introspecting a service on a bus * glib/dbus-gproxy.c (dbus_g_pending_call_ref): add (dbus_g_pending_call_unref): add
144 lines
3.1 KiB
C
144 lines
3.1 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* dbus-gutils.c Utils shared between convenience lib and installed lib
|
|
*
|
|
* Copyright (C) 2003 Red Hat, Inc.
|
|
*
|
|
* Licensed under the Academic Free License version 2.1
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include "dbus-gutils.h"
|
|
#include "dbus-gtest.h"
|
|
#include <string.h>
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_THIS
|
|
|
|
char**
|
|
_dbus_gutils_split_path (const char *path)
|
|
{
|
|
int len;
|
|
char **split;
|
|
int n_components;
|
|
int i, j, comp;
|
|
|
|
len = strlen (path);
|
|
|
|
n_components = 0;
|
|
if (path[1] != '\0') /* if not "/" */
|
|
{
|
|
i = 0;
|
|
while (i < len)
|
|
{
|
|
if (path[i] == '/')
|
|
n_components += 1;
|
|
++i;
|
|
}
|
|
}
|
|
|
|
split = g_new0 (char*, n_components + 1);
|
|
|
|
comp = 0;
|
|
if (n_components == 0)
|
|
i = 1;
|
|
else
|
|
i = 0;
|
|
while (comp < n_components)
|
|
{
|
|
if (path[i] == '/')
|
|
++i;
|
|
j = i;
|
|
|
|
while (j < len && path[j] != '/')
|
|
++j;
|
|
|
|
/* Now [i, j) is the path component */
|
|
g_assert (i < j);
|
|
g_assert (path[i] != '/');
|
|
g_assert (j == len || path[j] == '/');
|
|
|
|
split[comp] = g_strndup (&path[i], j - i + 1);
|
|
|
|
split[comp][j-i] = '\0';
|
|
|
|
++comp;
|
|
i = j;
|
|
}
|
|
g_assert (i == len);
|
|
|
|
return split;
|
|
}
|
|
|
|
const char *
|
|
_dbus_gutils_type_to_string (int type)
|
|
{
|
|
switch (type)
|
|
{
|
|
case DBUS_TYPE_INVALID:
|
|
return "invalid";
|
|
case DBUS_TYPE_BOOLEAN:
|
|
return "boolean";
|
|
case DBUS_TYPE_BYTE:
|
|
return "byte";
|
|
case DBUS_TYPE_INT16:
|
|
return "int16";
|
|
case DBUS_TYPE_UINT16:
|
|
return "uint16";
|
|
case DBUS_TYPE_INT32:
|
|
return "int32";
|
|
case DBUS_TYPE_UINT32:
|
|
return "uint32";
|
|
case DBUS_TYPE_DOUBLE:
|
|
return "double";
|
|
case DBUS_TYPE_STRING:
|
|
return "string";
|
|
case DBUS_TYPE_OBJECT_PATH:
|
|
return "object_path";
|
|
case DBUS_TYPE_SIGNATURE:
|
|
return "signature";
|
|
case DBUS_TYPE_STRUCT:
|
|
return "struct";
|
|
case DBUS_TYPE_ARRAY:
|
|
return "array";
|
|
case DBUS_TYPE_VARIANT:
|
|
return "variant";
|
|
case DBUS_STRUCT_BEGIN_CHAR:
|
|
return "begin_struct";
|
|
case DBUS_STRUCT_END_CHAR:
|
|
return "end_struct";
|
|
default:
|
|
return "unknown";
|
|
}
|
|
}
|
|
|
|
#ifdef DBUS_BUILD_TESTS
|
|
|
|
/**
|
|
* @ingroup DBusGLibInternals
|
|
* Unit test for GLib utils internals
|
|
* @returns #TRUE on success.
|
|
*/
|
|
gboolean
|
|
_dbus_gutils_test (const char *test_data_dir)
|
|
{
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
#endif /* DBUS_BUILD_TESTS */
|
|
|
|
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
|