mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-06-01 15:18:19 +02:00
d8155bf51b
* configure.in (LT_CURRENT, LT_AGE): increment current and age to reflect addition of interfaces. * doc/dbus-specification.xml: describe a new org.freedesktop.DBus.Peer.GetMachineId method * dbus/dbus-string.c (_dbus_string_skip_white_reverse): new function (_dbus_string_skip_white, _dbus_string_skip_blank): use new DBUS_IS_ASCII_BLANK, DBUS_IS_ASCII_WHITE macros and fix assertion at end of skip_white (_dbus_string_chop_white): new function * bus/connection.c (bus_connections_setup_connection): call dbus_connection_set_route_peer_messages. * dbus/dbus-connection.c (_dbus_connection_peer_filter_unlocked_no_update): modify to support a GetMachineId method. Also, support a new flag to let the bus pass peer methods through to apps on the bus, which can be set with dbus_connection_set_route_peer_messages. Finally, handle and return an error for anything unknown on the Peer interface, which will allow us to extend the Peer interface in the future without fear that we're now intercepting something apps were wanting to see. * tools/dbus-uuidgen.c: a thin wrapper around the functions in dbus/dbus-uuidgen.c * dbus/dbus-uuidgen.c: implement the bulk of the dbus-uuidgen binary here, since most of the code is already in libdbus * dbus/dbus-sysdeps.c (_dbus_read_local_machine_uuid): read the uuid from the system config file * dbus/dbus-internals.c (_dbus_generate_uuid, _dbus_uuid_encode) (_dbus_read_uuid_file_without_creating) (_dbus_create_uuid_file_exclusively, _dbus_read_uuid_file): new uuid-related functions, partly factored out from dbus-server.c * dbus/dbus-sysdeps.c (_dbus_error_from_errno): convert EEXIST to DBUS_ERROR_FILE_EXISTS instead of EEXIST * dbus/dbus-protocol.h (DBUS_ERROR_FILE_EXISTS): add file exists error * tools/dbus-cleanup-sockets.1: explain what the point of this thing is a bit more * autogen.sh (run_configure): add --config-cache to default configure args * dbus/dbus-internals.h (_DBUS_ASSERT_ERROR_IS_SET): disable the error set/clear assertions when DBUS_DISABLE_CHECKS is defined * tools/dbus-launch.c (main): if xdisplay hasn't been opened, don't try to save address, fixes crash in make check
126 lines
4.3 KiB
C
126 lines
4.3 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* dbus-string-private.h String utility class (internal to D-Bus implementation)
|
|
*
|
|
* Copyright (C) 2002, 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
|
|
*
|
|
*/
|
|
|
|
#ifndef DBUS_STRING_PRIVATE_H
|
|
#define DBUS_STRING_PRIVATE_H
|
|
|
|
#include <config.h>
|
|
|
|
#include <dbus/dbus-memory.h>
|
|
#include <dbus/dbus-types.h>
|
|
|
|
#ifndef DBUS_CAN_USE_DBUS_STRING_PRIVATE
|
|
#error "Don't go including dbus-string-private.h for no good reason"
|
|
#endif
|
|
|
|
DBUS_BEGIN_DECLS
|
|
|
|
/**
|
|
* @brief Internals of DBusString.
|
|
*
|
|
* DBusString internals. DBusString is an opaque objects, it must be
|
|
* used via accessor functions.
|
|
*/
|
|
typedef struct
|
|
{
|
|
unsigned char *str; /**< String data, plus nul termination */
|
|
int len; /**< Length without nul */
|
|
int allocated; /**< Allocated size of data */
|
|
int max_length; /**< Max length of this string, without nul byte */
|
|
unsigned int constant : 1; /**< String data is not owned by DBusString */
|
|
unsigned int locked : 1; /**< DBusString has been locked and can't be changed */
|
|
unsigned int invalid : 1; /**< DBusString is invalid (e.g. already freed) */
|
|
unsigned int align_offset : 3; /**< str - align_offset is the actual malloc block */
|
|
} DBusRealString;
|
|
|
|
|
|
/**
|
|
* @defgroup DBusStringInternals DBusString implementation details
|
|
* @ingroup DBusInternals
|
|
* @brief DBusString implementation details
|
|
*
|
|
* The guts of DBusString.
|
|
*
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* This is the maximum max length (and thus also the maximum length)
|
|
* of a DBusString
|
|
*/
|
|
#define _DBUS_STRING_MAX_MAX_LENGTH (_DBUS_INT32_MAX - _DBUS_STRING_ALLOCATION_PADDING)
|
|
|
|
/**
|
|
* Checks a bunch of assertions about a string object
|
|
*
|
|
* @param real the DBusRealString
|
|
*/
|
|
#define DBUS_GENERIC_STRING_PREAMBLE(real) _dbus_assert ((real) != NULL); _dbus_assert (!(real)->invalid); _dbus_assert ((real)->len >= 0); _dbus_assert ((real)->allocated >= 0); _dbus_assert ((real)->max_length >= 0); _dbus_assert ((real)->len <= ((real)->allocated - _DBUS_STRING_ALLOCATION_PADDING)); _dbus_assert ((real)->len <= (real)->max_length)
|
|
|
|
/**
|
|
* Checks assertions about a string object that needs to be
|
|
* modifiable - may not be locked or const. Also declares
|
|
* the "real" variable pointing to DBusRealString.
|
|
* @param str the string
|
|
*/
|
|
#define DBUS_STRING_PREAMBLE(str) DBusRealString *real = (DBusRealString*) str; \
|
|
DBUS_GENERIC_STRING_PREAMBLE (real); \
|
|
_dbus_assert (!(real)->constant); \
|
|
_dbus_assert (!(real)->locked)
|
|
|
|
/**
|
|
* Checks assertions about a string object that may be locked but
|
|
* can't be const. i.e. a string object that we can free. Also
|
|
* declares the "real" variable pointing to DBusRealString.
|
|
*
|
|
* @param str the string
|
|
*/
|
|
#define DBUS_LOCKED_STRING_PREAMBLE(str) DBusRealString *real = (DBusRealString*) str; \
|
|
DBUS_GENERIC_STRING_PREAMBLE (real); \
|
|
_dbus_assert (!(real)->constant)
|
|
|
|
/**
|
|
* Checks assertions about a string that may be const or locked. Also
|
|
* declares the "real" variable pointing to DBusRealString.
|
|
* @param str the string.
|
|
*/
|
|
#define DBUS_CONST_STRING_PREAMBLE(str) const DBusRealString *real = (DBusRealString*) str; \
|
|
DBUS_GENERIC_STRING_PREAMBLE (real)
|
|
|
|
/**
|
|
* Checks for ASCII blank byte
|
|
* @param c the byte
|
|
*/
|
|
#define DBUS_IS_ASCII_BLANK(c) ((c) == ' ' || (c) == '\t')
|
|
|
|
/**
|
|
* Checks for ASCII whitespace byte
|
|
* @param c the byte
|
|
*/
|
|
#define DBUS_IS_ASCII_WHITE(c) ((c) == ' ' || (c) == '\t' || (c) == '\n' || (c) == '\r')
|
|
|
|
/** @} */
|
|
|
|
DBUS_END_DECLS
|
|
|
|
#endif /* DBUS_STRING_PRIVATE_H */
|