X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Futil.h;h=21f47dc1694fd2b277af1dbdf1eb16af8a0ece88;hp=cb47c7a0739726719ed7c0594d48edc15edc9f57;hb=1e59887dc92e163163051e627817e1675374cd22;hpb=c59760eedae9d9de3be1572b9b612dfd8cc37547

diff --git a/src/util.h b/src/util.h
index cb47c7a07..21f47dc16 100644
--- a/src/util.h
+++ b/src/util.h
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <sched.h>
+#include <limits.h>
 
 #include "macro.h"
 
@@ -60,6 +61,7 @@ typedef struct dual_timestamp {
 #define FORMAT_TIMESPAN_MAX 64
 
 #define ANSI_HIGHLIGHT_ON "\x1B[1;31m"
+#define ANSI_HIGHLIGHT_GREEN_ON "\x1B[1;32m"
 #define ANSI_HIGHLIGHT_OFF "\x1B[0m"
 
 usec_t now(clockid_t clock);
@@ -119,21 +121,48 @@ 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_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_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_u);
+        return safe_atoi(s, (int*) ret_i);
 }
 
-int safe_atolu(const char *s, unsigned long *ret_u);
-int safe_atoli(const char *s, long 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);
+}
 
-int safe_atollu(const char *s, unsigned long long *ret_u);
-int safe_atolli(const char *s, long long int *ret_i);
+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);
@@ -155,6 +184,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);
@@ -180,6 +213,8 @@ 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);
@@ -194,6 +229,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);
 
@@ -202,11 +243,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);
@@ -283,7 +319,6 @@ void sigset_add_many(sigset_t *ss, ...);
 char* gethostname_malloc(void);
 char* getlogname_malloc(void);
 int getttyname_malloc(char **r);
-int getmachineid_malloc(char **r);
 
 int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
 
@@ -291,6 +326,16 @@ 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);
 
@@ -312,4 +357,7 @@ 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);
+
 #endif