proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-24 03:27:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

util: never ellipsize welcome message

Browse Source
This commit is contained in:
Lennart Poettering 2012-01-05 15:35:16 +01:00
parent 224f2ee221
commit 67e5cc4f3e
3 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/unit.c
View File

@ -2455,7 +2455,7 @@ void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
return;
va_start(ap, format);
status_vprintf(status, format, ap);
status_vprintf(status, true, format, ap);
va_end(ap);
}

55
src/util.c
View File

@ -3577,7 +3577,7 @@ cpu_set_t* cpu_set_malloc(unsigned *ncpus) {
}
}
void status_vprintf(const char *status, const char *format, va_list ap) {
void status_vprintf(const char *status, bool ellipse, const char *format, va_list ap) {
char *s = NULL, *spaces = NULL, *e;
int fd = -1, c;
size_t emax, sl, left;
@ -3592,38 +3592,42 @@ void status_vprintf(const char *status, const char *format, va_list ap) {
if (vasprintf(&s, format, ap) < 0)
goto finish;
fd = open_terminal("/dev/tty", O_WRONLY|O_NOCTTY|O_CLOEXEC);
fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (fd < 0)
goto finish;
c = fd_columns(fd);
if (c <= 0)
c = 80;
if (ellipse) {
c = fd_columns(fd);
if (c <= 0)
c = 80;
if (status) {
sl = 2 + 6 + 1; /* " [" status "]" */
emax = (size_t) c > sl ? c - sl - 1 : 0;
} else
emax = c - 1;
if (status) {
sl = 2 + 6 + 1; /* " [" status "]" */
emax = (size_t) c > sl ? c - sl - 1 : 0;
} else
emax = c - 1;
e = ellipsize(s, emax, 75);
if (e) {
free(s);
s = e;
e = ellipsize(s, emax, 75);
if (e) {
free(s);
s = e;
}
}
zero(iovec);
IOVEC_SET_STRING(iovec[n++], s);
sl = strlen(s);
left = emax > sl ? emax - sl : 0;
if (left > 0) {
spaces = malloc(left);
if (spaces) {
memset(spaces, ' ', left);
iovec[n].iov_base = spaces;
iovec[n].iov_len = left;
n++;
if (ellipse) {
sl = strlen(s);
left = emax > sl ? emax - sl : 0;
if (left > 0) {
spaces = malloc(left);
if (spaces) {
memset(spaces, ' ', left);
iovec[n].iov_base = spaces;
iovec[n].iov_len = left;
n++;
}
}
}
@ -3644,13 +3648,13 @@ finish:
close_nointr_nofail(fd);
}
void status_printf(const char *status, const char *format, ...) {
void status_printf(const char *status, bool ellipse, const char *format, ...) {
va_list ap;
assert(format);
va_start(ap, format);
status_vprintf(status, format, ap);
status_vprintf(status, ellipse, format, ap);
va_end(ap);
}
@ -3808,6 +3812,7 @@ void status_welcome(void) {
const_color = "1";
status_printf(NULL,
false,
"\nWelcome to \x1B[%sm%s\x1B[0m!\n",
const_color ? const_color : ansi_color,
const_pretty ? const_pretty : pretty_name);

4
src/util.h
View File

@ -374,8 +374,8 @@ int pipe_eof(int fd);
cpu_set_t* cpu_set_malloc(unsigned *ncpus);
void status_vprintf(const char *status, const char *format, va_list ap);
void status_printf(const char *status, 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);