X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Futil.h;h=a52ac64ee3c4a04f1a2a8dd96945311ae4d57e72;hb=c1072ea0dade39a4188de5e511adfffd4ba8e42c;hp=ac2ec8c35108e4c20fa6e73776b878fb8a91993e;hpb=dc1ecd78e9f046880d10ddb45cf9b06df1084b10;p=elogind.git diff --git a/src/util.h b/src/util.h index ac2ec8c35..a52ac64ee 100644 --- 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 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" @@ -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_uid(pid_t pid, uid_t *uid); char hexchar(int x); int unhexchar(char c); @@ -374,10 +376,11 @@ int pipe_eof(int fd); 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); +int fd_columns(int fd); unsigned columns(void); int running_in_chroot(void); @@ -518,4 +521,10 @@ 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