journald: move and rename journal/managed-journal-file.[ch] -> shared/journal-file-util.[ch]

The files are used by both journald and journal-remote.
Let's move them to src/shared.

src/journal-remote/journal-remote-write.c

@@ -3,6 +3,7 @@
 #include <libgen.h>
 
 #include "alloc-util.h"
+#include "journal-file-util.h"
 #include "journal-remote.h"
 #include "path-util.h"
 #include "stat-util.h"

src/journal-remote/journal-remote-write.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "journal-file.h"
 #include "journal-importer.h"
-#include "managed-journal-file.h"
 
 typedef struct RemoteServer RemoteServer;
 

src/journal-remote/journal-remote.c

@@ -14,11 +14,11 @@
 #include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
+#include "journal-file-util.h"
 #include "journal-remote-write.h"
 #include "journal-remote.h"
 #include "journald-native.h"
 #include "macro.h"
-#include "managed-journal-file.h"
 #include "parse-util.h"
 #include "parse-helpers.h"
 #include "process-util.h"

src/journal/journald-server.c

@@ -30,6 +30,7 @@
 #include "initrd-util.h"
 #include "io-util.h"
 #include "journal-authenticate.h"
+#include "journal-file-util.h"
 #include "journal-internal.h"
 #include "journal-vacuum.h"
 #include "journald-audit.h"

src/journal/journald-server.h

@@ -11,11 +11,11 @@ typedef struct Server Server;
 #include "common-signal.h"
 #include "conf-parser.h"
 #include "hashmap.h"
+#include "journal-file.h"
 #include "journald-context.h"
 #include "journald-rate-limit.h"
 #include "journald-stream.h"
 #include "list.h"
-#include "managed-journal-file.h"
 #include "prioq.h"
 #include "ratelimit.h"
 #include "time-util.h"

src/journal/meson.build

@@ -12,7 +12,6 @@ sources = files(
         'journald-stream.c',
         'journald-syslog.c',
         'journald-wall.c',
-        'managed-journal-file.c',
 )
 
 sources += custom_target(

src/journal/test-journal-append.c

@@ -9,8 +9,8 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "io-util.h"
+#include "journal-file-util.h"
 #include "log.h"
-#include "managed-journal-file.h"
 #include "mmap-cache.h"
 #include "parse-util.h"
 #include "random-util.h"

src/journal/test-journal-flush.c

@@ -7,9 +7,9 @@
 
 #include "alloc-util.h"
 #include "chattr-util.h"
+#include "journal-file-util.h"
 #include "journal-internal.h"
 #include "macro.h"
-#include "managed-journal-file.h"
 #include "path-util.h"
 #include "rm-rf.h"
 #include "string-util.h"

src/journal/test-journal-interleaving.c

@@ -9,10 +9,10 @@
 #include "alloc-util.h"
 #include "chattr-util.h"
 #include "io-util.h"
+#include "journal-file-util.h"
 #include "journal-vacuum.h"
 #include "log.h"
 #include "logs-show.h"
-#include "managed-journal-file.h"
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "tests.h"

src/journal/test-journal-stream.c

@@ -8,10 +8,10 @@
 #include "alloc-util.h"
 #include "chattr-util.h"
 #include "io-util.h"
+#include "journal-file-util.h"
 #include "journal-internal.h"
 #include "log.h"
 #include "macro.h"
-#include "managed-journal-file.h"
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "tests.h"

src/journal/test-journal-verify.c

@@ -7,9 +7,9 @@
 #include "chattr-util.h"
 #include "fd-util.h"
 #include "io-util.h"
+#include "journal-file-util.h"
 #include "journal-verify.h"
 #include "log.h"
-#include "managed-journal-file.h"
 #include "mmap-cache.h"
 #include "rm-rf.h"
 #include "strv.h"

src/journal/test-journal.c

@@ -6,9 +6,9 @@
 #include "chattr-util.h"
 #include "io-util.h"
 #include "journal-authenticate.h"
+#include "journal-file-util.h"
 #include "journal-vacuum.h"
 #include "log.h"
-#include "managed-journal-file.h"
 #include "rm-rf.h"
 #include "tests.h"
 

src/shared/journal-file-util.c

@@ -9,7 +9,7 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "journal-authenticate.h"
-#include "managed-journal-file.h"
+#include "journal-file-util.h"
 #include "path-util.h"
 #include "random-util.h"
 #include "set.h"

src/shared/meson.build

@@ -93,6 +93,7 @@ shared_sources = files(
         'install.c',
         'ip-protocol-list.c',
         'ipvlan-util.c',
+        'journal-file-util.c',
         'journal-importer.c',
         'journal-util.c',
         'json.c',