chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: split out tty_is_vc_resolve() from default_term_for_tty()
[elogind.git]
/
src
/
util.h
diff --git
a/src/util.h
b/src/util.h
index 89a7bec61280c89171ab9eda0a5b9e145c0190db..e6ffad6c2e89554b732ce83d3a870cef3740e78a 100644
(file)
--- a/
src/util.h
+++ b/
src/util.h
@@
-68,7
+68,8
@@
typedef struct dual_timestamp {
#define FORMAT_TIMESTAMP_PRETTY_MAX 256
#define FORMAT_TIMESPAN_MAX 64
#define FORMAT_TIMESTAMP_PRETTY_MAX 256
#define FORMAT_TIMESPAN_MAX 64
-#define ANSI_HIGHLIGHT_ON "\x1B[1;31m"
+#define ANSI_HIGHLIGHT_ON "\x1B[1;39m"
+#define ANSI_HIGHLIGHT_RED_ON "\x1B[1;32m"
#define ANSI_HIGHLIGHT_GREEN_ON "\x1B[1;32m"
#define ANSI_HIGHLIGHT_OFF "\x1B[0m"
#define ANSI_HIGHLIGHT_GREEN_ON "\x1B[1;32m"
#define ANSI_HIGHLIGHT_OFF "\x1B[0m"
@@
-251,6
+252,7
@@
int rmdir_parents(const char *path, const char *stop);
int get_process_comm(pid_t pid, char **name);
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line);
int get_process_exe(pid_t pid, char **name);
int get_process_comm(pid_t pid, char **name);
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line);
int get_process_exe(pid_t pid, char **name);
+int get_process_uid(pid_t pid, uid_t *uid);
char hexchar(int x);
int unhexchar(char c);
char hexchar(int x);
int unhexchar(char c);
@@
-374,15
+376,17
@@
int pipe_eof(int fd);
cpu_set_t* cpu_set_malloc(unsigned *ncpus);
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_vprintf(const char *
status, bool ellipse, const char *
format, va_list ap);
+void status_printf(const char *
status, bool ellipse, const char *
format, ...);
void status_welcome(void);
void status_welcome(void);
-int columns(void);
+int fd_columns(int fd);
+unsigned columns(void);
int running_in_chroot(void);
int running_in_chroot(void);
-char *ellipsize(const char *s, unsigned length, unsigned percent);
+char *ellipsize(const char *s, size_t length, unsigned percent);
+char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent);
int touch(const char *path);
int touch(const char *path);
@@
-407,6
+411,7
@@
char *fstab_node_to_udev_node(const char *p);
void filter_environ(const char *prefix);
bool tty_is_vc(const char *tty);
void filter_environ(const char *prefix);
bool tty_is_vc(const char *tty);
+bool tty_is_vc_resolve(const char *tty);
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);
@@
-515,4
+520,12
@@
bool kexec_loaded(void);
int prot_from_flags(int flags);
int prot_from_flags(int flags);
+unsigned long cap_last_cap(void);
+
+char *format_bytes(char *buf, size_t l, off_t t);
+
+int fd_wait_for_event(int fd, int event);
+
+void* memdup(const void *p, size_t l);
+
#endif
#endif