chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: properly open log target in the various utilities
[elogind.git]
/
src
/
util.h
diff --git
a/src/util.h
b/src/util.h
index fed0e670ef97dec420fd0c2294dfa5dda0c75044..e9126c04fa0273eecfe5649f09563dcd3af2231b 100644
(file)
--- a/
src/util.h
+++ b/
src/util.h
@@
-61,6
+61,7
@@
typedef struct dual_timestamp {
#define FORMAT_TIMESPAN_MAX 64
#define ANSI_HIGHLIGHT_ON "\x1B[1;31m"
#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);
#define ANSI_HIGHLIGHT_OFF "\x1B[0m"
usec_t now(clockid_t clock);
@@
-183,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);
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);
int readlink_malloc(const char *p, char **r);
int readlink_and_make_absolute(const char *p, char **r);
@@
-208,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 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 rmdir_parents(const char *path, const char *stop);
int get_process_name(pid_t pid, char **name);
@@
-222,6
+229,12
@@
int undecchar(char c);
char *cescape(const char *s);
char *cunescape(const char *s);
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);
char *path_kill_slashes(char *path);
@@
-230,11
+243,6
@@
bool path_equal(const char *a, const char *b);
char *ascii_strlower(char *path);
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);
bool ignore_file(const char *filename);
bool chars_intersect(const char *a, const char *b);
@@
-311,7
+319,6
@@
void sigset_add_many(sigset_t *ss, ...);
char* gethostname_malloc(void);
char* getlogname_malloc(void);
int getttyname_malloc(char **r);
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);
int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
@@
-323,6
+330,16
@@
void status_vprintf(const char *format, va_list ap);
void status_printf(const char *format, ...);
void status_welcome(void);
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);
+
+void nss_disable_nscd(void);
+
+int touch(const char *path);
+
const char *ioprio_class_to_string(int i);
int ioprio_class_from_string(const char *s);
const char *ioprio_class_to_string(int i);
int ioprio_class_from_string(const char *s);
@@
-344,4
+361,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 *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
#endif