mirror of
https://github.com/troglobit/finit.git
synced 2026-10-12 10:12:32 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e74dff96ba | ||
|
|
9ed4407b20 |
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
AC_INIT([Finit], [4.17-rc1], [https://github.com/finit-project/finit/issues],
|
AC_INIT([Finit], [4.17], [https://github.com/finit-project/finit/issues],
|
||||||
[finit], [https://http://finit-project.github.io/])
|
[finit], [https://http://finit-project.github.io/])
|
||||||
AC_CONFIG_AUX_DIR(aux)
|
AC_CONFIG_AUX_DIR(aux)
|
||||||
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects])
|
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects])
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ Change Log
|
|||||||
|
|
||||||
All relevant changes are documented in this file.
|
All relevant changes are documented in this file.
|
||||||
|
|
||||||
[4.17][] - 2026-04-xx
|
[4.17][] - 2026-04-28
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
### Changes
|
### Changes
|
||||||
|
|||||||
+9
-4
@@ -379,7 +379,6 @@ void print(int rc, const char *fmt, ...)
|
|||||||
/* Pending state: show description with spinner, no final status yet */
|
/* Pending state: show description with spinner, no final status yet */
|
||||||
if (!buf[0])
|
if (!buf[0])
|
||||||
return;
|
return;
|
||||||
delline();
|
|
||||||
if (progress_style == PROGRESS_CLASSIC)
|
if (progress_style == PROGRESS_CLASSIC)
|
||||||
cprintf("\r%s ", pad(buf, sizeof(buf), ".", sizeof(buf)));
|
cprintf("\r%s ", pad(buf, sizeof(buf), ".", sizeof(buf)));
|
||||||
else
|
else
|
||||||
@@ -391,15 +390,21 @@ void print(int rc, const char *fmt, ...)
|
|||||||
* Final status. Emit description + status in a single cprintf() so
|
* Final status. Emit description + status in a single cprintf() so
|
||||||
* both reach the console in one write(), preventing kernel messages or
|
* both reach the console in one write(), preventing kernel messages or
|
||||||
* command output from splitting the description from its [ OK ]/[FAIL].
|
* command output from splitting the description from its [ OK ]/[FAIL].
|
||||||
|
*
|
||||||
|
* status() returns a pointer to a static buffer, so we must copy the
|
||||||
|
* result for rc before calling status(3) — the second call overwrites
|
||||||
|
* the same buffer, corrupting the first result.
|
||||||
*/
|
*/
|
||||||
last_desc[0] = 0;
|
last_desc[0] = 0;
|
||||||
|
|
||||||
if (buf[0]) {
|
if (buf[0]) {
|
||||||
delline();
|
char st[64];
|
||||||
|
|
||||||
|
strlcpy(st, status(rc), sizeof(st));
|
||||||
if (progress_style == PROGRESS_CLASSIC)
|
if (progress_style == PROGRESS_CLASSIC)
|
||||||
cprintf("\r%s %s\n", pad(buf, sizeof(buf), ".", sizeof(buf)), status(rc));
|
cprintf("\r%s %s\n", pad(buf, sizeof(buf), ".", sizeof(buf)), st);
|
||||||
else
|
else
|
||||||
cprintf("\r\e[K%s%s\r%s\n", status(3), buf, status(rc));
|
cprintf("\r\e[K%s%s\r%s\n", status(3), buf, st);
|
||||||
} else {
|
} else {
|
||||||
if (progress_style == PROGRESS_CLASSIC)
|
if (progress_style == PROGRESS_CLASSIC)
|
||||||
cprintf("%s\n", status(rc));
|
cprintf("%s\n", status(rc));
|
||||||
|
|||||||
Reference in New Issue
Block a user