forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=611
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
e1828fd312
commit
b2594a462d
@ -1,8 +1,9 @@
|
|||||||
---
|
---
|
||||||
rules/99-systemd.rules.in | 2 -
|
rules/99-systemd.rules.in | 2 -
|
||||||
src/getty-generator/getty-generator.c | 2 -
|
src/core/manager.c | 24 +++++++++++---
|
||||||
src/shared/util.c | 62 ++++++++++++++++++++++++++++++++--
|
src/shared/util.c | 77 ++++++++++++++++++++++++++++++++++++++++++++--
|
||||||
3 files changed, 61 insertions(+), 5 deletions(-)
|
src/shared/util.h | 1
|
||||||
|
4 files changed, 95 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
--- systemd-208/rules/99-systemd.rules.in
|
--- systemd-208/rules/99-systemd.rules.in
|
||||||
+++ systemd-208/rules/99-systemd.rules.in 2014-02-05 10:34:17.346235540 +0000
|
+++ systemd-208/rules/99-systemd.rules.in 2014-02-05 10:34:17.346235540 +0000
|
||||||
@ -15,34 +16,92 @@
|
|||||||
|
|
||||||
KERNEL=="vport*", TAG+="systemd"
|
KERNEL=="vport*", TAG+="systemd"
|
||||||
|
|
||||||
--- systemd-208/src/shared/util.c
|
--- systemd-210/src/core/manager.c
|
||||||
+++ systemd-208/src/shared/util.c 2014-01-31 11:54:07.222235280 +0000
|
+++ systemd-210/src/core/manager.c 2014-04-30 10:51:43.398735332 +0000
|
||||||
@@ -2967,6 +2967,7 @@ int status_vprintf(const char *status, b
|
@@ -110,7 +110,7 @@ static int manager_watch_jobs_in_progres
|
||||||
struct iovec iovec[6] = {};
|
|
||||||
int n = 0;
|
|
||||||
static bool prev_ephemeral;
|
|
||||||
+ static int cached_on_tty = -1;
|
|
||||||
|
|
||||||
assert(format);
|
#define CYLON_BUFFER_EXTRA (2*(sizeof(ANSI_RED_ON)-1) + sizeof(ANSI_HIGHLIGHT_RED_ON)-1 + 2*(sizeof(ANSI_HIGHLIGHT_OFF)-1))
|
||||||
|
|
||||||
@@ -2980,6 +2981,51 @@ int status_vprintf(const char *status, b
|
-static void draw_cylon(char buffer[], size_t buflen, unsigned width, unsigned pos) {
|
||||||
if (fd < 0)
|
+static void draw_cylon(char buffer[], size_t buflen, unsigned width, unsigned pos, bool ansi_console) {
|
||||||
return fd;
|
char *p = buffer;
|
||||||
|
|
||||||
+ if (_unlikely_(cached_on_tty < 0)) {
|
assert(buflen >= CYLON_BUFFER_EXTRA + width + 1);
|
||||||
+ cached_on_tty = isatty(fd) > 0;
|
@@ -119,12 +119,14 @@ static void draw_cylon(char buffer[], si
|
||||||
+ if (cached_on_tty) {
|
if (pos > 1) {
|
||||||
+ const char *e = getenv("TERM");
|
if (pos > 2)
|
||||||
+ if (e && (strcmp(e, "dumb") == 0 || strcmp(e, "ibm327x") == 0)) {
|
p = mempset(p, ' ', pos-2);
|
||||||
+ char *mode = NULL;
|
- p = stpcpy(p, ANSI_RED_ON);
|
||||||
+ int r = parse_env_file("/proc/cmdline", WHITESPACE, "conmode", &mode, NULL);
|
+ if (ansi_console)
|
||||||
+ if (r < 0 || !mode || !streq(mode, "3270"))
|
+ p = stpcpy(p, ANSI_RED_ON);
|
||||||
+ cached_on_tty = 0;
|
*p++ = '*';
|
||||||
+ }
|
}
|
||||||
|
|
||||||
|
if (pos > 0 && pos <= width) {
|
||||||
|
- p = stpcpy(p, ANSI_HIGHLIGHT_RED_ON);
|
||||||
|
+ if (ansi_console)
|
||||||
|
+ p = stpcpy(p, ANSI_HIGHLIGHT_RED_ON);
|
||||||
|
*p++ = '*';
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -135,7 +137,8 @@ static void draw_cylon(char buffer[], si
|
||||||
|
*p++ = '*';
|
||||||
|
if (pos < width-1)
|
||||||
|
p = mempset(p, ' ', width-1-pos);
|
||||||
|
- strcpy(p, ANSI_HIGHLIGHT_OFF);
|
||||||
|
+ if (ansi_console)
|
||||||
|
+ strcpy(p, ANSI_HIGHLIGHT_OFF);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -150,6 +153,7 @@ void manager_flip_auto_status(Manager *m
|
||||||
|
}
|
||||||
|
|
||||||
|
static void manager_print_jobs_in_progress(Manager *m) {
|
||||||
|
+ static int is_ansi_console = -1;
|
||||||
|
_cleanup_free_ char *job_of_n = NULL;
|
||||||
|
Iterator i;
|
||||||
|
Job *j;
|
||||||
|
@@ -174,10 +178,20 @@ static void manager_print_jobs_in_progre
|
||||||
|
assert(counter == print_nr + 1);
|
||||||
|
assert(j);
|
||||||
|
|
||||||
|
+ if (_unlikely_(is_ansi_console < 0)) {
|
||||||
|
+ int fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
|
||||||
|
+ if (fd < 0)
|
||||||
|
+ is_ansi_console = 0;
|
||||||
|
+ else {
|
||||||
|
+ is_ansi_console = (int)ansi_console(fd);
|
||||||
|
+ close(fd);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if (status && !cached_on_tty) {
|
cylon_pos = m->jobs_in_progress_iteration % 14;
|
||||||
|
if (cylon_pos >= 8)
|
||||||
|
cylon_pos = 14 - cylon_pos;
|
||||||
|
- draw_cylon(cylon, sizeof(cylon), 6, cylon_pos);
|
||||||
|
+ draw_cylon(cylon, sizeof(cylon), 6, cylon_pos, (bool)is_ansi_console);
|
||||||
|
|
||||||
|
m->jobs_in_progress_iteration++;
|
||||||
|
|
||||||
|
--- systemd-210/src/shared/util.c
|
||||||
|
+++ systemd-210/src/shared/util.c 2014-04-30 10:39:17.154736438 +0000
|
||||||
|
@@ -2886,6 +2886,7 @@ int status_vprintf(const char *status, b
|
||||||
|
struct iovec iovec[6] = {};
|
||||||
|
int n = 0;
|
||||||
|
static bool prev_ephemeral;
|
||||||
|
+ static int is_ansi_console = -1;
|
||||||
|
|
||||||
|
assert(format);
|
||||||
|
|
||||||
|
@@ -2899,6 +2900,41 @@ int status_vprintf(const char *status, b
|
||||||
|
if (fd < 0)
|
||||||
|
return fd;
|
||||||
|
|
||||||
|
+ if (_unlikely_(is_ansi_console < 0))
|
||||||
|
+ is_ansi_console = (int)ansi_console(fd);
|
||||||
|
+
|
||||||
|
+ if (status && !is_ansi_console) {
|
||||||
+ const char *esc, *ptr;
|
+ const char *esc, *ptr;
|
||||||
+ esc = strchr(status, 0x1B);
|
+ esc = strchr(status, 0x1B);
|
||||||
+ if (esc && (ptr = strpbrk(esc, "SOFDTI*"))) {
|
+ if (esc && (ptr = strpbrk(esc, "SOFDTI*"))) {
|
||||||
@ -77,14 +136,14 @@
|
|||||||
if (ellipse) {
|
if (ellipse) {
|
||||||
char *e;
|
char *e;
|
||||||
size_t emax, sl;
|
size_t emax, sl;
|
||||||
@@ -3002,8 +3048,12 @@ int status_vprintf(const char *status, b
|
@@ -2921,8 +2957,12 @@ int status_vprintf(const char *status, b
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- if (prev_ephemeral)
|
- if (prev_ephemeral)
|
||||||
- IOVEC_SET_STRING(iovec[n++], "\r" ANSI_ERASE_TO_END_OF_LINE);
|
- IOVEC_SET_STRING(iovec[n++], "\r" ANSI_ERASE_TO_END_OF_LINE);
|
||||||
+ if (prev_ephemeral) {
|
+ if (prev_ephemeral) {
|
||||||
+ if (cached_on_tty)
|
+ if (is_ansi_console)
|
||||||
+ IOVEC_SET_STRING(iovec[n++], "\r" ANSI_ERASE_TO_END_OF_LINE);
|
+ IOVEC_SET_STRING(iovec[n++], "\r" ANSI_ERASE_TO_END_OF_LINE);
|
||||||
+ else
|
+ else
|
||||||
+ IOVEC_SET_STRING(iovec[n++], "\r");
|
+ IOVEC_SET_STRING(iovec[n++], "\r");
|
||||||
@ -92,7 +151,7 @@
|
|||||||
prev_ephemeral = ephemeral;
|
prev_ephemeral = ephemeral;
|
||||||
|
|
||||||
if (status) {
|
if (status) {
|
||||||
@@ -3267,8 +3317,14 @@ void columns_lines_cache_reset(int signu
|
@@ -3169,12 +3209,43 @@ void columns_lines_cache_reset(int signu
|
||||||
bool on_tty(void) {
|
bool on_tty(void) {
|
||||||
static int cached_on_tty = -1;
|
static int cached_on_tty = -1;
|
||||||
|
|
||||||
@ -101,10 +160,49 @@
|
|||||||
cached_on_tty = isatty(STDOUT_FILENO) > 0;
|
cached_on_tty = isatty(STDOUT_FILENO) > 0;
|
||||||
+ if (cached_on_tty) {
|
+ if (cached_on_tty) {
|
||||||
+ const char *e = getenv("TERM");
|
+ const char *e = getenv("TERM");
|
||||||
+ if (e && (strcmp(e, "dumb") == 0))
|
+ if (!e)
|
||||||
|
+ return cached_on_tty;
|
||||||
|
+ if (streq(e, "dumb") || strneq(e, "ibm3", 4)) {
|
||||||
|
+ char *mode = NULL;
|
||||||
|
+ int r = parse_env_file("/proc/cmdline", WHITESPACE, "conmode", &mode, NULL);
|
||||||
|
+ if (r < 0 || !mode || !streq(mode, "3270"))
|
||||||
+ cached_on_tty = 0;
|
+ cached_on_tty = 0;
|
||||||
+ }
|
+ }
|
||||||
|
+ }
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
return cached_on_tty;
|
return cached_on_tty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+bool ansi_console(int fd) {
|
||||||
|
+ static int cached_ansi_console = -1;
|
||||||
|
+
|
||||||
|
+ if (_unlikely_(cached_ansi_console < 0)) {
|
||||||
|
+ cached_ansi_console = isatty(fd) > 0;
|
||||||
|
+ if (cached_ansi_console) {
|
||||||
|
+ const char *e = getenv("TERM");
|
||||||
|
+ if (e && (streq(e, "dumb") || strneq(e, "ibm3", 4))) {
|
||||||
|
+ char *mode = NULL;
|
||||||
|
+ int r = parse_env_file("/proc/cmdline", WHITESPACE, "conmode", &mode, NULL);
|
||||||
|
+ if (r < 0 || !mode || !streq(mode, "3270"))
|
||||||
|
+ cached_ansi_console = 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return cached_ansi_console;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int running_in_chroot(void) {
|
||||||
|
struct stat a = {}, b = {};
|
||||||
|
|
||||||
|
--- systemd-210/src/shared/util.h
|
||||||
|
+++ systemd-210/src/shared/util.h 2014-04-30 10:24:51.134235665 +0000
|
||||||
|
@@ -418,6 +418,7 @@ unsigned lines(void);
|
||||||
|
void columns_lines_cache_reset(int _unused_ signum);
|
||||||
|
|
||||||
|
bool on_tty(void);
|
||||||
|
+bool ansi_console(int fd);
|
||||||
|
|
||||||
|
static inline const char *ansi_highlight(void) {
|
||||||
|
return on_tty() ? ANSI_HIGHLIGHT_ON : "";
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 30 10:55:54 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Modify and extend patch
|
||||||
|
0001-On_s390_con3270_disable_ANSI_colour_esc.patch
|
||||||
|
to avoid also ANSI escape sequences for busy jobs on s390
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 28 09:51:35 UTC 2014 - werner@suse.de
|
Mon Apr 28 09:51:35 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 30 10:55:54 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Modify and extend patch
|
||||||
|
0001-On_s390_con3270_disable_ANSI_colour_esc.patch
|
||||||
|
to avoid also ANSI escape sequences for busy jobs on s390
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 28 09:51:35 UTC 2014 - werner@suse.de
|
Mon Apr 28 09:51:35 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user