X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=a8e962ea50af16365c2e9295defd275928c447da;hp=485733f65074475842237571af8d669d130f7421;hb=75add28aa17678fbf5b10947027efe7ac75d113d;hpb=8333c77edf8fd1654cd96f3f6ee0f078dd64b58b

diff --git a/src/shared/util.h b/src/shared/util.h
index 485733f65..a8e962ea5 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -36,8 +36,9 @@
 #include <dirent.h>
 #include <sys/resource.h>
 #include <stddef.h>
-#include <systemd/sd-journal.h>
+#include <unistd.h>
 
+#include <systemd/sd-journal.h>
 #include "macro.h"
 #include "time-util.h"
 
@@ -538,6 +539,8 @@ static inline void journal_closep(sd_journal **j) {
         sd_journal_close(*j);
 }
 
+#define _cleanup_globfree_ __attribute__((cleanup(globfree)))
+
 _malloc_  static inline void *malloc_multiply(size_t a, size_t b) {
         if (_unlikely_(b == 0 || a > ((size_t) -1) / b))
                 return NULL;
@@ -609,5 +612,46 @@ static inline void *mempset(void *s, int c, size_t n) {
 }
 
 char *hexmem(const void *p, size_t l);
+void *unhexmem(const char *p, size_t l);
+
 char *strextend(char **x, ...);
 char *strrep(const char *s, unsigned n);
+
+void* greedy_realloc(void **p, size_t *allocated, size_t need);
+
+static inline void _reset_errno_(int *saved_errno) {
+        errno = *saved_errno;
+}
+
+#define PROTECT_ERRNO __attribute__((cleanup(_reset_errno_))) int _saved_errno_ = errno
+
+struct umask_struct {
+        mode_t mask;
+        bool quit;
+};
+
+static inline void _reset_umask_(struct umask_struct *s) {
+        umask(s->mask);
+};
+
+#define RUN_WITH_UMASK(mask)                                            \
+        for (__attribute__((cleanup(_reset_umask_))) struct umask_struct _saved_umask_ = { umask(mask), false }; \
+             !_saved_umask_.quit ;                                      \
+             _saved_umask_.quit = true)
+
+static inline unsigned u64log2(uint64_t n) {
+        return (n > 1) ? __builtin_clzll(n) ^ 63U : 0;
+}
+
+static inline bool logind_running(void) {
+        return access("/run/systemd/seats/", F_OK) >= 0;
+}
+
+static inline unsigned decimal_str_max(unsigned x) {
+        unsigned ans = 1;
+        while (x /= 10)
+                ans ++;
+        return ans;
+}
+
+int unlink_noerrno(const char *path);