From e2c156ee15f40b13a451d6223b407de8fc7f0517 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Nov 2005 01:05:48 +0000 Subject: [PATCH] implement XDG basedir subset, which we will use to read user configured browser domains from git-svn-id: file:///home/lennart/svn/public/avahi/trunk@927 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/Makefile.am | 10 ++++-- avahi-client/xdg-config-test.c | 38 ++++++++++++++++++++ avahi-client/xdg-config.c | 66 ++++++++++++++++++++++++++++++++++ avahi-client/xdg-config.h | 29 +++++++++++++++ 4 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 avahi-client/xdg-config-test.c create mode 100644 avahi-client/xdg-config.c create mode 100644 avahi-client/xdg-config.h diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am index 888b917..463ea39 100644 --- a/avahi-client/Makefile.am +++ b/avahi-client/Makefile.am @@ -33,7 +33,8 @@ if ENABLE_TESTS noinst_PROGRAMS = \ client-test \ - srv-test + srv-test \ + xdg-config-test endif @@ -44,7 +45,8 @@ libavahi_client_la_SOURCES = \ entrygroup.c \ browser.c \ resolver.c \ - publish.h lookup.h + publish.h lookup.h \ + xdg-config.c xdg-config.h libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\" libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common-pic.la @@ -58,4 +60,8 @@ srv_test_SOURCES = srv-test.c srv_test_CFLAGS = $(AM_CFLAGS) srv_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la +xdg_config_test_SOURCES = xdg-config-test.c xdg-config.c xdg-config.h +xdg_config_test_CFLAGS = $(AM_CFLAGS) +xdg_config_test_LDADD = $(AM_LDADD) + endif diff --git a/avahi-client/xdg-config-test.c b/avahi-client/xdg-config-test.c new file mode 100644 index 0000000..fe267f2 --- /dev/null +++ b/avahi-client/xdg-config-test.c @@ -0,0 +1,38 @@ +/* $Id$ */ + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi 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 Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include "xdg-config.h" + +int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + + FILE *f; + + f = avahi_xdg_config_open("foo"); + + if (f) + fclose(f); +} diff --git a/avahi-client/xdg-config.c b/avahi-client/xdg-config.c new file mode 100644 index 0000000..ea4bb98 --- /dev/null +++ b/avahi-client/xdg-config.c @@ -0,0 +1,66 @@ +/* $Id$ */ + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi 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 Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include + +#include "xdg-config.h" + +FILE *avahi_xdg_config_open(const char *filename) { + FILE *f; + const char *e, *d; + char fn[PATH_MAX], *p = NULL, buf[2048], *s = NULL; + + assert(filename); + + if ((e = getenv("XDG_CONFIG_HOME")) && *e) + snprintf(p = fn, sizeof(fn), "%s/%s", e, filename); + else if ((e = getenv("HOME")) && *e) + snprintf(p = fn, sizeof(fn), "%s/.config/%s", e, filename); + + if (p) { + if ((f = fopen(p, "r"))) + return f; + else if (errno != ENOENT) + return NULL; + } + + if (!(d = getenv("XDG_CONFIG_DIRS")) || !*d) + d = "/etc/xdg"; + + snprintf(buf, sizeof(buf), "%s", d); + + for (e = strtok_r(buf, ":", &s); e; e = strtok_r(NULL, ":", &s)) { + snprintf(fn, sizeof(fn), "%s/%s", e, filename); + + if ((f = fopen(fn, "r"))) + return f; + } + + return NULL; +} diff --git a/avahi-client/xdg-config.h b/avahi-client/xdg-config.h new file mode 100644 index 0000000..88f66a8 --- /dev/null +++ b/avahi-client/xdg-config.h @@ -0,0 +1,29 @@ +#ifndef fooxdgconfighfoo +#define fooxdgconfighfoo + +/* $Id$ */ + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi 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 Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#include + +FILE *avahi_xdg_config_open(const char *filename); + +#endif -- 2.39.5