chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-journal: check if the pointers passed are the same
[elogind.git]
/
src
/
shared
/
dev-setup.c
diff --git
a/src/shared/dev-setup.c
b/src/shared/dev-setup.c
index 759ecd799fd04706bf6fe9562e1d4f6b2a0bfcc5..b0ac02d4611ef6e7110624d5764036161b350b5f 100644
(file)
--- 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;
}
return r;
}
-void dev_setup(const char *p
athp
refix) {
+void dev_setup(const char *prefix) {
const char *j, *k;
static const char symlinks[] =
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) {
"/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);
}
}
}
}