namespace: beef up read-only bind mount logic

[elogind.git] / src / shared / util.h

diff --git a/src/shared/util.h b/src/shared/util.h
index a41348e32ead839f63c583278aa512913656b80e..952239e7e6fe1b55fabadc13baf54aefcd2840e4 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <alloca.h>
 ***/
 
 #include <alloca.h>

+#include <fcntl.h>

 #include <inttypes.h>
 #include <time.h>
 #include <sys/time.h>
 #include <inttypes.h>
 #include <time.h>
 #include <sys/time.h>


@@ -58,6 +59,30 @@
 #  error Unknown uid_t size
 #endif
 
 #  error Unknown uid_t size
 #endif
 

+#if SIZEOF_GID_T == 4
+#  define GID_FMT "%" PRIu32
+#elif SIZEOF_GID_T == 2
+#  define GID_FMT "%" PRIu16
+#else
+#  error Unknown gid_t size
+#endif
+
+#if SIZEOF_TIME_T == 8
+#  define PRI_TIME PRIu64
+#elif SIZEOF_GID_T == 4
+#  define PRI_TIME PRIu32
+#else
+#  error Unknown time_t size
+#endif
+
+#if SIZEOF_RLIM_T == 8
+#  define RLIM_FMT "%" PRIu64
+#elif SIZEOF_RLIM_T == 4
+#  define RLIM_FMT "%" PRIu32
+#else
+#  error Unknown rlim_t size
+#endif
+

 #include "macro.h"
 #include "time-util.h"
 
 #include "macro.h"
 #include "time-util.h"
 


@@ -141,11 +166,14 @@ char *endswith(const char *s, const char *postfix) _pure_;
 bool first_word(const char *s, const char *word) _pure_;
 
 int close_nointr(int fd);
 bool first_word(const char *s, const char *word) _pure_;
 
 int close_nointr(int fd);

-void close_nointr_nofail(int fd);
+int safe_close(int fd);
+void safe_close_pair(int p[]);
+

 void close_many(const int fds[], unsigned n_fd);
 
 void close_many(const int fds[], unsigned n_fd);
 

+int parse_size(const char *t, off_t base, off_t *size);
+

 int parse_boolean(const char *v) _pure_;
 int parse_boolean(const char *v) _pure_;

-int parse_bytes(const char *t, off_t *bytes);

 int parse_pid(const char *s, pid_t* ret_pid);
 int parse_uid(const char *s, uid_t* ret_uid);
 #define parse_gid(s, ret_uid) parse_uid(s, ret_uid)
 int parse_pid(const char *s, pid_t* ret_pid);
 int parse_uid(const char *s, uid_t* ret_uid);
 #define parse_gid(s, ret_uid) parse_uid(s, ret_uid)


@@ -368,7 +396,6 @@ int ignore_signals(int sig, ...);
 int default_signals(int sig, ...);
 int sigaction_many(const struct sigaction *sa, ...);
 
 int default_signals(int sig, ...);
 int sigaction_many(const struct sigaction *sa, ...);
 

-int close_pipe(int p[]);

 int fopen_temporary(const char *path, FILE **_f, char **_temp_path);
 
 ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll);
 int fopen_temporary(const char *path, FILE **_f, char **_temp_path);
 
 ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll);


@@ -382,6 +409,7 @@ char* dirname_malloc(const char *path);
 void rename_process(const char name[8]);
 
 void sigset_add_many(sigset_t *ss, ...);
 void rename_process(const char name[8]);
 
 void sigset_add_many(sigset_t *ss, ...);

+int sigprocmask_many(int how, ...);

 
 bool hostname_is_set(void);
 
 
 bool hostname_is_set(void);
 


@@ -442,12 +470,15 @@ static inline const char *ansi_highlight_off(void) {
         return on_tty() ? ANSI_HIGHLIGHT_OFF : "";
 }
 
         return on_tty() ? ANSI_HIGHLIGHT_OFF : "";
 }
 

+int files_same(const char *filea, const char *fileb);
+

 int running_in_chroot(void);
 
 char *ellipsize(const char *s, size_t length, unsigned percent);
                                    /* bytes                 columns */
 char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent);
 
 int running_in_chroot(void);
 
 char *ellipsize(const char *s, size_t length, unsigned percent);
                                    /* bytes                 columns */
 char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent);
 

+int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);

 int touch(const char *path);
 
 char *unquote(const char *s, const char *quotes);
 int touch(const char *path);
 
 char *unquote(const char *s, const char *quotes);


