From 2c21044f05e32ec483b6ab13e175278779e9ebe3 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 7 May 2012 18:55:45 +0200 Subject: [PATCH 1/1] util: split-out conf-file.[ch] --- Makefile.am | 6 +- src/binfmt/binfmt.c | 1 + src/modules-load/modules-load.c | 1 + src/shared/conf-files.c | 151 ++++++++++++++++++++++++++++++++ src/shared/conf-files.h | 31 +++++++ src/shared/install.c | 1 + src/shared/util.c | 114 ------------------------ src/shared/util.h | 3 - src/sysctl/sysctl.c | 1 + src/tmpfiles/tmpfiles.c | 1 + src/udev/udev-rules.c | 1 + 11 files changed, 190 insertions(+), 121 deletions(-) create mode 100644 src/shared/conf-files.c create mode 100644 src/shared/conf-files.h diff --git a/Makefile.am b/Makefile.am index c85a401db..2bc8e01c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -547,6 +547,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/ioprio.h \ src/shared/socket-util.c \ src/shared/socket-util.h \ + src/shared/conf-files.c \ + src/shared/conf-files.h \ src/shared/cgroup-util.c \ src/shared/cgroup-util.h \ src/shared/cgroup-show.c \ @@ -564,10 +566,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/spawn-polkit-agent.c \ src/shared/spawn-polkit-agent.h -libsystemd_shared_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ libsystemd-dbus.la diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index 5bd763339..0399ab75e 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -31,6 +31,7 @@ #include "hashmap.h" #include "strv.h" #include "util.h" +#include "conf-files.h" static int delete_rule(const char *rule) { char *x, *fn = NULL, *e; diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 0f2144c2e..c78f7d8aa 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -31,6 +31,7 @@ #include "log.h" #include "util.h" #include "strv.h" +#include "conf-files.h" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-nonliteral" diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c new file mode 100644 index 000000000..019fadcf5 --- /dev/null +++ b/src/shared/conf-files.c @@ -0,0 +1,151 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd 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. + + systemd 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 systemd; If not, see . +***/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "macro.h" +#include "util.h" +#include "missing.h" +#include "log.h" +#include "strv.h" +#include "hashmap.h" +#include "conf-files.h" + +static int files_add(Hashmap *h, const char *path, const char *suffix) { + DIR *dir; + struct dirent buffer, *de; + int r = 0; + + dir = opendir(path); + if (!dir) { + if (errno == ENOENT) + return 0; + return -errno; + } + + for (;;) { + int k; + char *p; + + k = readdir_r(dir, &buffer, &de); + if (k != 0) { + r = -k; + goto finish; + } + + if (!de) + break; + + if (!dirent_is_file_with_suffix(de, suffix)) + continue; + + if (asprintf(&p, "%s/%s", path, de->d_name) < 0) { + r = -ENOMEM; + goto finish; + } + + if (hashmap_put(h, file_name_from_path(p), p) <= 0) { + log_debug("Skip overridden file: %s.", p); + free(p); + } + } + +finish: + closedir(dir); + return r; +} + +static int base_cmp(const void *a, const void *b) { + const char *s1, *s2; + + s1 = *(char * const *)a; + s2 = *(char * const *)b; + return strcmp(file_name_from_path(s1), file_name_from_path(s2)); +} + +int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs) { + Hashmap *fh = NULL; + char **files = NULL; + const char **p; + int r = 0; + + assert(dirs); + + fh = hashmap_new(string_hash_func, string_compare_func); + if (!fh) { + r = -ENOMEM; + goto finish; + } + + STRV_FOREACH(p, dirs) { + if (files_add(fh, *p, suffix) < 0) { + log_error("Failed to search for files."); + r = -EINVAL; + goto finish; + } + } + + files = hashmap_get_strv(fh); + if (files == NULL) { + log_error("Failed to compose list of files."); + r = -ENOMEM; + goto finish; + } + qsort(files, hashmap_size(fh), sizeof(char *), base_cmp); + +finish: + hashmap_free(fh); + *strv = files; + return r; +} + +int conf_files_list(char ***strv, const char *suffix, const char *dir, ...) { + char **dirs = NULL; + va_list ap; + int r; + + va_start(ap, dir); + dirs = strv_new_ap(dir, ap); + va_end(ap); + if (!dirs) { + r = -ENOMEM; + goto finish; + } + + if (!strv_path_canonicalize(dirs)) { + r = -ENOMEM; + goto finish; + } + strv_uniq(dirs); + + r = conf_files_list_strv(strv, suffix, (const char **)dirs); + +finish: + strv_free(dirs); + return r; +} diff --git a/src/shared/conf-files.h b/src/shared/conf-files.h new file mode 100644 index 000000000..f37ee1f3d --- /dev/null +++ b/src/shared/conf-files.h @@ -0,0 +1,31 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#ifndef fooconffileshfoo +#define fooconffileshfoo + +/*** + This file is part of systemd. + + Copyright 2010-2012 Lennart Poettering + Copyright 2010-2012 Kay Sievers + + systemd 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. + + systemd 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 systemd; If not, see . +***/ + +#include "macro.h" + +int conf_files_list(char ***strv, const char *suffix, const char *dir, ...); +int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs); + +#endif diff --git a/src/shared/install.c b/src/shared/install.c index a982c5414..a77dfc77e 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -34,6 +34,7 @@ #include "unit-name.h" #include "install.h" #include "conf-parser.h" +#include "conf-files.h" typedef struct { char *name; diff --git a/src/shared/util.c b/src/shared/util.c index 2bfa2cb4e..d6f5661c2 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -4863,120 +4863,6 @@ int vt_disallocate(const char *name) { return 0; } -static int files_add(Hashmap *h, const char *path, const char *suffix) { - DIR *dir; - struct dirent buffer, *de; - int r = 0; - - dir = opendir(path); - if (!dir) { - if (errno == ENOENT) - return 0; - return -errno; - } - - for (;;) { - int k; - char *p; - - k = readdir_r(dir, &buffer, &de); - if (k != 0) { - r = -k; - goto finish; - } - - if (!de) - break; - - if (!dirent_is_file_with_suffix(de, suffix)) - continue; - - if (asprintf(&p, "%s/%s", path, de->d_name) < 0) { - r = -ENOMEM; - goto finish; - } - - if (hashmap_put(h, file_name_from_path(p), p) <= 0) { - log_debug("Skip overridden file: %s.", p); - free(p); - } - } - -finish: - closedir(dir); - return r; -} - -static int base_cmp(const void *a, const void *b) { - const char *s1, *s2; - - s1 = *(char * const *)a; - s2 = *(char * const *)b; - return strcmp(file_name_from_path(s1), file_name_from_path(s2)); -} - -int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs) { - Hashmap *fh = NULL; - char **files = NULL; - const char **p; - int r = 0; - - assert(dirs); - - fh = hashmap_new(string_hash_func, string_compare_func); - if (!fh) { - r = -ENOMEM; - goto finish; - } - - STRV_FOREACH(p, dirs) { - if (files_add(fh, *p, suffix) < 0) { - log_error("Failed to search for files."); - r = -EINVAL; - goto finish; - } - } - - files = hashmap_get_strv(fh); - if (files == NULL) { - log_error("Failed to compose list of files."); - r = -ENOMEM; - goto finish; - } - qsort(files, hashmap_size(fh), sizeof(char *), base_cmp); - -finish: - hashmap_free(fh); - *strv = files; - return r; -} - -int conf_files_list(char ***strv, const char *suffix, const char *dir, ...) { - char **dirs = NULL; - va_list ap; - int r; - - va_start(ap, dir); - dirs = strv_new_ap(dir, ap); - va_end(ap); - if (!dirs) { - r = -ENOMEM; - goto finish; - } - - if (!strv_path_canonicalize(dirs)) { - r = -ENOMEM; - goto finish; - } - strv_uniq(dirs); - - r = conf_files_list_strv(strv, suffix, (const char **)dirs); - -finish: - strv_free(dirs); - return r; -} - int hwclock_is_localtime(void) { FILE *f; bool local = false; diff --git a/src/shared/util.h b/src/shared/util.h index 7a2661a04..b246996fc 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -460,9 +460,6 @@ int symlink_or_copy_atomic(const char *from, const char *to); int fchmod_umask(int fd, mode_t mode); -int conf_files_list(char ***strv, const char *suffix, const char *dir, ...); -int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs); - int hwclock_is_localtime(void); int hwclock_apply_localtime_delta(int *min); int hwclock_reset_localtime_delta(void); diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index 57fba2560..575095f81 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -31,6 +31,7 @@ #include "strv.h" #include "util.h" #include "strv.h" +#include "conf-files.h" #define PROC_SYS_PREFIX "/proc/sys/" diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index d8fcb4015..16666ce5a 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -45,6 +45,7 @@ #include "strv.h" #include "label.h" #include "set.h" +#include "conf-files.h" /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 22b91c679..45a611474 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -31,6 +31,7 @@ #include #include "udev.h" +#include "conf-files.h" #define PREALLOC_TOKEN 2048 #define PREALLOC_STRBUF 32 * 1024 -- 2.30.2