From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 27 Aug 2022 19:15:35 +0000 (+0900)
Subject: devnum-util: split-out device_path_make_inaccessible()
X-Git-Tag: v252-rc1~308^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4492b5d80489482802a3708e2aeaa7c5b5d20e09;p=thirdparty%2Fsystemd.git

devnum-util: split-out device_path_make_inaccessible()
---

diff --git a/src/basic/devnum-util.c b/src/basic/devnum-util.c
index 70c07315c59..bd1b4d6c390 100644
--- a/src/basic/devnum-util.c
+++ b/src/basic/devnum-util.c
@@ -57,6 +57,24 @@ int device_path_make_major_minor(mode_t mode, dev_t devnum, char **ret) {
         return 0;
 }
 
+int device_path_make_inaccessible(mode_t mode, char **ret) {
+        char *s;
+
+        assert(ret);
+
+        if (S_ISCHR(mode))
+                s = strdup("/run/systemd/inaccessible/chr");
+        else if (S_ISBLK(mode))
+                s = strdup("/run/systemd/inaccessible/blk");
+        else
+                return -ENODEV;
+        if (!s)
+                return -ENOMEM;
+
+        *ret = s;
+        return 0;
+}
+
 int device_path_make_canonical(mode_t mode, dev_t devnum, char **ret) {
         _cleanup_free_ char *p = NULL;
         int r;
@@ -65,25 +83,10 @@ int device_path_make_canonical(mode_t mode, dev_t devnum, char **ret) {
 
         assert(ret);
 
-        if (major(devnum) == 0 && minor(devnum) == 0) {
-                char *s;
-
+        if (major(devnum) == 0 && minor(devnum) == 0)
                 /* A special hack to make sure our 'inaccessible' device nodes work. They won't have symlinks in
                  * /dev/block/ and /dev/char/, hence we handle them specially here. */
-
-                if (S_ISCHR(mode))
-                        s = strdup("/run/systemd/inaccessible/chr");
-                else if (S_ISBLK(mode))
-                        s = strdup("/run/systemd/inaccessible/blk");
-                else
-                        return -ENODEV;
-
-                if (!s)
-                        return -ENOMEM;
-
-                *ret = s;
-                return 0;
-        }
+                return device_path_make_inaccessible(mode, ret);
 
         r = device_path_make_major_minor(mode, devnum, &p);
         if (r < 0)
diff --git a/src/basic/devnum-util.h b/src/basic/devnum-util.h
index 3f1894b2fd7..38aa4efa87b 100644
--- a/src/basic/devnum-util.h
+++ b/src/basic/devnum-util.h
@@ -29,6 +29,7 @@ int parse_devnum(const char *s, dev_t *ret);
         })
 
 int device_path_make_major_minor(mode_t mode, dev_t devnum, char **ret);
+int device_path_make_inaccessible(mode_t mode, char **ret);
 int device_path_make_canonical(mode_t mode, dev_t devnum, char **ret);
 int device_path_parse_major_minor(const char *path, mode_t *ret_mode, dev_t *ret_devnum);