@@ -472,7 +503,7 @@ bool tty_is_console(const char *tty) _pure_;
 int vtnr_from_tty(const char *tty);
 const char *default_term_for_tty(const char *tty);
 
 int vtnr_from_tty(const char *tty);
 const char *default_term_for_tty(const char *tty);
 

-void execute_directory(const char *directory, DIR *_d, char *argv[]);
+void execute_directory(const char *directory, DIR *_d, usec_t timeout, char *argv[]);

 
 int kill_and_sigcont(pid_t pid, int sig);
 
 
 int kill_and_sigcont(pid_t pid, int sig);
 


@@ -520,7 +551,11 @@ char *strjoin(const char *x, ...) _sentinel_;
 
 bool is_main_thread(void);
 
 
 bool is_main_thread(void);
 

-bool in_charset(const char *s, const char* charset) _pure_;
+static inline bool _pure_ in_charset(const char *s, const char* charset) {
+        assert(s);
+        assert(charset);
+        return s[strspn(s, charset)] == '\0';
+}

 
 int block_get_whole_disk(dev_t d, dev_t *ret);
 
 
 int block_get_whole_disk(dev_t d, dev_t *ret);
 


@@ -605,16 +640,15 @@ static inline void freep(void *p) {
         struct __useless_struct_to_allow_trailing_semicolon__
 
 static inline void closep(int *fd) {
         struct __useless_struct_to_allow_trailing_semicolon__
 
 static inline void closep(int *fd) {

-        if (*fd >= 0)
-                close_nointr_nofail(*fd);
+        safe_close(*fd);

 }
 
 static inline void umaskp(mode_t *u) {
         umask(*u);
 }
 
 }
 
 static inline void umaskp(mode_t *u) {
         umask(*u);
 }
 

-static inline void close_pipep(int (*p)[2]) {
-        close_pipe(*p);
+static inline void close_pairp(int (*p)[2]) {
+        safe_close_pair(*p);

 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, fclose);
 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, fclose);


@@ -630,7 +664,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
 #define _cleanup_pclose_ _cleanup_(pclosep)
 #define _cleanup_closedir_ _cleanup_(closedirp)
 #define _cleanup_endmntent_ _cleanup_(endmntentp)
 #define _cleanup_pclose_ _cleanup_(pclosep)
 #define _cleanup_closedir_ _cleanup_(closedirp)
 #define _cleanup_endmntent_ _cleanup_(endmntentp)

-#define _cleanup_close_pipe_ _cleanup_(close_pipep)
+#define _cleanup_close_pair_ _cleanup_(close_pairp)

 
 _malloc_  _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) {
         if (_unlikely_(b == 0 || a > ((size_t) -1) / b))
 
 _malloc_  _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) {
         if (_unlikely_(b == 0 || a > ((size_t) -1) / b))


@@ -665,14 +699,16 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
 bool is_locale_utf8(void);
 
 typedef enum DrawSpecialChar {
 bool is_locale_utf8(void);
 
 typedef enum DrawSpecialChar {

-        DRAW_TREE_VERT,
+        DRAW_TREE_VERTICAL,

         DRAW_TREE_BRANCH,
         DRAW_TREE_RIGHT,
         DRAW_TREE_SPACE,
         DRAW_TRIANGULAR_BULLET,
         DRAW_BLACK_CIRCLE,
         DRAW_TREE_BRANCH,
         DRAW_TREE_RIGHT,
         DRAW_TREE_SPACE,
         DRAW_TRIANGULAR_BULLET,
         DRAW_BLACK_CIRCLE,

+        DRAW_ARROW,

         _DRAW_SPECIAL_CHAR_MAX
 } DrawSpecialChar;
         _DRAW_SPECIAL_CHAR_MAX
 } DrawSpecialChar;

+

 const char *draw_special_char(DrawSpecialChar ch);
 
 char *strreplace(const char *text, const char *old_string, const char *new_string);
 const char *draw_special_char(DrawSpecialChar ch);
 
 char *strreplace(const char *text, const char *old_string, const char *new_string);


@@ -681,8 +717,8 @@ char *strip_tab_ansi(char **p, size_t *l);
 
 int on_ac_power(void);
 
 
 int on_ac_power(void);
 

-int search_and_fopen(const char *path, const char *mode, const char **search, FILE **_f);
-int search_and_fopen_nulstr(const char *path, const char *mode, const char *search, FILE **_f);
+int search_and_fopen(const char *path, const char *mode, const char *root, const char **search, FILE **_f);
+int search_and_fopen_nulstr(const char *path, const char *mode, const char *root, const char *search, FILE **_f);

 
 #define FOREACH_LINE(line, f, on_error)                         \
         for (;;)                                                \
 
 #define FOREACH_LINE(line, f, on_error)                         \
         for (;;)                                                \


@@ -715,12 +751,13 @@ void *unhexmem(const char *p, size_t l);
 char *strextend(char **x, ...) _sentinel_;
 char *strrep(const char *s, unsigned n);
 
 char *strextend(char **x, ...) _sentinel_;
 char *strrep(const char *s, unsigned n);
 

-void* greedy_realloc(void **p, size_t *allocated, size_t need);
-void* greedy_realloc0(void **p, size_t *allocated, size_t need);
-#define GREEDY_REALLOC(array, allocated, need) \
-        greedy_realloc((void**) &(array), &(allocated), sizeof((array)[0]) * (need))
-#define GREEDY_REALLOC0(array, allocated, need) \
-        greedy_realloc0((void**) &(array), &(allocated), sizeof((array)[0]) * (need))
+void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size);
+void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size);
+#define GREEDY_REALLOC(array, allocated, need)                          \
+        greedy_realloc((void**) &(array), &(allocated), (need), sizeof((array)[0]))
+
+#define GREEDY_REALLOC0(array, allocated, need)                         \
+        greedy_realloc0((void**) &(array), &(allocated), (need), sizeof((array)[0]))

 
 static inline void _reset_errno_(int *saved_errno) {
         errno = *saved_errno;
 
 static inline void _reset_errno_(int *saved_errno) {
         errno = *saved_errno;


@@ -758,6 +795,12 @@ static inline unsigned u32ctz(uint32_t n) {
 #endif
 }
 
 #endif
 }
 

+static inline int log2i(int x) {
+        assert(x > 0);
+
+        return __SIZEOF_INT__ * 8 - __builtin_clz(x) - 1;
+}
+

 static inline bool logind_running(void) {
         return access("/run/systemd/seats/", F_OK) >= 0;
 }
 static inline bool logind_running(void) {
         return access("/run/systemd/seats/", F_OK) >= 0;
 }


@@ -793,6 +836,19 @@ int unlink_noerrno(const char *path);
                 _c_;                                    \
         })
 
                 _c_;                                    \
         })
 

