chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
missing: add __NR_getrandom for powerpc architecture
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 11cab6dcf1710f590b2a879f019f274ead1e6020..f5fcebebe7a1c26028593ebd93446e5eefb2d4ad 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-60,10
+60,14
@@
#include <locale.h>
#include <sys/personality.h>
#include <sys/xattr.h>
#include <locale.h>
#include <sys/personality.h>
#include <sys/xattr.h>
-#include <libgen.h>
#include <sys/statvfs.h>
#include <sys/file.h>
#include <linux/fs.h>
#include <sys/statvfs.h>
#include <sys/file.h>
#include <linux/fs.h>
+
+/* When we include libgen.h because we need dirname() we immediately
+ * undefine basename() since libgen.h defines it as a macro to the XDG
+ * version which is really broken. */
+#include <libgen.h>
#undef basename
#ifdef HAVE_SYS_AUXV_H
#undef basename
#ifdef HAVE_SYS_AUXV_H
@@
-6452,7
+6456,7
@@
int container_get_leader(const char *machine, pid_t *pid) {
assert(machine);
assert(pid);
assert(machine);
assert(pid);
- p = str
append
a("/run/systemd/machines/", machine);
+ p = str
join
a("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "LEADER", &s, "CLASS", &class, NULL);
if (r == -ENOENT)
return -EHOSTDOWN;
r = parse_env_file(p, NEWLINE, "LEADER", &s, "CLASS", &class, NULL);
if (r == -ENOENT)
return -EHOSTDOWN;
@@
-6691,7
+6695,7
@@
int open_tmpfile(const char *path, int flags) {
#endif
/* Fall back to unguessable name + unlinking */
#endif
/* Fall back to unguessable name + unlinking */
- p = str
append
a(path, "/systemd-tmp-XXXXXX");
+ p = str
join
a(path, "/systemd-tmp-XXXXXX");
fd = mkostemp_safe(p, flags);
if (fd < 0)
fd = mkostemp_safe(p, flags);
if (fd < 0)
@@
-7220,7
+7224,7
@@
int take_password_lock(const char *root) {
* awfully racy, and thus we just won't do them. */
if (root)
* awfully racy, and thus we just won't do them. */
if (root)
- path = str
append
a(root, "/etc/.pwd.lock");
+ path = str
join
a(root, "/etc/.pwd.lock");
else
path = "/etc/.pwd.lock";
else
path = "/etc/.pwd.lock";