Those functions have only one non-test user, so we can move them to src/core/.
--- /dev/null
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include <unistd.h>
+
+#include "generator-setup.h"
+#include "macro.h"
+#include "mkdir.h"
+#include "rm-rf.h"
+
+int lookup_paths_mkdir_generator(LookupPaths *p) {
+ int r, q;
+
+ assert(p);
+
+ if (!p->generator || !p->generator_early || !p->generator_late)
+ return -EINVAL;
+
+ r = mkdir_p_label(p->generator, 0755);
+
+ q = mkdir_p_label(p->generator_early, 0755);
+ if (q < 0 && r >= 0)
+ r = q;
+
+ q = mkdir_p_label(p->generator_late, 0755);
+ if (q < 0 && r >= 0)
+ r = q;
+
+ return r;
+}
+
+void lookup_paths_trim_generator(LookupPaths *p) {
+ assert(p);
+
+ /* Trim empty dirs */
+
+ if (p->generator)
+ (void) rmdir(p->generator);
+ if (p->generator_early)
+ (void) rmdir(p->generator_early);
+ if (p->generator_late)
+ (void) rmdir(p->generator_late);
+}
+
+void lookup_paths_flush_generator(LookupPaths *p) {
+ assert(p);
+
+ /* Flush the generated unit files in full */
+
+ if (p->generator)
+ (void) rm_rf(p->generator, REMOVE_ROOT|REMOVE_PHYSICAL);
+ if (p->generator_early)
+ (void) rm_rf(p->generator_early, REMOVE_ROOT|REMOVE_PHYSICAL);
+ if (p->generator_late)
+ (void) rm_rf(p->generator_late, REMOVE_ROOT|REMOVE_PHYSICAL);
+
+ if (p->temporary_dir)
+ (void) rm_rf(p->temporary_dir, REMOVE_ROOT|REMOVE_PHYSICAL);
+}
--- /dev/null
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include "path-lookup.h"
+
+int lookup_paths_mkdir_generator(LookupPaths *p);
+void lookup_paths_trim_generator(LookupPaths *p);
+void lookup_paths_flush_generator(LookupPaths *p);
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
+#include "generator-setup.h"
#include "hashmap.h"
#include "install.h"
#include "io-util.h"
emergency-action.h
execute.c
execute.h
+ generator-setup.c
+ generator-setup.h
hostname-setup.c
hostname-setup.h
ima-setup.c
#include "alloc-util.h"
#include "fs-util.h"
-#include "install.h"
#include "log.h"
#include "macro.h"
-#include "mkdir.h"
#include "path-lookup.h"
#include "path-util.h"
-#include "rm-rf.h"
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
#include "tmpfile-util.h"
#include "user-util.h"
-#include "util.h"
int xdg_user_runtime_dir(char **ret, const char *suffix) {
const char *e;
}
}
-int lookup_paths_mkdir_generator(LookupPaths *p) {
- int r, q;
-
- assert(p);
-
- if (!p->generator || !p->generator_early || !p->generator_late)
- return -EINVAL;
-
- r = mkdir_p_label(p->generator, 0755);
-
- q = mkdir_p_label(p->generator_early, 0755);
- if (q < 0 && r >= 0)
- r = q;
-
- q = mkdir_p_label(p->generator_late, 0755);
- if (q < 0 && r >= 0)
- r = q;
-
- return r;
-}
-
-void lookup_paths_trim_generator(LookupPaths *p) {
- assert(p);
-
- /* Trim empty dirs */
-
- if (p->generator)
- (void) rmdir(p->generator);
- if (p->generator_early)
- (void) rmdir(p->generator_early);
- if (p->generator_late)
- (void) rmdir(p->generator_late);
-}
-
-void lookup_paths_flush_generator(LookupPaths *p) {
- assert(p);
-
- /* Flush the generated unit files in full */
-
- if (p->generator)
- (void) rm_rf(p->generator, REMOVE_ROOT|REMOVE_PHYSICAL);
- if (p->generator_early)
- (void) rm_rf(p->generator_early, REMOVE_ROOT|REMOVE_PHYSICAL);
- if (p->generator_late)
- (void) rm_rf(p->generator_late, REMOVE_ROOT|REMOVE_PHYSICAL);
-
- if (p->temporary_dir)
- (void) rm_rf(p->temporary_dir, REMOVE_ROOT|REMOVE_PHYSICAL);
-}
-
char **generator_binary_paths(UnitFileScope scope) {
bool append = false; /* Add items from SYSTEMD_GENERATOR_PATH before normal directories */
_cleanup_strv_free_ char **paths = NULL;
bool path_is_user_config_dir(const char *path);
void lookup_paths_log(LookupPaths *p);
-
-int lookup_paths_mkdir_generator(LookupPaths *p);
-void lookup_paths_trim_generator(LookupPaths *p);
-void lookup_paths_flush_generator(LookupPaths *p);
-
void lookup_paths_free(LookupPaths *p);
char **generator_binary_paths(UnitFileScope scope);