X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fdev-setup.c;h=e025e17bbeb014b341694be34af246e930ac0655;hb=2d5bdf5bc0e4714d42e5999a4e37553a6bf83575;hp=759ecd799fd04706bf6fe9562e1d4f6b2a0bfcc5;hpb=8f0e73f250f4a397ea07d29a339bd7e64d077612;p=elogind.git

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index 759ecd799..e025e17bb 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -50,26 +50,35 @@ static int symlink_and_label(const char *old_path, const char *new_path) {
         return r;
 }
 
-void dev_setup(const char *pathprefix) {
+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) {
-                char *linkname;
+                if (j[0] == '-') {
+                        j++;
 
-                if (asprintf(&linkname, "%s/%s", pathprefix, k) < 0) {
-                        log_oom();
-                        break;
+                        if (access(j, F_OK))
+                                continue;
                 }
 
-                symlink_and_label(j, linkname);
+                if (prefix) {
+                        _cleanup_free_ char *link_name = NULL;
 
-                free(linkname);
+                        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;
 }