Move os-util.[ch] to basic/

parse_os_release() will be used basic/hostname-util.c later on.

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 0b0982d54313bb6aa32b194e8c15218dc6cbcd53..bacd519a867a4c9eee71505c07eb042ff5939341 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -170,6 +170,8 @@ basic_sources = files('''
         nulstr-util.h
         ordered-set.c
         ordered-set.h
+        os-util.c
+        os-util.h
         parse-util.c
         parse-util.h
         path-lookup.c

diff --git a/src/shared/os-util.c b/src/basic/os-util.c
similarity index 93%
rename from src/shared/os-util.c
rename to src/basic/os-util.c
index 3405c9aeaf0406b17e950d62430638f6469f363d..e6f9f7c511c2e3072fd5819aa17ec8a3fb2aab6a 100644 (file)
--- a/src/shared/os-util.c
+++ b/src/basic/os-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
-#include "discover-image.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "fd-util.h"
@@ -9,8 +8,27 @@
 #include "fs-util.h"
 #include "macro.h"
 #include "os-util.h"
+#include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "utf8.h"
+
+bool image_name_is_valid(const char *s) {
+        if (!filename_is_valid(s))
+                return false;
+
+        if (string_has_cc(s, NULL))
+                return false;
+
+        if (!utf8_is_valid(s))
+                return false;
+
+        /* Temporary files for atomically creating new files */
+        if (startswith(s, ".#"))
+                return false;
+
+        return true;
+}
 
 int path_is_extension_tree(const char *path, const char *extension) {
         int r;

diff --git a/src/shared/os-util.h b/src/basic/os-util.h
similarity index 96%
rename from src/shared/os-util.h
rename to src/basic/os-util.h
index bdb9e6adea9cb2c6e85d11dd46b9ddf63424345d..f7789c080470fa805bac841c63d231350b0c87f2 100644 (file)
--- a/src/shared/os-util.h
+++ b/src/basic/os-util.h
@@ -6,6 +6,8 @@
 /* The *_extension_release flavours will look for /usr/lib/extension-release/extension-release.NAME
  * in accordance with the OS extension specification, rather than for /usr/lib/ or /etc/os-release. */
 
+bool image_name_is_valid(const char *s) _pure_;
+
 int path_is_extension_tree(const char *path, const char *extension);
 static inline int path_is_os_tree(const char *path) {
         return path_is_extension_tree(path, NULL);

diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index 539b4c802a62e640c5f60d1c6207cb5198f179f5..309de0b116c80bc2e6d754987c159cd2b2fc9923 100644 (file)
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -18,6 +18,7 @@
 #include "loop-util.h"
 #include "missing_capability.h"
 #include "mount-util.h"
+#include "os-util.h"
 #include "process-util.h"
 #include "raw-clone.h"
 #include "strv.h"

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 08179eb4006cc277b01ad9155e09bd50d8f38490..bb6a2bc5761ba09779046104ce98e12c18539692 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -24,6 +24,7 @@
 #include "machine-pool.h"
 #include "machined.h"
 #include "missing_capability.h"
+#include "os-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "stdio-util.h"

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index 278dae0e1b56a8ae34ad3d5e9fadc2e802f1ded6..af4acc21257c7eb83f53de21951e30b2de2ce54e 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -12,7 +12,6 @@
 #include "bus-wait-for-jobs.h"
 #include "def.h"
 #include "dirent-util.h"
-#include "discover-image.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -20,6 +19,7 @@
 #include "fs-util.h"
 #include "locale-util.h"
 #include "main-func.h"
+#include "os-util.h"
 #include "pager.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index 018cc9b818ad7633e602f50ef6bf3b2df335abdd..8332332c9159ce1989766fede7ccd4905c25528b 100644 (file)
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -17,6 +17,7 @@
 #include "fileio.h"
 #include "io-util.h"
 #include "missing_capability.h"
+#include "os-util.h"
 #include "portable.h"
 #include "portabled-bus.h"
 #include "portabled-image-bus.h"

diff --git a/src/shared/discover-image.c b/src/shared/discover-image.c
index fbce201e297eee79afc51702031e34c1187536da..fb59d1d704a5628ae56ce620fa173614ad3e4f38 100644 (file)
--- a/src/shared/discover-image.c
+++ b/src/shared/discover-image.c
@@ -1250,23 +1250,6 @@ int image_name_lock(const char *name, int operation, LockFile *ret) {
         return make_lock_file(p, operation, ret);
 }
 
-bool image_name_is_valid(const char *s) {
-        if (!filename_is_valid(s))
-                return false;
-
-        if (string_has_cc(s, NULL))
-                return false;
-
-        if (!utf8_is_valid(s))
-                return false;
-
-        /* Temporary files for atomically creating new files */
-        if (startswith(s, ".#"))
-                return false;
-
-        return true;
-}
-
 bool image_in_search_path(
                 ImageClass class,
                 const char *root,

diff --git a/src/shared/discover-image.h b/src/shared/discover-image.h
index af67d167c4988a621afc5778c7222bb8eb2a8ac0..3726e98d30c3d4224d8d656247c2a25dd3d1a288 100644 (file)
--- a/src/shared/discover-image.h
+++ b/src/shared/discover-image.h
@@ -76,8 +76,6 @@ int image_read_only(Image *i, bool b);
 const char* image_type_to_string(ImageType t) _const_;
 ImageType image_type_from_string(const char *s) _pure_;
 
-bool image_name_is_valid(const char *s) _pure_;
-
 int image_path_lock(const char *path, int operation, LockFile *global, LockFile *local);
 int image_name_lock(const char *name, int operation, LockFile *ret);
 

diff --git a/src/shared/meson.build b/src/shared/meson.build
index dfa3275b049bd6f20040fe352f7dc7d4d480548f..4b27a95cc2301a47eb8514b84943b465831b9f74 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -198,8 +198,6 @@ shared_sources = files('''
         numa-util.h
         openssl-util.c
         openssl-util.h
-        os-util.c
-        os-util.h
         output-mode.c
         output-mode.h
         pager.c