util: replace close_pipe() with new safe_close_pair()

[elogind.git] / src / shared / dev-setup.c

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index 0b3d648acb879daedc77ef1aacbdd010155e3ef8..1a565d54708c2ea475b8f5c9bff184fc72c48594 100644 (file)
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -50,16 +50,35 @@ static int symlink_and_label(const char *old_path, const char *new_path) {
         return r;
 }
 
-void dev_setup(void) {
+int dev_setup(const char *prefix) {
         const char *j, *k;
 
         static const char symlinks[] =
-                "/proc/kcore\0"      "/dev/core\0"
+                "-/proc/kcore\0"     "/dev/core\0"
                 "/proc/self/fd\0"    "/dev/fd\0"
                 "/proc/self/fd/0\0"  "/dev/stdin\0"
                 "/proc/self/fd/1\0"  "/dev/stdout\0"
                 "/proc/self/fd/2\0"  "/dev/stderr\0";
 
-        NULSTR_FOREACH_PAIR(j, k, symlinks)
-                symlink_and_label(j, k);
+        NULSTR_FOREACH_PAIR(j, k, symlinks) {
+                if (j[0] == '-') {
+                        j++;
+
+                        if (access(j, F_OK) < 0)
+                                continue;
+                }
+
+                if (prefix) {
+                        _cleanup_free_ char *link_name = NULL;
+
+                        link_name = strjoin(prefix, "/", k, NULL);
+                        if (!link_name)
+                                return -ENOMEM;
+
+                        symlink_and_label(j, link_name);
+                } else
+                        symlink_and_label(j, k);
+        }
+
+        return 0;
 }