mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-09 14:18:07 +02:00
856361ff5b
* dbus/dbus-sysdeps.c (_dbus_become_daemon): write the pidfile here in the parent process, so we can return an error if it fails. Also, move some of the code into the child so the parent is less hosed if we fail midway through. * bus/bus.c (bus_context_new): move pidfile detection further up in the function, before we start overwriting sockets and such. * bus/messagebus.in: adjust this a bit, not sure if it will work. * configure.in: add --with-system-pid-file and --with-system-socket 2003-04-06 Colin Walters <walters@verbum.org> * configure.in (DBUS_SYSTEM_PID_FILE): New variable. * bus/system.conf.in: Declare a pidfile. * bus/bus.c (bus_context_new): Test for an existing pid file, and create one (if appropriate). * bus/config-parser.c (enum ElementType) [ELEMENT_PIDFILE]: New. (struct BusConfigParser) [pidfile]: New. (element_type_to_name, merge_included, start_busconfig_child) (bus_config_parser_end_element, bus_config_parser_content): Handle it. (bus_config_parser_unref): Free it. (bus_config_parser_get_pidfile): New function. * bus/config-parser.h (_dbus_write_pid_file): Prototype. * dbus/dbus-errors.h (DBUS_ERROR_PIDFILE_EXISTS): New error. * dbus/dbus-sysdeps.c (_dbus_write_pid_file): New function. * dbus/dbus-sysdeps.h: Prototype it.
73 lines
3.5 KiB
C
73 lines
3.5 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* config-parser.h XML-library-agnostic configuration file parser
|
|
*
|
|
* Copyright (C) 2003 Red Hat, Inc.
|
|
*
|
|
* Licensed under the Academic Free License version 1.2
|
|
*
|
|
* 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 BUS_CONFIG_PARSER_H
|
|
#define BUS_CONFIG_PARSER_H
|
|
|
|
#include <config.h>
|
|
|
|
#include <dbus/dbus.h>
|
|
#include <dbus/dbus-string.h>
|
|
#include <dbus/dbus-list.h>
|
|
|
|
/* Whatever XML library we're using just pushes data into this API */
|
|
|
|
typedef struct BusConfigParser BusConfigParser;
|
|
|
|
BusConfigParser* bus_config_parser_new (const DBusString *basedir);
|
|
void bus_config_parser_ref (BusConfigParser *parser);
|
|
void bus_config_parser_unref (BusConfigParser *parser);
|
|
dbus_bool_t bus_config_parser_check_doctype (BusConfigParser *parser,
|
|
const char *doctype,
|
|
DBusError *error);
|
|
dbus_bool_t bus_config_parser_start_element (BusConfigParser *parser,
|
|
const char *element_name,
|
|
const char **attribute_names,
|
|
const char **attribute_values,
|
|
DBusError *error);
|
|
dbus_bool_t bus_config_parser_end_element (BusConfigParser *parser,
|
|
const char *element_name,
|
|
DBusError *error);
|
|
dbus_bool_t bus_config_parser_content (BusConfigParser *parser,
|
|
const DBusString *content,
|
|
DBusError *error);
|
|
dbus_bool_t bus_config_parser_finished (BusConfigParser *parser,
|
|
DBusError *error);
|
|
|
|
/* Functions for extracting the parse results */
|
|
const char* bus_config_parser_get_user (BusConfigParser *parser);
|
|
const char* bus_config_parser_get_type (BusConfigParser *parser);
|
|
DBusList** bus_config_parser_get_addresses (BusConfigParser *parser);
|
|
DBusList** bus_config_parser_get_mechanisms (BusConfigParser *parser);
|
|
dbus_bool_t bus_config_parser_get_fork (BusConfigParser *parser);
|
|
const char* bus_config_parser_get_pidfile (BusConfigParser *parser);
|
|
DBusList** bus_config_parser_get_service_dirs (BusConfigParser *parser);
|
|
|
|
/* Loader functions (backended off one of the XML parsers). Returns a
|
|
* finished ConfigParser.
|
|
*/
|
|
BusConfigParser* bus_config_load (const DBusString *file,
|
|
DBusError *error);
|
|
|
|
|
|
#endif /* BUS_CONFIG_PARSER_H */
|