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

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index 759ecd799..b0ac02d46 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -50,7 +50,7 @@ static int symlink_and_label(const char *old_path, const char *new_path) {
         return r;
 }
 
-void dev_setup(const char *pathprefix) {
+void dev_setup(const char *prefix) {
         const char *j, *k;
 
         static const char symlinks[] =
@@ -61,15 +61,18 @@ void dev_setup(const char *pathprefix) {
                 "/proc/self/fd/2\0"  "/dev/stderr\0";
 
         NULSTR_FOREACH_PAIR(j, k, symlinks) {
-                char *linkname;
 
-                if (asprintf(&linkname, "%s/%s", pathprefix, k) < 0) {
-                        log_oom();
-                        break;
-                }
+                if (prefix) {
+                        char *linkname;
 
-                symlink_and_label(j, linkname);
+                        if (asprintf(&linkname, "%s/%s", prefix, k) < 0) {
+                                log_oom();
+                                break;
+                        }
 
-                free(linkname);
+                        symlink_and_label(j, linkname);
+                        free(linkname);
+                } else
+                        symlink_and_label(j, k);
         }
 }