dev-setup: make NULL as parameter for dev_setup() equivalent to ""

2012-08-21 17:23:03 +02:00
parent 4fc9982cb0
commit 01ed0e2307
3 changed files with 13 additions and 10 deletions
@@ -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);
        }
 }