X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Futil.h;h=b097dc9b7b629b3c970cc3db9a1638c871ef6cd4;hp=864d98fa635549f568f2f1d4365c6f20a16f2d01;hb=6e98720f14dc25ee1d43f951d5c4d79b04ad7506;hpb=8c6db8336536916d0476ff8233e0abf40a2f6aab diff --git a/src/util.h b/src/util.h index 864d98fa6..b097dc9b7 100644 --- a/src/util.h +++ b/src/util.h @@ -29,13 +29,17 @@ #include #include #include +#include +#include + +#include "macro.h" typedef uint64_t usec_t; -typedef struct timestamp { +typedef struct dual_timestamp { usec_t realtime; usec_t monotonic; -} timestamp; +} dual_timestamp; #define MSEC_PER_SEC 1000ULL #define USEC_PER_SEC 1000000ULL @@ -56,9 +60,12 @@ typedef struct timestamp { #define FORMAT_TIMESTAMP_MAX 64 #define FORMAT_TIMESPAN_MAX 64 +#define ANSI_HIGHLIGHT_ON "\x1B[1;31m" +#define ANSI_HIGHLIGHT_OFF "\x1B[0m" + usec_t now(clockid_t clock); -timestamp* timestamp_get(timestamp *ts); +dual_timestamp* dual_timestamp_get(dual_timestamp *ts); usec_t timespec_load(const struct timespec *ts); struct timespec *timespec_store(struct timespec *ts, usec_t u); @@ -113,12 +120,49 @@ int parse_pid(const char *s, pid_t* ret_pid); int safe_atou(const char *s, unsigned *ret_u); int safe_atoi(const char *s, int *ret_i); -int safe_atolu(const char *s, unsigned long *ret_u); -int safe_atoli(const char *s, long int *ret_i); - int safe_atollu(const char *s, unsigned long long *ret_u); int safe_atolli(const char *s, long long int *ret_i); +#if __WORDSIZE == 32 +static inline int safe_atolu(const char *s, unsigned long *ret_u) { + assert_cc(sizeof(unsigned long) == sizeof(unsigned)); + return safe_atou(s, (unsigned*) ret_u); +} +static inline int safe_atoli(const char *s, long int *ret_u) { + assert_cc(sizeof(long int) == sizeof(int)); + return safe_atoi(s, (int*) ret_u); +} +#else +static inline int safe_atolu(const char *s, unsigned long *ret_u) { + assert_cc(sizeof(unsigned long) == sizeof(unsigned long long)); + return safe_atollu(s, (unsigned long long*) ret_u); +} +static inline int safe_atoli(const char *s, long int *ret_u) { + assert_cc(sizeof(long int) == sizeof(long long int)); + return safe_atolli(s, (long long int*) ret_u); +} +#endif + +static inline int safe_atou32(const char *s, uint32_t *ret_u) { + assert_cc(sizeof(uint32_t) == sizeof(unsigned)); + return safe_atou(s, (unsigned*) ret_u); +} + +static inline int safe_atoi32(const char *s, int32_t *ret_i) { + assert_cc(sizeof(int32_t) == sizeof(int)); + return safe_atoi(s, (int*) ret_i); +} + +static inline int safe_atou64(const char *s, uint64_t *ret_u) { + assert_cc(sizeof(uint64_t) == sizeof(unsigned long long)); + return safe_atollu(s, (unsigned long long*) ret_u); +} + +static inline int safe_atoi64(const char *s, int64_t *ret_i) { + assert_cc(sizeof(int64_t) == sizeof(long long int)); + return safe_atolli(s, (long long int*) ret_i); +} + char *split(const char *c, size_t *l, const char *separator, char **state); char *split_quoted(const char *c, size_t *l, char **state); @@ -139,6 +183,10 @@ int write_one_line_file(const char *fn, const char *line); int read_one_line_file(const char *fn, char **line); char *strappend(const char *s, const char *suffix); +char *strnappend(const char *s, const char *suffix, size_t length); + +char *replace_env(const char *format, char **env); +char **replace_env_argv(char **argv, char **env); int readlink_malloc(const char *p, char **r); int readlink_and_make_absolute(const char *p, char **r); @@ -164,9 +212,12 @@ int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid); int mkdir_parents(const char *path, mode_t mode); int mkdir_p(const char *path, mode_t mode); +int parent_of_path(const char *path, char **parent); + int rmdir_parents(const char *path, const char *stop); int get_process_name(pid_t pid, char **name); +int get_process_cmdline(pid_t pid, size_t max_length, char **line); char hexchar(int x); int unhexchar(char c); @@ -177,6 +228,12 @@ int undecchar(char c); char *cescape(const char *s); char *cunescape(const char *s); +char *cunescape_length(const char *s, size_t length); + +char *xescape(const char *s, const char *bad); + +char *bus_path_escape(const char *s); +char *bus_path_unescape(const char *s); char *path_kill_slashes(char *path); @@ -185,11 +242,6 @@ bool path_equal(const char *a, const char *b); char *ascii_strlower(char *path); -char *xescape(const char *s, const char *bad); - -char *bus_path_escape(const char *s); -char *bus_path_unescape(const char *s); - bool ignore_file(const char *filename); bool chars_intersect(const char *a, const char *b); @@ -214,7 +266,8 @@ unsigned long long random_ull(void); unsigned u = 0; \ assert(s); \ for (i = 0; i < (type)ELEMENTSOF(name##_table); i++) \ - if (streq(name##_table[i], s)) \ + if (name##_table[i] && \ + streq(name##_table[i], s)) \ return i; \ if (safe_atou(s, &u) >= 0 && \ u < ELEMENTSOF(name##_table)) \ @@ -271,6 +324,18 @@ int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid); int rm_rf(const char *path, bool only_dirs, bool delete_root); +cpu_set_t* cpu_set_malloc(unsigned *ncpus); + +void status_vprintf(const char *format, va_list ap); +void status_printf(const char *format, ...); +void status_welcome(void); + +int columns(void); + +int running_in_chroot(void); + +char *ellipsize(const char *s, unsigned length, unsigned percent); + const char *ioprio_class_to_string(int i); int ioprio_class_from_string(const char *s); @@ -289,4 +354,20 @@ int sched_policy_from_string(const char *s); const char *rlimit_to_string(int i); int rlimit_from_string(const char *s); +const char *ip_tos_to_string(int i); +int ip_tos_from_string(const char *s); + +const char *signal_to_string(int i); +int signal_from_string(const char *s); + +int label_init(void); +int label_fix(const char *path); +void label_finish(void); +int label_socket_set(const char *label); +void label_socket_clear(void); +int label_fifofile_set(const char *label, const char *path); +void label_file_clear(void); +void label_free(const char *label); +int label_get_socket_label_from_exe(const char *exe, char **label); + #endif