chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
taint: add missing cgroups taint flag
[elogind.git]
/
src
/
util.c
diff --git
a/src/util.c
b/src/util.c
index eefd66e8cdb4b5e630213d5b4bd5b46365ae4457..fada69cf1a981893f85998ac2da465865a2d0074 100644
(file)
--- a/
src/util.c
+++ b/
src/util.c
@@
-61,6
+61,20
@@
#include "exit-status.h"
#include "hashmap.h"
#include "exit-status.h"
#include "hashmap.h"
+size_t page_size(void) {
+ static __thread size_t pgsz = 0;
+ long r;
+
+ if (pgsz)
+ return pgsz;
+
+ assert_se((r = sysconf(_SC_PAGESIZE)) > 0);
+
+ pgsz = (size_t) r;
+
+ return pgsz;
+}
+
bool streq_ptr(const char *a, const char *b) {
/* Like streq(), but tries to make sense of NULL pointers */
bool streq_ptr(const char *a, const char *b) {
/* Like streq(), but tries to make sense of NULL pointers */
@@
-3524,7
+3538,7
@@
int touch(const char *path) {
assert(path);
assert(path);
- if ((fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 06
66
)) < 0)
+ if ((fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 06
44
)) < 0)
return -errno;
close_nointr_nofail(fd);
return -errno;
close_nointr_nofail(fd);
@@
-3991,7
+4005,7
@@
int detect_container(const char **id) {
fclose(f);
if (id)
fclose(f);
if (id)
- *id = "ns";
+ *id = "
pid
ns";
return 1;
}
return 1;
}