+#define strappenda3(a, b, c)                                    \
+        ({                                                      \
+                const char *_a_ = (a), *_b_ = (b), *_c_ = (c);  \
+                char *_d_;                                      \
+                size_t _x_, _y_, _z_;                           \
+                _x_ = strlen(_a_);                              \
+                _y_ = strlen(_b_);                              \
+                _z_ = strlen(_c_);                              \
+                _d_ = alloca(_x_ + _y_ + _z_ + 1);              \
+                strcpy(stpcpy(stpcpy(_d_, _a_), _b_), _c_);     \
+                _d_;                                            \
+        })
+

 #define procfs_file_alloca(pid, field)                                  \
         ({                                                              \
                 pid_t _pid_ = (pid);                                    \
 #define procfs_file_alloca(pid, field)                                  \
         ({                                                              \
                 pid_t _pid_ = (pid);                                    \


@@ -851,12 +907,12 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size,
 }
 
 int proc_cmdline(char **ret);
 }
 
 int proc_cmdline(char **ret);

-int parse_proc_cmdline(int (*parse_word)(const char *word));
+int parse_proc_cmdline(int (*parse_word)(const char *key, const char *value));

 
 int container_get_leader(const char *machine, pid_t *pid);
 
 
 int container_get_leader(const char *machine, pid_t *pid);
 

-int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *root_fd);
-int namespace_enter(int pidns_fd, int mntns_fd, int root_fd);
+int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *root_fd);
+int namespace_enter(int pidns_fd, int mntns_fd, int netns_fd, int root_fd);

 
 bool pid_is_alive(pid_t pid);
 bool pid_is_unwaited(pid_t pid);
 
 bool pid_is_alive(pid_t pid);
 bool pid_is_unwaited(pid_t pid);


@@ -870,3 +926,23 @@ int mkostemp_safe(char *pattern, int flags);
 int open_tmpfile(const char *path, int flags);
 
 int fd_warn_permissions(const char *path, int fd);
 int open_tmpfile(const char *path, int flags);
 
 int fd_warn_permissions(const char *path, int fd);

+
+unsigned long personality_from_string(const char *p);
+const char *personality_to_string(unsigned long);
+
+uint64_t physical_memory(void);
+
+char* mount_test_option(const char *haystack, const char *needle);
+
+void hexdump(FILE *f, const void *p, size_t s);
+
+union file_handle_union {
+        struct file_handle handle;
+        char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];
+};
+
+int update_reboot_param_file(const char *param);
+
+int umount_recursive(const char *target, int flags);
+
+int bind_remount_recursive(const char *prefix, bool ro);