chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: rework strappenda(), and rename it strjoina()
[elogind.git]
/
src
/
core
/
namespace.c
diff --git
a/src/core/namespace.c
b/src/core/namespace.c
index 4b8dbdd0d83d975a2e5f135d280d05f056047f98..4fecd32363a6baaf9d302e839ee30c157b78691a 100644
(file)
--- a/
src/core/namespace.c
+++ b/
src/core/namespace.c
@@
-157,24
+157,24
@@
static int mount_dev(BindMount *m) {
if (!mkdtemp(temporary_mount))
return -errno;
if (!mkdtemp(temporary_mount))
return -errno;
- dev = str
append
a(temporary_mount, "/dev");
+ dev = str
join
a(temporary_mount, "/dev");
(void)mkdir(dev, 0755);
if (mount("tmpfs", dev, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=755") < 0) {
r = -errno;
goto fail;
}
(void)mkdir(dev, 0755);
if (mount("tmpfs", dev, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=755") < 0) {
r = -errno;
goto fail;
}
- devpts = str
append
a(temporary_mount, "/dev/pts");
+ devpts = str
join
a(temporary_mount, "/dev/pts");
(void)mkdir(devpts, 0755);
if (mount("/dev/pts", devpts, NULL, MS_BIND, NULL) < 0) {
r = -errno;
goto fail;
}
(void)mkdir(devpts, 0755);
if (mount("/dev/pts", devpts, NULL, MS_BIND, NULL) < 0) {
r = -errno;
goto fail;
}
- devptmx = str
append
a(temporary_mount, "/dev/ptmx");
+ devptmx = str
join
a(temporary_mount, "/dev/ptmx");
symlink("pts/ptmx", devptmx);
symlink("pts/ptmx", devptmx);
- devshm = str
append
a(temporary_mount, "/dev/shm");
+ devshm = str
join
a(temporary_mount, "/dev/shm");
(void)mkdir(devshm, 01777);
r = mount("/dev/shm", devshm, NULL, MS_BIND, NULL);
if (r < 0) {
(void)mkdir(devshm, 01777);
r = mount("/dev/shm", devshm, NULL, MS_BIND, NULL);
if (r < 0) {
@@
-182,15
+182,15
@@
static int mount_dev(BindMount *m) {
goto fail;
}
goto fail;
}
- devmqueue = str
append
a(temporary_mount, "/dev/mqueue");
+ devmqueue = str
join
a(temporary_mount, "/dev/mqueue");
(void)mkdir(devmqueue, 0755);
mount("/dev/mqueue", devmqueue, NULL, MS_BIND, NULL);
(void)mkdir(devmqueue, 0755);
mount("/dev/mqueue", devmqueue, NULL, MS_BIND, NULL);
- devhugepages = str
append
a(temporary_mount, "/dev/hugepages");
+ devhugepages = str
join
a(temporary_mount, "/dev/hugepages");
(void)mkdir(devhugepages, 0755);
mount("/dev/hugepages", devhugepages, NULL, MS_BIND, NULL);
(void)mkdir(devhugepages, 0755);
mount("/dev/hugepages", devhugepages, NULL, MS_BIND, NULL);
- devlog = str
append
a(temporary_mount, "/dev/log");
+ devlog = str
join
a(temporary_mount, "/dev/log");
symlink("/run/systemd/journal/dev-log", devlog);
NULSTR_FOREACH(d, devnodes) {
symlink("/run/systemd/journal/dev-log", devlog);
NULSTR_FOREACH(d, devnodes) {
@@
-280,7
+280,7
@@
static int mount_kdbus(BindMount *m) {
if (!mkdtemp(temporary_mount))
return log_error_errno(errno, "Failed create temp dir: %m");
if (!mkdtemp(temporary_mount))
return log_error_errno(errno, "Failed create temp dir: %m");
- root = str
append
a(temporary_mount, "/kdbus");
+ root = str
join
a(temporary_mount, "/kdbus");
(void)mkdir(root, 0755);
if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=777") < 0) {
r = -errno;
(void)mkdir(root, 0755);
if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=777") < 0) {
r = -errno;
@@
-295,7
+295,7
@@
static int mount_kdbus(BindMount *m) {
goto fail;
}
goto fail;
}
- busnode = str
append
a(root, "/bus");
+ busnode = str
join
a(root, "/bus");
if (mknod(busnode, (st.st_mode & ~07777) | 0600, st.st_rdev) < 0) {
log_error_errno(errno, "mknod() for %s failed: %m", busnode);
r = -errno;
if (mknod(busnode, (st.st_mode & ~07777) | 0600, st.st_rdev) < 0) {
log_error_errno(errno, "mknod() for %s failed: %m", busnode);
r = -errno;
@@
-566,7
+566,7
@@
static int setup_one_tmp_dir(const char *id, const char *prefix, char **path) {
RUN_WITH_UMASK(0000) {
char *y;
RUN_WITH_UMASK(0000) {
char *y;
- y = str
append
a(x, "/tmp");
+ y = str
join
a(x, "/tmp");
if (mkdir(y, 0777 | S_ISVTX) < 0)
return -errno;
if (mkdir(y, 0777 | S_ISVTX) < 0)
return -errno;
@@
-594,7
+594,7
@@
int setup_tmp_dirs(const char *id, char **tmp_dir, char **var_tmp_dir) {
if (r < 0) {
char *t;
if (r < 0) {
char *t;
- t = str
append
a(a, "/tmp");
+ t = str
join
a(a, "/tmp");
rmdir(t);
rmdir(a);
rmdir(t);
rmdir(a);